Commit Graph

2208 Commits

Author SHA1 Message Date
inoshperera
5fd20a6a3e Merge pull request #460 from inoshperera/master
adding UI for clear passcode
2016-12-07 14:53:02 +05:30
inoshperera
fc3cb449be adding UI for clear passcode 2016-12-07 14:35:22 +05:30
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
2016-12-07 12:09:50 +05:30
Menaka Jayawardena
8ad1b0a891 Removed unwanted analytics graphs and added redirect to portal app. 2016-12-07 11:57:46 +05:30
inoshperera
1e4983bdda Merge branch 'master' of https://github.com/inoshperera/carbon-device-mgt-plugins 2016-12-07 11:30:22 +05:30
Megala
82c2227929 Merge remote-tracking branch 'upstream/release-3.0.x' into embed 2016-12-07 11:03:48 +05:30
sinthuja
f23fd9c85f Merge branch 'android-sense-agent-fixes' into release-3.0.x 2016-12-07 11:00:49 +05:30
Hasunie
54de97ec27 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-07 09:23:33 +05:30
Hasunie
0456502bbe implementing windows 10 enrollment 2016-12-07 09:18:43 +05:30
Menaka Jayawardena
8a759db8da Changed the type check of location execution plan to 'gps'. 2016-12-07 01:32:18 +05:30
Megala Uthayakumar
25abc5341f Merge pull request #458 from Megala21/embed
Fixing the parent path problem
2016-12-06 21:38:24 +05:30
Megala
6e23d498b8 Fixing the parent path problem 2016-12-06 21:35:44 +05:30
Charitha Goonetilleke
7fa0a4b11f Merge pull request #454 from madawas/IOTS-296
IOTS-296: Genaralizing policy view UI for windows and android
2016-12-06 19:11:24 +05:30
charitha
5fc3e82d35 Fix agent download issue 2016-12-06 19:00:56 +05:30
sinthuja
b14ec6ffa9 Merge pull request #457 from Megala21/embed
Removing unused version
2016-12-06 17:52:15 +05:30
Megala
9635d94b66 Removing unused version 2016-12-06 17:47:44 +05:30
sinthuja
ce8134bd28 Merge pull request #456 from Megala21/embed
Fixing the version problem
2016-12-06 17:46:33 +05:30
Megala
5a3809b493 Fixing the version problem 2016-12-06 17:40:27 +05:30
sinthuja
fa933059da Merge pull request #455 from Megala21/embed
Adding siddhi extension and analytics for android-agent
2016-12-06 17:32:50 +05:30
Megala
363dedaedd Adding the focus point for map 2016-12-06 17:29:41 +05:30
Megala
02f87e7531 Removing unwanted files 2016-12-06 17:26:35 +05:30
Menaka Jayawardena
a2e8537fcf Changed the realtime gadgets to get query parameters. 2016-12-06 17:26:00 +05:30
Ace
17f82d1da3 Adding changes to descriptor and ui changes 2016-12-06 17:22:45 +05:30
Megala
4bfd9a72b6 Adding siddhi extension and analytics for android-agent 2016-12-06 17:18:20 +05:30
sinthuja
6426a87c8d Fixing 'The cache status is not STARTED' issue whe sending the events from android sense. 2016-12-06 16:40:18 +05:30
Rasika Perera
ac51eadade Merge pull request #423 from ctienshi/master
Corrected spelling mistake
2016-12-06 16:36:43 +05:30
Rasika Perera
5a71e03564 Merge pull request #453 from ruwany/release-3.0.x
Bug Fixes and changes to descriptor
2016-12-06 16:35:37 +05:30
inoshperera
d3c5625eec Merge pull request #451 from inoshperera/master
adding a button and connection to ios factory reset backend API
2016-12-06 13:53:52 +05:30
Ace
3d21f84a76 merging with upstream 2016-12-06 13:34:28 +05:30
Ace
3dd59ed250 Adding changes to descriptor and ui changes 2016-12-06 13:31:41 +05:30
Madawa Soysa
cb44d9a824 IOTS-296: Genaralizing policy view UI for windows and android
Moving device type specific UI components related to policy view. This commit includes modifications for both android and windows plugins.
2016-12-06 12:22:25 +05:30
sinthuja
59fd3a6fc7 Merge pull request #450 from menakaj/android-sense-agent-fixes
Android sense agent fixes
2016-12-06 10:53:38 +05:30
Ruwan
8a45e09b63 Merge pull request #452 from harshanL/release-3.0.x
Updated carbon component versions to include security fixes
2016-12-06 10:38:57 +05:30
Harshan Liyanage
765b47772d Updated carbon component versions to include security fixes 2016-12-06 10:35:35 +05:30
Menaka Jayawardena
1cb9be42fd Corrected package names. 2016-12-05 21:49:15 +05:30
Menaka Jayawardena
9e92fc6963 Added classes for reading network data. 2016-12-05 21:48:22 +05:30
Imesh Chandrasiri
c884ec34d1 Fixing text overlapping and UX issues in device pages commit 2 2016-12-05 16:20:32 +05:30
Imesh Chandrasiri
f642b18b29 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-05 16:13:41 +05:30
Imesh Chandrasiri
ba0eea6344 Fixing text overlapping and UX issues in device pages 2016-12-05 16:13:23 +05:30
sinthuja
32a5a8bd9e Merge pull request #449 from Megala21/embed
Adding execution plan for android sense geolocation
2016-12-05 16:11:18 +05:30
Megala
ba0c973aa9 Addding execution plan 2016-12-05 15:32:21 +05:30
Megala
453989db03 Adding execution plan for android sense geolocation 2016-12-05 15:27:55 +05:30
Hasunie
ad812f2328 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-05 15:21:10 +05:30
sinthuja
4e9cea4b00 Merge pull request #448 from menakaj/android-sense-agent-fixes
Modifications for Android Sense app.
2016-12-05 15:18:08 +05:30
Menaka Jayawardena
60cc084170 Modifications for Android Sense app.
1. Updated agent enrollment process.
2. Fixed ArrayIndexOutOfBound exception when enrolling.
3. Added Network data to the event stream.
2016-12-05 15:10:44 +05:30
Charitha Goonetilleke
c9a8566e94 Merge pull request #446 from DimalChandrasiri/release-3.0.x
Layout changes for device enrollment views
2016-12-05 14:19:44 +05:30
sinthuja
9e9a480486 Merge pull request #447 from Megala21/embed
Adding minor fixes to geo fencing
2016-12-05 14:12:30 +05:30
Megala
f851b15e49 Reverting changes to android-sense 2016-12-05 13:49:20 +05:30
Megala
e55c380120 Removing the hard coded type 2016-12-05 13:43:15 +05:30
Charitha Goonetilleke
e4ce5a29fa Merge pull request #445 from GPrathap/release-3.0.x
added expiration time of application access token
2016-12-05 12:53:28 +05:30