Harshan Liyanage
|
559fa3fe38
|
Resolved conflicts
|
8 years ago |
Menaka Jayawardena
|
862a14c2b5
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Menaka Jayawardena
|
e0afb8d205
|
Refactoring Android Sense agent.
Increased the battery data retrieving sequence.
Completed network data reading implementation.
The data publishing interval is changed to 1000ms.
|
8 years ago |
Hasunie
|
d2d39a241e
|
adding error handler
|
8 years ago |
Hasunie
|
b3eacb99cd
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Hasunie
|
36cbc96713
|
adding swagger annotations
|
8 years ago |
Charitha Goonetilleke
|
fbf7134de4
|
Merge pull request #462 from madawas/IOTS-296
IOTS-296: moving operation mod js to plugins
|
8 years ago |
Madawa Soysa
|
548213d601
|
Fixing issue with COSU policy configuration
|
8 years ago |
Rasika Perera
|
f8817988b6
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Madawa Soysa
|
22dccce027
|
IOTS-296: Moving windows operation-mod to android plugin
This commit moves the operation-mod functions to windows plugin and refactor policy CRUD code to use plugin specific operation mod functions.
|
8 years ago |
Menaka Jayawardena
|
49ee7c2986
|
Added new battery history chart gadget.
|
8 years ago |
Menaka Jayawardena
|
779435a91d
|
Persisting battery data stream and added analytics scripts.
|
8 years ago |
Madawa Soysa
|
0b8db53b91
|
IOTS-296: Moving android operation-mod to android plugin
This commit moves the operation-mod functions to android plugin and refactor policy CRUD code to use plugin specific operation mod functions.
|
8 years ago |
Rasika Perera
|
c722dfa779
|
Adding ui permissions to the operations on android
|
8 years ago |
Menaka Jayawardena
|
68270525ab
|
Merge remote-tracking branch 'origin/release-3.0.x' into release-3.0.x
|
8 years ago |
Menaka Jayawardena
|
2bd3c4a50c
|
Added android sense battery execution plan.
|
8 years ago |
Menaka Jayawardena
|
00913e64d2
|
Added android sense battery execution plan.
|
8 years ago |
sinthuja
|
f864285454
|
Merge pull request #461 from Megala21/embed
Fixing bundle loading problem
|
8 years ago |
Megala
|
b00c01ec84
|
Merge remote-tracking branch 'upstream/release-3.0.x' into embed
|
8 years ago |
Megala
|
f808478c92
|
Fixing bundle loading problem
|
8 years ago |
inoshperera
|
5fd20a6a3e
|
Merge pull request #460 from inoshperera/master
adding UI for clear passcode
|
8 years ago |
inoshperera
|
fc3cb449be
|
adding UI for clear passcode
|
8 years ago |
Menaka Jayawardena
|
0e32b646d3
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
# Conflicts:
# components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
|
8 years ago |
Menaka Jayawardena
|
8ad1b0a891
|
Removed unwanted analytics graphs and added redirect to portal app.
|
8 years ago |
inoshperera
|
1e4983bdda
|
Merge branch 'master' of https://github.com/inoshperera/carbon-device-mgt-plugins
|
8 years ago |
Megala
|
82c2227929
|
Merge remote-tracking branch 'upstream/release-3.0.x' into embed
|
8 years ago |
sinthuja
|
f23fd9c85f
|
Merge branch 'android-sense-agent-fixes' into release-3.0.x
|
8 years ago |
Hasunie
|
54de97ec27
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Hasunie
|
0456502bbe
|
implementing windows 10 enrollment
|
8 years ago |
Menaka Jayawardena
|
8a759db8da
|
Changed the type check of location execution plan to 'gps'.
|
8 years ago |
Megala Uthayakumar
|
25abc5341f
|
Merge pull request #458 from Megala21/embed
Fixing the parent path problem
|
8 years ago |
Megala
|
6e23d498b8
|
Fixing the parent path problem
|
8 years ago |
Charitha Goonetilleke
|
7fa0a4b11f
|
Merge pull request #454 from madawas/IOTS-296
IOTS-296: Genaralizing policy view UI for windows and android
|
8 years ago |
charitha
|
5fc3e82d35
|
Fix agent download issue
|
8 years ago |
sinthuja
|
b14ec6ffa9
|
Merge pull request #457 from Megala21/embed
Removing unused version
|
8 years ago |
Megala
|
9635d94b66
|
Removing unused version
|
8 years ago |
sinthuja
|
ce8134bd28
|
Merge pull request #456 from Megala21/embed
Fixing the version problem
|
8 years ago |
Megala
|
5a3809b493
|
Fixing the version problem
|
8 years ago |
sinthuja
|
fa933059da
|
Merge pull request #455 from Megala21/embed
Adding siddhi extension and analytics for android-agent
|
8 years ago |
Megala
|
363dedaedd
|
Adding the focus point for map
|
8 years ago |
Megala
|
02f87e7531
|
Removing unwanted files
|
8 years ago |
Menaka Jayawardena
|
a2e8537fcf
|
Changed the realtime gadgets to get query parameters.
|
8 years ago |
Ace
|
17f82d1da3
|
Adding changes to descriptor and ui changes
|
8 years ago |
Megala
|
4bfd9a72b6
|
Adding siddhi extension and analytics for android-agent
|
8 years ago |
sinthuja
|
6426a87c8d
|
Fixing 'The cache status is not STARTED' issue whe sending the events from android sense.
|
8 years ago |
Rasika Perera
|
ac51eadade
|
Merge pull request #423 from ctienshi/master
Corrected spelling mistake
|
8 years ago |
Rasika Perera
|
5a71e03564
|
Merge pull request #453 from ruwany/release-3.0.x
Bug Fixes and changes to descriptor
|
8 years ago |
inoshperera
|
d3c5625eec
|
Merge pull request #451 from inoshperera/master
adding a button and connection to ios factory reset backend API
|
8 years ago |
Ace
|
3d21f84a76
|
merging with upstream
|
8 years ago |
Ace
|
3dd59ed250
|
Adding changes to descriptor and ui changes
|
8 years ago |