ayyoob
|
33f73eb2b3
|
merged with origin
|
8 years ago |
ayyoob
|
728a8f4953
|
removed unused files and refactored few device type profile specific from the new device type feature structure,
|
8 years ago |
ayyoob
|
0abbf55714
|
moved default input and output configurations to global properties
|
8 years ago |
ayyoob
|
06d646c87a
|
moved artifact deployment to the platform configuration
|
8 years ago |
WSO2 Builder
|
f0a70d7f27
|
[WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
24460ebde1
|
[WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33
|
8 years ago |
sinthuja
|
37a15e927d
|
Merge branch 'wso2-master'
# Conflicts:
# features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml
|
8 years ago |
WSO2 Builder
|
df7df6ffa6
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
3cdec9843a
|
[maven-release-plugin] prepare release v3.0.32
|
8 years ago |
sinthuja
|
79bdfa642c
|
Merge branch 'wso2-master'
# Conflicts:
# components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java
# features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.ui.feature/src/main/resources/p2.inf
# features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/src/main/resources/p2.inf
# features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/p2.inf
|
8 years ago |
ayyoob
|
5a25f15d08
|
removing the fix did in cloud setup - jasinthas
|
8 years ago |
ayyoob
|
359184429e
|
Added missing fixes that was done for multi tenancy in cloud branch
|
8 years ago |
sinthuja
|
bbc8c8efce
|
Fixing the issue in consuming the events for carbon.super from mqtt.
|
8 years ago |
WSO2 Builder
|
2db4069053
|
[WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
902d7e3cf2
|
[WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31
|
8 years ago |
warunalakshitha
|
543e68771e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
WSO2 Builder
|
e2becd3169
|
[WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
85c36c0ca8
|
[WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30
|
8 years ago |
Rasika Perera
|
9d00038199
|
#665 : Added some improvements to the fix
|
8 years ago |
Rasika Perera
|
f7dbc156b3
|
#665 : Added some changes to reuse PropertyUtils.replaceTenantDomainProperty()
|
8 years ago |
Rasika Perera
|
be99ca571b
|
#665 : Fixing java.lang.IllegalStateException: Tenant ID cannot be -1 issue
|
8 years ago |
warunalakshitha
|
568538cc13
|
add comments for performance configs
|
8 years ago |
WSO2 Builder
|
c3fb32f3bc
|
[WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
1b0047c39f
|
[WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare release v3.0.29
|
8 years ago |
Ayyoob Hamza
|
5397fc3563
|
Merge pull request #662 from Megala21/master
Adding security filters for secured-websocket war
|
8 years ago |
WSO2 Builder
|
99e587eb78
|
[WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
9b8929a8cd
|
[WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare release v3.0.28
|
8 years ago |
Kamidu Sachith Punchihewa
|
6759a99ae9
|
Merge pull request #657 from rasika/master
Fixing Android policy view and policy edit doesn't honor isCloud enabled param
|
8 years ago |
megala21
|
d1ee78eaed
|
Adding security filters for websocket web.xml
|
8 years ago |
sameera910409
|
08adfda735
|
fix multi tenant issues in windows device enrollment
|
8 years ago |
ayyoob
|
155135a70d
|
fixed few issues after testing analytics
|
8 years ago |
Rasika Perera
|
511c61175c
|
#654 : Fixing Android policy view and policy edit doesn't honor isCloud enabled parameter
|
8 years ago |
WSO2 Builder
|
1a91d1ddc0
|
[WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
426a016c37
|
[WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare release v3.0.27
|
8 years ago |
WSO2 Builder
|
de5ff24046
|
Merge commit 'dc4c32129ac05dfe6247cb060cc0949fcdf5c2ed' into db9e6dc2-9fc6-4b4a-8465-9e6ea06cdee0
|
8 years ago |
WSO2 Builder
|
dc4c32129a
|
[WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
b1c6ae0e2c
|
[WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare release v3.0.26
|
8 years ago |
charitha
|
9febce0601
|
Add latest agent (3.1.16)
|
8 years ago |
Charitha Goonetilleke
|
186b3e16e4
|
Merge pull request #653 from ruwany/master
Merging cloud-310 branch with master
|
8 years ago |
WSO2 Builder
|
72fab84bf9
|
[WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
5ff67af60a
|
[WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare release v3.0.25
|
8 years ago |
inoshperera
|
3fb3ebd893
|
moving app subscription to a new thread
|
8 years ago |
charitha
|
de0cb9a5a2
|
Add agent 3.1.15 for cloud
(cherry picked from commit 0d6800b)
|
8 years ago |
charitha
|
ab91e3a6b0
|
Fixed https://github.com/wso2/cdmf-agent-android/issues/33
(cherry picked from commit fadd2e6)
|
8 years ago |
charitha
|
d80c25ed2b
|
Updating UIs of agents to latest
(cherry picked from commit 90c0618)
|
8 years ago |
Rasika Perera
|
a1b0298374
|
Updating android agent into latest
(cherry picked from commit a41436d )
|
8 years ago |
Jasintha
|
ce4365f601
|
Removing testing values
(cherry picked from commit 31d5977 )
|
8 years ago |
Jasintha
|
3980899686
|
Fixing MQTT adpater and analytics resources for androidsense userstory
(cherry picked from commit b04b583 )
|
8 years ago |
Rasika Perera
|
51a613f167
|
Resolving #642 : Improve UX on location updates for Android
(cherry picked from commit 64b1b33 )
|
8 years ago |
WSO2 Builder
|
4c0e505008
|
[WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
b653b4871d
|
[WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare release v3.0.24
|
8 years ago |
amalhub
|
ec75361c57
|
Adding latest android-agent.apk (https://github.com/wso2/cdmf-agent-android/releases/tag/v3.1.13)
|
8 years ago |
WSO2 Builder
|
7a2b64605f
|
[WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
908ee841e9
|
[WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare release v3.0.23
|
8 years ago |
ayyoob
|
310525d066
|
added token recovery option when token refresh failed
|
8 years ago |
WSO2 Builder
|
84220e2c25
|
[WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
5da8bf98b8
|
[WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare release v3.0.22
|
8 years ago |
kamidu
|
bcdd78ae68
|
Merge branch 'master' into cloud-3.1.0
|
8 years ago |
kamidu
|
dc0fda3925
|
fixing location and operation loading ui issues
|
8 years ago |
kamidu
|
eb7a83bcc8
|
fixing location and operation loading ui issues
|
8 years ago |
kamidu
|
9d3949ea37
|
enabling loading for location refrsh
|
8 years ago |
kamidu
|
1d663e1b68
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
|
8 years ago |
kamidu
|
4662db6701
|
device status fic
|
8 years ago |
charitha
|
6f3578f797
|
Adding agent 3.1.7 for cloud
|
8 years ago |
kamidu
|
9ad8cb21ae
|
android enrollment ui fixes and operation in progress animation fix
|
8 years ago |
Kamidu Sachith Punchihewa
|
8f169d0116
|
Revert "Updated device-mgt version & interface."
|
8 years ago |
kamidu
|
2abd8823a3
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
|
8 years ago |
Harshan Liyanage
|
ff5a1c9c5d
|
Updated device-mgt version & interface.
|
8 years ago |
kamidu
|
ee24a8baea
|
merging upstream cloud-3.1.0
|
8 years ago |
kamidu
|
ace58b6649
|
policy filtering and location reload for cloud
|
8 years ago |
WSO2 Builder
|
2cf8496351
|
[WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
7d6def8976
|
[WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare release v3.0.21
|
8 years ago |
charitha
|
6398d79760
|
Fix https://github.com/wso2/product-iots/issues/332
(cherry picked from commit 0e4df87 )
|
8 years ago |
charitha
|
0e4df87dda
|
Fix https://github.com/wso2/product-iots/issues/332
|
8 years ago |
charitha
|
110c9405b1
|
Update device enrollement steps
(cherry picked from commit ca8ad9f )
|
8 years ago |
charitha
|
ca8ad9f528
|
Update device enrollement steps
|
8 years ago |
WSO2 Builder
|
de5f854367
|
[WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
13cbce1e37
|
[WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare release v3.0.20
|
8 years ago |
charitha
|
179cc93c1a
|
Downgraded android OS version to avoid ANR
(cherry picked from commit e13aa77 )
|
8 years ago |
charitha
|
6ea597233b
|
Add google play store links to device enrollment page
(cherry picked from commit 243a3df )
|
8 years ago |
charitha
|
572d85dbd1
|
Instruct mac users to restart after installing HAXM
(cherry picked from commit b53fe60)
|
8 years ago |
charitha
|
e13aa77b21
|
Downgraded android OS version to avoid ANR
|
8 years ago |
charitha
|
2d67d33eb6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
charitha
|
243a3df89d
|
Add google play store links to device enrollment page
|
8 years ago |
WSO2 Builder
|
0f3318e353
|
[WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
41041f3f6d
|
[WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare release v3.0.19
|
8 years ago |
charitha
|
d8218ef221
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
charitha
|
b53fe60807
|
Instruct mac users to restart after installing HAXM
|
8 years ago |
WSO2 Builder
|
cf3d543fea
|
[WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
59194a1286
|
[WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare release v3.0.18
|
8 years ago |
charitha
|
52060c9d40
|
Fixed unzipping issue in tryit tool
(cherry picked from commit 01187db )
|
8 years ago |
charitha
|
33342e0e97
|
Fix documentation links
|
8 years ago |
charitha
|
01187db029
|
Fixed unzipping issue in tryit tool
|
8 years ago |
WSO2 Builder
|
82ac8417d3
|
[WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
d0e9362ee1
|
[WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare release v3.0.17
|
8 years ago |
charitha
|
6aee69ef5b
|
Updated splash screen images
|
8 years ago |
charitha
|
8ee81f497d
|
Adding latest Android agent
|
8 years ago |
charitha
|
3bfa383cea
|
Adding Android-tryit tool
(cherry picked from commit c3e241e )
|
8 years ago |
Charitha Goonetilleke
|
6c6cde7df0
|
Merge pull request #623 from sameeragunarathne/master
fix android apk install operation issue by checking resource access s…
|
8 years ago |
sinthuja
|
09033aef51
|
Fixing the issue in feature installation.
|
8 years ago |
sameera910409
|
d907f1bc51
|
fix https://wso2.org/jira/browse/EMM-1880
|
8 years ago |
sinthuja
|
b1af6eeaf4
|
Moving the cdmf-analytics repo components to device-mgt-iot-plugins.
|
8 years ago |
WSO2 Builder
|
2049e44319
|
[WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
d15dc25c13
|
[WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare release v3.0.16
|
8 years ago |
Geeth
|
bc7b77e07a
|
Merge pull request #622 from charithag/master-androidtryit
Adding Android-tryit tool
|
8 years ago |
charitha
|
c3e241e1d5
|
Adding Android-tryit tool
|
8 years ago |
WSO2 Builder
|
8df6e56f40
|
[WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
2e8f5a63d2
|
[WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare release v3.0.15
|
8 years ago |
Ayyoob Hamza
|
632547447c
|
Merge pull request #621 from sinthuja/master
Changes to adhere to the new directory structure.
|
8 years ago |
megala21
|
c8f25a0b77
|
Updating json version
|
8 years ago |
Harshan Liyanage
|
893eccd817
|
Merge pull request #618 from hasuniea/master
resolved #616
|
8 years ago |
Harshan Liyanage
|
bd2ded8563
|
Removed unnecessary braces.
|
8 years ago |
Susinda
|
1c13f1b97d
|
Cloud and general doc links issue fixed
|
8 years ago |
Hasunie
|
809a30fc7a
|
fixing code format issue
|
8 years ago |
Hasunie
|
7de234c164
|
resolved #616
|
8 years ago |
Hasunie
|
42cc311f00
|
Fixing NPE in AndroidAPIUtils
resolved #616
|
8 years ago |
Hasunie
|
143569b83b
|
Fixing null property in AndriodAPIUtils
|
8 years ago |
Hasunie
|
a30fbfdbec
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
WSO2 Builder
|
c49b33bb4a
|
[WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
e1064dca07
|
[WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare release v3.0.14
|
8 years ago |
Kamidu Sachith Punchihewa
|
95f64b0a15
|
Merge pull request #615 from wso2/cloud-3.1.0
Cloud related fixes
|
8 years ago |
WSO2 Builder
|
68f329cbda
|
[WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
8669d1b44e
|
[WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare release v3.0.13
|
8 years ago |
Harshan Liyanage
|
2753deb365
|
Merge pull request #602 from sameeragunarathne/master
refactor code for firebase cloud messaging
|
8 years ago |
sinthuja
|
2f20502d81
|
Merge branch 'wso2-master'
|
8 years ago |
sinthuja
|
5c79504529
|
Resolving the startup issue in the broker profile.
|
8 years ago |
Harshan Liyanage
|
1882171824
|
Merge pull request #611 from Kamidu/cloud-3.1.0
android view related ui fixes
|
8 years ago |
WSO2 Builder
|
18d3518236
|
[WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
867790d3cb
|
[WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare release v3.0.12
|
8 years ago |
kamidu
|
c97dfb4080
|
android view related ui fixes : MACOS :: Git config auto genarated for sachithp@wso2's-MacBook-Pro.local
|
8 years ago |
sameera910409
|
078209347a
|
refactor code for firebase cloud messaging
|
8 years ago |
Susinda
|
1ebc84450f
|
revert the implementation 'agent download from github release'
|
8 years ago |
Susinda
|
286d293ddd
|
revert the implementation 'agent download from github release'
|
8 years ago |
Susinda
|
7c3d94cf77
|
Added README file to avoid git ignoring empty dirs
|
8 years ago |
Susinda
|
f96389e671
|
Android agent downloadded from github relese location, Hasuni's fix on initial operations added
|
8 years ago |
Susinda Perera
|
fb6cfb6699
|
Merge pull request #1 from susinda/cloud-3.1.0
Merging from Cloud 3.1.0
|
8 years ago |
kamidu
|
d2d56651cc
|
fix for leaflet tile not loading issues
(cherry picked from commit 6604c23257 )
|
8 years ago |
ayyoob
|
2dd7f53489
|
added log support for server to server communication
|
8 years ago |
Harshan Liyanage
|
b82a59c828
|
Merge branch 'cloud-3.1.0' of https://github.com/hasuniea/carbon-device-mgt-plugins into hasuniea-cloud-3.1.0
|
8 years ago |
Hasunie
|
7fcf4e9a3b
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
|
8 years ago |
Hasunie
|
3e50f0b737
|
adding initial operations
|
8 years ago |
Harshan Liyanage
|
dc054e6ed5
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
|
8 years ago |
Harshan Liyanage
|
f2761e9b0a
|
Removed info operation addition upon page load
|
8 years ago |
ayyoob
|
a10eb7cb14
|
removed feature
|
8 years ago |
ayyoob
|
77ec1c4107
|
fixed operation bar permission rendering issue
|
8 years ago |
Milan Perera
|
360a58dce6
|
Merge pull request #596 from Kamidu/cloud-3.1.0
fix for leaflet tile not loading issues
|
8 years ago |
kamidu
|
6604c23257
|
fix for leaflet tile not loading issues
|
8 years ago |
ayyoob
|
eda4710211
|
resolved device type download issue in windows OS and added log support for service clients.
|
8 years ago |
susinda
|
5ad6dc1f1d
|
Fxing PhoneNumber Serach for android
|
8 years ago |
lakshani
|
3505cc8abc
|
Adding (cherry-pick) lakshani's commit on 'Fixed the issue in server startu'
|
8 years ago |
Susinda Perera
|
6f9ea52218
|
Merge pull request #593 from wso2/cloud-3.1.0
Merging to 3.1.0-test from Cloud 3.1.0 - Till Feb-28
|
8 years ago |
ayyoob
|
384ab40f5b
|
added ssl context
|
8 years ago |
Hasunie
|
17c017379c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
lakshani
|
ffee269a0e
|
Fixed the issue in server startup- removed error logs
|
8 years ago |
lakshani
|
964e2aade7
|
Fixed the issue in server startup error logs
|
8 years ago |
Kamidu Sachith Punchihewa
|
740bb976fa
|
adding location operation to device view page
|
8 years ago |
kamidu
|
afaa75d3a9
|
adding screen shots
|
8 years ago |
kamidu
|
463d8a9dff
|
wording sugessions for cloud
|
8 years ago |
Imesh Chandrasiri
|
20bd1b399b
|
Removed conflict markings
|
8 years ago |
Imesh Chandrasiri
|
a890d9fb89
|
Device enrollment page revamp
|
8 years ago |
Imesh Chandrasiri
|
bccc47ebd2
|
Conflict fix
|
8 years ago |
Imesh Chandrasiri
|
4b7637a426
|
Device enrollment page revampl
|
8 years ago |
Imesh Chandrasiri
|
37b032d710
|
Merge branch 'cloud-3.1.0' into cloud-3.1.0
|
8 years ago |
Imesh Chandrasiri
|
67313882ed
|
Device enrollment page changes for cloud
|
8 years ago |
kamidu
|
71c93eec29
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
|
8 years ago |
kamidu
|
305df1c2bd
|
enhansing the device cloud ui
|
8 years ago |
kamidu
|
9d733d6cc1
|
Fixing android location issue
|
8 years ago |
Susinda Perera
|
8a9affc4b8
|
Merge pull request #582 from ayyoob/210releasepatch
added device management api to be default
|
8 years ago |
Imesh Chandrasiri
|
f10e26f0a9
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
|
8 years ago |
Imesh Chandrasiri
|
2fcd5ca020
|
Model Popup title space issue fix
|
8 years ago |
Hasunie
|
0c87c32094
|
Merging changes
|
8 years ago |
lakshani
|
f5d71d917e
|
Added change device status feature to mobile plugings
|
8 years ago |
ayyoob
|
a294c20a2a
|
added device management api to be default
|
8 years ago |
lakshani
|
3c349a71e6
|
removed unwanted repositories from restconnector
|
8 years ago |
lakshani
|
edb8e71ac2
|
Added change device status feature to mobile plugings
|
8 years ago |
ayyoob
|
e66311b844
|
fixed few multi tenant issues
|
8 years ago |
ayyoob
|
00feadac97
|
fixed validation url property
|
8 years ago |
ayyoob
|
dd3017578a
|
added artefact deployment support for device types
|
8 years ago |
kamidu
|
fe338aa412
|
removing the module vfa plugin
|
8 years ago |
Kamidu Sachith Punchihewa
|
68b36babe6
|
Merge pull request #575 from wso2/master
UI fixes for device cloud
|
8 years ago |
kamidu
|
bd715b7aac
|
resolving branch conflicts
|
8 years ago |
kamidu
|
53840dcc37
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
ayyoob
|
56de095599
|
resolved app connector build slowness issue
|
8 years ago |
WSO2 Builder
|
d7e4580e77
|
[WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
1737eaaa79
|
[WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11
|
8 years ago |
Hasunie
|
3b98e0f754
|
Merge pull request #572 from charithag/master-update-swagger-docs
Update swagger docs
|
8 years ago |
ayyoob
|
e0f6e9579d
|
fixed multi tenant issues after testing
|
8 years ago |
ayyoob
|
2cfc4540f4
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
|
8 years ago |
ayyoob
|
50d8aedade
|
fixed analytics multi tenant issues
|
8 years ago |
charitha
|
9bf38af4f7
|
Fix issues in swagger docs
|
8 years ago |
Milan Perera
|
99782e6360
|
Resolved conflicts and merged
|
8 years ago |
Hasunie
|
1ab1def2b6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Hasunie
|
fb28a4042f
|
fixing windows config issues
|
8 years ago |
Milan Perera
|
cc8066896b
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud
|
8 years ago |
Milan Perera
|
e1a419425e
|
Added cloud agent to the download page
|
8 years ago |
ayyoob
|
73eb590a7c
|
renamed grant type to default
|
8 years ago |
Kamidu Sachith Punchihewa
|
64cb8b5223
|
Update load-map.js
|
8 years ago |
kamidu
|
55489d5e52
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
kamidu
|
192e1c3edc
|
adding missing classes in hbs
|
8 years ago |
WSO2 Builder
|
7034dae2b5
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
a2224f96ff
|
[maven-release-plugin] prepare release v3.0.10
|
8 years ago |
lakshani
|
67663449d2
|
removed unwanted versions from the pom
|
8 years ago |
Hasunie
|
f9bb3f6e89
|
removing swagger annotation from enrollment
(cherry picked from commit 3dc1418 )
|
8 years ago |
Hasunie
|
3dc1418290
|
removing swagger annotation from enrollment
|
8 years ago |
lakshani
|
1319806a6c
|
removed snapshot versions
|
8 years ago |
lakshani
|
f62e7021d6
|
updated the pom to latest version
|
8 years ago |
lakshani
|
8f53a05962
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
lakshani
|
fff1a3f168
|
fixed the issues in rest connector
|
8 years ago |
WSO2 Builder
|
4554d8929d
|
[WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
da7c040224
|
[WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare release v3.0.9
|
8 years ago |
GPrathap
|
1d488b06a8
|
allowing every internal users to view device analytics dashboard
|
8 years ago |
lakshani
|
ffdcd2b217
|
updated pom based on review comments
|
8 years ago |
lakshani
|
ebc6c6ec11
|
added java doc comments
|
8 years ago |
lakshani
|
d6b6da9c14
|
added rest-connector
|
8 years ago |
ayyoob
|
036d6936a7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
ayyoob
|
3021947f30
|
updated saml grant type config name
|
8 years ago |
GPrathap
|
21abaa8270
|
changed websocket token retrieval mechanism
|
8 years ago |
ayyoob
|
8b5dd4d811
|
resolved merge issues
|
8 years ago |
ayyoob
|
4f1f1a3e7e
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
WSO2 Builder
|
e64fe695ab
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
5fbd40c579
|
[maven-release-plugin] prepare release v3.0.8
|
8 years ago |
kamidu
|
0679aab11d
|
adding missing classes in hbs
|
8 years ago |
Rasika Perera
|
1fdaf0dc2f
|
Merge pull request #554 from ayyoob/arduino
arduino fix is added
|
8 years ago |
Rasika Perera
|
10428e7ca2
|
Merge pull request #553 from hasuniea/windows10
fixing synapse configs
|
8 years ago |
ayyoob
|
affbd00796
|
arduino fix is added
|
8 years ago |
Hasunie
|
8eed99c215
|
fixing passcode issue
|
8 years ago |
sinthuja
|
f517975bf0
|
Adding wso2 event receiver to geo capp.
|
8 years ago |
Hasunie
|
9467c52707
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
8 years ago |
Rasika Perera
|
3fc33d9e49
|
Merge pull request #552 from Jasintha/release-3.0.x
MQTT subscription topic patten should changed to this format to get policy updates
|
8 years ago |
Jasintha
|
d515dc6d03
|
Fixing policy topic chanaged issue
|
8 years ago |
Hasunie
|
636eb91a0a
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
8 years ago |
Hasunie
|
b3d096f02c
|
removining app restriction policy from policy edit UI
|
8 years ago |
WSO2 Builder
|
9687362258
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ee063a1a43
|
[maven-release-plugin] prepare release v3.0.7
|
8 years ago |
Rasika Perera
|
0d6dd3b96e
|
Merge pull request #548 from hasuniea/windows10
Removing windows app restriction policy from Policy UI
|
8 years ago |
Hasunie
|
68631a2dbd
|
removing windows app restriction policy from Policy UI
|
8 years ago |
Chatura Dilan
|
57d6fb12ce
|
updating android agent
|
8 years ago |
kamidu
|
c6d0c4ba44
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
kamidu
|
50a2c3d89a
|
Enable opasity variation with time on location records
|
8 years ago |
Hasunie
|
10cab941ee
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
8 years ago |
Hasunie
|
86d91c3bdf
|
fixing Windows synapse config issues
|
8 years ago |
Chatura Dilan
|
b2ff6c4181
|
Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Chatura Dilan
|
57cdf8e1a5
|
updating android agent
|
8 years ago |
kamidu
|
09de477e74
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
kamidu
|
eb9c789b51
|
Enable opasity variation with time on location records
|
8 years ago |
Rasika Perera
|
3b5159bed5
|
Merge pull request #542 from hasuniea/windows10
Fixing Windows10 passcode policy issue
|
8 years ago |
kamidu
|
60046823dd
|
Enable location histry for android sense
|
8 years ago |
kamidu
|
156402153d
|
git Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
kamidu
|
86a3b18464
|
adding location history to map view
|
8 years ago |
Rasika Perera
|
737d1da07b
|
Changed webapps title [EMM] into [IoT Server]
|
8 years ago |
Hasunie
|
857e971fa6
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
8 years ago |
Hasunie
|
399496ce82
|
fixing windows10 policy issue
|
8 years ago |
Menaka Jayawardena
|
872baf637f
|
Replacing android sense agent apk.
|
8 years ago |
Menaka Jayawardena
|
ed28fb6adb
|
Adding permission updater for other device types.
|
8 years ago |
Menaka Jayawardena
|
a7692b66d4
|
Removing commented code and refactoring.
|
8 years ago |
Rasika Perera
|
3b7257c93f
|
Fixing "process" not found issues
|
8 years ago |
Rasika Perera
|
9a3fc7e446
|
Cleaned windows-web-agent config.json
|
8 years ago |
Rasika Perera
|
fe6c35ebca
|
Cleaned android-web-agent config.json
|
8 years ago |
Rasika Perera
|
c04851d448
|
Removed iOS stuff from windows-web-agent
|
8 years ago |
Rasika Perera
|
8b1a27a181
|
Merge pull request #536 from hasuniea/windows10
Fixing Windows plugin issues
|
8 years ago |
Rasika Perera
|
a521b41352
|
Merge pull request #539 from menakaj/release-3.0.x
Permissions added for android sense
|
8 years ago |
Rasika Perera
|
0bc380c7d0
|
Merge pull request #538 from Kamidu/release-3.0.x
Enable location history
|
8 years ago |
Rasika Perera
|
1d10dbee88
|
Now UI configs supports system parameters with eg. %iot.core.host%
|
8 years ago |
Menaka Jayawardena
|
6df9479fea
|
device-mgt user permissions added for android sense.
|
8 years ago |
Menaka Jayawardena
|
e19802312e
|
Operation bar removed from android-sense device.
|
8 years ago |
kamidu
|
c522809bd5
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
kamidu
|
234157b6f5
|
adding location history to map view
|
8 years ago |
Megala
|
574a106977
|
Adding fixes to path
|
8 years ago |
Hasunie
|
736b09de31
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
8 years ago |
Hasunie
|
164ae997b1
|
fixing synapse config issues
|
8 years ago |
Hasunie
|
1362e2d7fe
|
Fixing windows policy issues
|
8 years ago |
Rasika Perera
|
357010120a
|
Merge pull request #535 from Jasintha/release-3.0.x
receiving message format has been changed ,so updated the client according to …
|
8 years ago |
Jasintha
|
55e0cec875
|
receving message has been chaged ,so updated the client according to that
|
8 years ago |
Chatura Dilan
|
7e58c17b1e
|
Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Chatura Dilan
|
6db0885eb9
|
remove cosu whitelisting apps
|
8 years ago |
Menaka Jayawardena
|
8e33e31704
|
Giving high priority for call and sms receivers and replacing android sense agent.
|
8 years ago |
Megala
|
c35727ae0b
|
resolving conflicts
|
8 years ago |
Megala
|
444119790c
|
Fixing geo dashboard issues
|
8 years ago |
ayyoob
|
f1e75d9375
|
apim seperation
|
8 years ago |
Rasika Perera
|
1d0753ab8d
|
Merge pull request #529 from DimalChandrasiri/release-3.0.x
Fixed android type view notification pane message inconsistancy issue
|
8 years ago |
Rasika Perera
|
c74e9de2f5
|
Merge pull request #527 from dunithd/release-3.0.x
Formatting the anchor text after fixing 500 error
|
8 years ago |
Rasika Perera
|
00ff43bfb4
|
Merge pull request #530 from hasuniea/windows10
fixing win10, 8.1 conflicting issues
|
8 years ago |
Imesh Chandrasiri
|
dc840c389a
|
Fix for inconsistant notification message
|
8 years ago |
Imesh Chandrasiri
|
62ba568e05
|
Fixed android type view notification pane message inconsistancy issue
|
8 years ago |
Hasunie
|
95a7ff6aaf
|
fixing windows app-conf issue
|
8 years ago |
Hasunie
|
e030be3d24
|
fixed code conflicts
|
8 years ago |
Menaka Jayawardena
|
88b8901f75
|
Removed unused Test page from portal dashboard.
|
8 years ago |
Menaka Jayawardena
|
f699ba54b3
|
Added Api annotation to AndroidSenseService
|
8 years ago |
Hasunie
|
38216c4b9d
|
fixing win10,8.1 conflicting issues
|
8 years ago |
Dunith Dhanushka
|
bbbfff28d9
|
UI Improvements for Geo Fencing
|
8 years ago |
Dunith Dhanushka
|
d4107747ab
|
Update device-view.js
|
8 years ago |
Rasika Perera
|
05e2cb7bb8
|
Changed [EMM] title into [IoT Server]
|
8 years ago |
Dunith Dhanushka
|
54b08f9b7a
|
Adding the JSON formatted anchor text
|
8 years ago |
Dunith Dhanushka
|
6634dded55
|
Building the anchor text
|
8 years ago |
Rasika Perera
|
0b983855cf
|
Merge pull request #522 from DimalChandrasiri/release-3.0.x
Fix for multiple popup issue
|
8 years ago |
Dunith Dhanushka
|
c6437c3065
|
Formatting the title
|
8 years ago |
Dunith Dhanushka
|
c1de144bcf
|
Setting device id and type to page title
|
8 years ago |
ayyoob
|
dad3a34a27
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Dunith Dhanushka
|
b4f876d961
|
Updating the label text for Geo fencing link
|
8 years ago |
Dunith Dhanushka
|
97d4fb1ef9
|
Removing advanced Geo fencing controls
|
8 years ago |
Dunith Dhanushka
|
2c696b7222
|
Displaying the sidebar while page loads
|
8 years ago |
ayyoob
|
76326b936c
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
ayyoob
|
9d64fd0d4b
|
fixed multi tenant login issue
|
8 years ago |
Menaka Jayawardena
|
ed85f78311
|
Replacing android-sense agent
|
8 years ago |
Menaka Jayawardena
|
d8c2d65f05
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Imesh Chandrasiri
|
8eb95c3695
|
Fix for multiple popup issue
|
8 years ago |
Imesh Chandrasiri
|
d918e32d59
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Imesh Chandrasiri
|
e112371d8e
|
Fix for multiple popup issue
|
8 years ago |
WSO2 Builder
|
3f1b7a6005
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
91a0edb0a0
|
[maven-release-plugin] prepare release v3.0.6
|
8 years ago |
Menaka Jayawardena
|
4eb186140a
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Rasika Perera
|
3ae9fba143
|
Updating IoTS doc links
|
8 years ago |
Rasika Perera
|
a3e97b4356
|
Merge pull request #521 from dunithd/release-3.0.x
Replacing the value of GLOBAL-STATE param with comma separated deviceId,deviceType
|
8 years ago |
Dunith Dhanushka
|
a097482b91
|
Passing deviceId and deviceType into view
|
8 years ago |
Dunith Dhanushka
|
33e57efc3d
|
Replacing JSON object with comma separated values
|
8 years ago |
Chatura Dilan
|
d55e0f21b7
|
Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Chatura Dilan
|
809d292c95
|
Added Android scopes
|
8 years ago |
Hasunie
|
bd0f1f1900
|
fixing windows requestToken issue
|
8 years ago |
Hasunie
|
810bbafea3
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
8 years ago |
Hasunie
|
ed0b40215a
|
fixing synapse config issues
|
8 years ago |
Hasunie
|
c162f379b4
|
adding windows operation scope
|
8 years ago |
Rasika Perera
|
f84e3526f5
|
changed [fw-ok] with [fw-success]
|
8 years ago |
Hasunie
|
97705311b9
|
removing install app tab from the device view
|
8 years ago |
Hasunie
|
a2ae12f9d1
|
adding windows 10 updates 1607/1511 changes
|
8 years ago |
Hasunie
|
4c4fd00593
|
fixing issue in different type of windows device payloads
|
8 years ago |
Hasunie
|
8655da595e
|
removing swagger definition from the soap endpoints
|
8 years ago |
Rasika Perera
|
72d9e2d0d3
|
Merge pull request #515 from hasuniea/windows10
Fixing gateway issues in windows
|
8 years ago |
Hasunie
|
e81d2b1c20
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
8 years ago |
Hasunie
|
429266d9d2
|
adding windows synaps configs
|
8 years ago |
ayyoob
|
09f7fb3a5f
|
moved the traffic through the gateway
|
8 years ago |
ayyoob
|
466c2b1151
|
moved to gateway mode
|
8 years ago |
Rasika Perera
|
ebe47ef972
|
Merge pull request #516 from DimalChandrasiri/release-3.0.x
Updating font wso2 to version 1.2.1
|
8 years ago |
Milan Perera
|
76f52af4a5
|
Refactored android sense agent
|
8 years ago |
Hasunie
|
32d99bcab6
|
fixing jira IOTS-378
|
8 years ago |
Imesh Chandrasiri
|
fc3d15887e
|
Updating font wso2 to version 1.2.1
|
8 years ago |
Hasunie
|
43a61d046b
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
8 years ago |
Hasunie
|
a905f22651
|
fixing Windows gatway issues
|
8 years ago |
Menaka Jayawardena
|
672f153551
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Milan Perera
|
2eb18e304a
|
Change scope of android configuration
|
8 years ago |
charitha
|
b812b6af2e
|
Fixed issue in showing android device location map
|
8 years ago |
Hasunie
|
9e59993900
|
fixing issue in admin service tag
|
8 years ago |
ayyoob
|
1df7d20a81
|
moved common configuration to global properties for input and output adapters
|
8 years ago |
ayyoob
|
4cb6aca5b0
|
merge with upstream
|
8 years ago |
ayyoob
|
ccaf47112a
|
removed DCR, added global configuration values for input and output adapter
|
8 years ago |
WSO2 Builder
|
b10579950b
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
b7a5454c2f
|
[maven-release-plugin] prepare release v3.0.5
|
8 years ago |
ayyoob
|
2e8279b61a
|
removed scep impl from virtual fire alarm
|
8 years ago |
Rasika Perera
|
0790689635
|
Removing unused package import in virtual_firealarm
|
8 years ago |
Rasika Perera
|
7d07585cf1
|
Merge pull request #509 from hasuniea/windows10
Windows10 Location support
|
8 years ago |
Hasunie
|
de533a0667
|
merging changes
|
8 years ago |