Commit Graph

2480 Commits

Author SHA1 Message Date
Menaka Jayawardena
e47ae4cad2 Removed unwanted artifact dependancy. 2016-12-14 15:08:37 +05:30
Charitha Goonetilleke
cf2753832f Merge pull request #478 from DimalChandrasiri/release-3.0.x
Merging UI/UX improvements
2016-12-14 14:13:30 +05:30
Imesh Chandrasiri
fe195ca8f7 UI Fixes 2016-12-14 14:03:41 +05:30
Charitha Goonetilleke
f2eb83df21 Merge pull request #477 from Megala21/embed
Updating the agent apk file
2016-12-14 10:58:50 +05:30
Megala
0b1acaa990 Updating the agent apk file 2016-12-14 10:56:03 +05:30
Milan Perera
72a33b7930 Fixed conflicts and merged 2016-12-14 09:20:42 +05:30
Milan Perera
4dfc49474c Upgraded APIM and Identity OAuth module 2016-12-14 08:53:28 +05:30
Charitha Goonetilleke
b85a7b493a Merge pull request #476 from Megala21/embed
Fixing UI issues and updating apk file to switch between enabling and disabling events
2016-12-14 08:30:49 +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
Hasunie
31ac1961e1 Merge pull request #475 from harshanL/release-3.0.x
Fixed maven warnings in plugin build.
2016-12-09 16:24:28 +05:30
Harshan Liyanage
53750eec6e Fixed maven warnings in plugin build. 2016-12-09 16:21:38 +05:30
charitha
0b0c9eef04 Prepare for next development iteration 2016-12-09 12:45:34 +05:30
charitha
48bbe8d657 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-09 12:35:58 +05:30
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
Milan Perera
6ad6bbbdc0 Commiting permission-scope mapping improvements 2016-12-08 20:41:44 +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