Commit Graph

1583 Commits

Author SHA1 Message Date
Hasunie
158e5fca2a removing services path 2016-12-15 14:38:20 +05:30
Hasunie
90ad21e960 adding bean refference for win10 2016-12-15 14:35:24 +05:30
Hasunie
fc7d86801f fixing windows8.1 Device name issue 2016-12-15 14:34:15 +05:30
Hasunie
9571d782c8 configure to enroll win10 on csr sigining step 2016-12-15 14:27:36 +05:30
Hasunie
b9b5edc342 adding new devicemanegement endpoint to getpending operations 2016-12-15 14:26:07 +05:30
Hasunie
c52c292d15 adding Device-Info operation 2016-12-15 14:25:01 +05:30
Hasunie
84a6522cb8 removing unwanted values from notification 2016-12-15 14:18:15 +05:30
Hasunie
120283adf4 adding windows10 csp 2016-12-15 14:09:54 +05:30
Megala
39bb1f92ba Removing hard coded values and adding missing file 2016-12-15 14:05:16 +05:30
Hasunie
89a4482124 adding windows 10 plugin constants 2016-12-15 14:02:07 +05:30
Hasunie
471c8c628b deleting unused hbs file 2016-12-15 13:59:39 +05:30
Menaka Jayawardena
ba5486c05c Typo fixed in analytics scripts. 2016-12-14 18:08:57 +05:30
sinthuja
b223f7374e Committing the changes for the android persisted goe alert. 2016-12-14 17:13:43 +05:30
sinthuja
550322fc0f Merge pull request #479 from menakaj/release-3.0.x
Removed unwanted artifact dependency.
2016-12-14 16:57:47 +05:30
Menaka Jayawardena
e47ae4cad2 Removed unwanted artifact dependancy. 2016-12-14 15:08:37 +05:30
Imesh Chandrasiri
fe195ca8f7 UI Fixes 2016-12-14 14:03:41 +05:30
Megala
0b1acaa990 Updating the agent apk file 2016-12-14 10:56:03 +05:30
Megala
ec5936d013 Updating the apk file to switch between event enabling and disabling 2016-12-13 19:37:42 +05:30
Megala
5eefdfc2c0 Merge remote-tracking branch 'upstream/release-3.0.x' into embed 2016-12-12 17:56:39 +05:30
Hasunie
316362e974 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2016-12-12 00:52:27 +05:30
Hasunie
d3bf748233 implementing windows10 devicemgt session 2016-12-12 00:34:23 +05:30
Hasunie
b57573ecae Merging relese-3.0.x 2016-12-12 00:27:16 +05:30
Rasika Perera
b5e220799a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-09 18:39:59 +05:30
WSO2 Builder
a398686ec7 [maven-release-plugin] prepare for next development iteration 2016-12-09 05:46:04 +00:00
WSO2 Builder
3bafccc303 [maven-release-plugin] prepare release v3.0.3 2016-12-09 05:43:17 +00:00
Hasunie
359bd948d2 Fixing bst issue 2016-12-09 10:53:07 +05:30
Hasunie
222ef41a3f Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-09 10:43:50 +05:30
Chatura Dilan
49d81766f6 fixed conflicts 2016-12-09 10:35:36 +05:30
Chatura Dilan
e22d4d3530 Fixed UI issues in the policy screen 2016-12-09 10:29:53 +05:30
Megala
5b7b4124b0 Adding minor UI fixes 2016-12-09 10:10:47 +05:30
Hasunie
0e680ab26b fixing json provider issue in windows cxf 2016-12-09 09:36:27 +05:30
Charitha Goonetilleke
6cea2f19fc Merge pull request #470 from hasuniea/release-3.0.x
fixing message issue in configurationmgtservice
2016-12-08 20:08:24 +05:30
charitha
a49a5650c6 Fix issues 2016-12-08 20:07:16 +05:30
Hasunie
34153371d3 fixing message issue in configurationmgtservice 2016-12-08 19:15:34 +05:30
charitha
1598748a5b Merge branch 'release-3.0.x' of https://github.com/menakaj/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 19:13:31 +05:30
charitha
5d7fd0d66d Merge branch 'harshanL-master' of https://github.com/harshanL/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 19:00:22 +05:30
Harshan Liyanage
ce5d907801 Added operation bar.json 2016-12-08 18:55:50 +05:30
Harshan Liyanage
2f7214cd5b Resolved conflicts in device type-vies files. 2016-12-08 18:31:53 +05:30
Harshan Liyanage
f55cd20a73 Resolved conflicts in device type-vies files. 2016-12-08 18:27:56 +05:30
Ruwan
82c0af1053 Merge pull request #467 from madhawap/release-3.0.x
Adding separate tasks to carry out device monitoring for each device type
2016-12-08 18:12:59 +05:30
Harshan Liyanage
26bbb55af5 Resolved conflicts with release-3.0.x 2016-12-08 18:07:14 +05:30
Menaka Jayawardena
bad0331dc7 Added new Android Sense Agent 2016-12-08 17:56:29 +05:30
madhawap
6618b919d1 Adding separate tasks to carry out device monitoring for each device type 2016-12-08 17:40:43 +05:30
Charitha Goonetilleke
34fb3cad0b Merge pull request #459 from menakaj/release-3.0.x
Android Sense stabilization
2016-12-08 17:23:57 +05:30
Hasunie
68cabad5b8 deleting unused components 2016-12-08 16:43:05 +05:30
Harshan Liyanage
559fa3fe38 Resolved conflicts 2016-12-08 16:40:18 +05:30
Menaka Jayawardena
862a14c2b5 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 16:37:52 +05:30
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.
2016-12-08 16:36:29 +05:30
Hasunie
d2d39a241e adding error handler 2016-12-08 16:18:01 +05:30
Hasunie
b3eacb99cd Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 16:06:17 +05:30
Hasunie
36cbc96713 adding swagger annotations 2016-12-08 16:04:46 +05:30
Madawa Soysa
548213d601 Fixing issue with COSU policy configuration 2016-12-08 14:22:23 +05:30
Rasika Perera
f8817988b6 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 14:03:18 +05:30
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.
2016-12-08 12:26:36 +05:30
Menaka Jayawardena
49ee7c2986 Added new battery history chart gadget. 2016-12-08 12:16:22 +05:30
Menaka Jayawardena
779435a91d Persisting battery data stream and added analytics scripts. 2016-12-08 12:15:43 +05:30
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.
2016-12-08 10:32:35 +05:30
Rasika Perera
c722dfa779 Adding ui permissions to the operations on android 2016-12-07 22:57:53 +05:30
Menaka Jayawardena
2bd3c4a50c Added android sense battery execution plan. 2016-12-07 17:19:27 +05:30
Megala
f808478c92 Fixing bundle loading problem 2016-12-07 15:29:32 +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
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
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
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
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
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
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
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
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
Imesh Chandrasiri
446e2427e0 Layout changes for device enrollment views commit 2 2016-12-05 12:15:29 +05:30
Imesh Chandrasiri
b55c64d551 Layout changes for device enrollment views 2016-12-05 11:49:40 +05:30