Commit Graph

2208 Commits

Author SHA1 Message Date
Charitha Goonetilleke
1b51074070 Merge pull request #473 from wso2/release-3.0.3
Release 3.0.3
2016-12-09 12:22:03 +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
Charitha Goonetilleke
0850126a32 Merge pull request #472 from wso2/release-3.0.x
Adding for release
2016-12-09 10:47:01 +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
2cafb5ba43 Merge pull request #471 from chaturadilan/release-3.0.x
Fixed UI issue in Policy UI
2016-12-09 10:42:48 +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
aed31fb85b Bump carbon-device-mgt version to 2.0.3 for release 2016-12-08 23:56:34 +05:30
charitha
065c4c030b Bump carbon-device-mgt version to 2.0.3 for release 2016-12-08 22:20:19 +05:30
charitha
ba4be9ebe9 Bump carbon-device-mgt version to 2.0.3 for release 2016-12-08 22:18:17 +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
Harshan Liyanage
f3fa3511c6 Merge pull request #464 from hasuniea/release-3.0.x
adding windows annotations
2016-12-08 17:09:49 +05:30
Hasunie
68cabad5b8 deleting unused components 2016-12-08 16:43:05 +05:30
Harshan Liyanage
e047e0dab8 Merge branch 'harshanL-merge-master' 2016-12-08 16:40:32 +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
Charitha Goonetilleke
fbf7134de4 Merge pull request #462 from madawas/IOTS-296
IOTS-296: moving operation mod js to plugins
2016-12-08 15:07:50 +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
68270525ab Merge remote-tracking branch 'origin/release-3.0.x' into release-3.0.x 2016-12-07 17:20:36 +05:30
Menaka Jayawardena
2bd3c4a50c Added android sense battery execution plan. 2016-12-07 17:19:27 +05:30
Menaka Jayawardena
00913e64d2 Added android sense battery execution plan. 2016-12-07 17:17:56 +05:30
sinthuja
f864285454 Merge pull request #461 from Megala21/embed
Fixing bundle loading problem
2016-12-07 15:33:29 +05:30
Megala
b00c01ec84 Merge remote-tracking branch 'upstream/release-3.0.x' into embed 2016-12-07 15:31:32 +05:30
Megala
f808478c92 Fixing bundle loading problem 2016-12-07 15:29:32 +05:30