Commit Graph

1660 Commits

Author SHA1 Message Date
kamidu
058c96e87c Fix for EMM-1468 2016-10-07 13:08:29 +05:30
kamidu
7635db3167 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-07 10:04:31 +05:30
kamidu
85e1241feb Fixing type check in device view 2016-10-07 10:04:25 +05:30
Kamidu Sachith Punchihewa
bd2197d489 Merge pull request #357 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
2016-10-06 22:47:21 +05:30
kamidu
68840eae94 Fix for EMM-1680 2016-10-06 22:38:47 +05:30
harshanl
f43ba554d5 EMM-1678:Updated the oauth component versions 2016-10-06 19:44:47 +05:30
thusithakalugamage
324952defc policy edit button group clear fix 2016-10-06 18:57:49 +05:30
Milan Perera
2bda72a5ce Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins 2016-10-06 17:39:42 +05:30
Milan Perera
75f4e91004 Fixed conflicts and merged 2016-10-06 17:39:37 +05:30
Milan Perera
72329d93f0 Added pulse secure payload to UI 2016-10-06 17:36:13 +05:30
thusithakalugamage
06b2c44644 Header nav menu responsiveness improvements 2016-10-06 16:41:52 +05:30
kamidu
9f558ffd0f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-06 15:08:43 +05:30
kamidu
b3b429b664 Fixing EMM-1697 2016-10-06 15:00:01 +05:30
kamidu
db581a9575 removing redundence loggings 2016-10-06 12:20:52 +05:30
Kamidu Sachith Punchihewa
ffd5597828 Merge pull request #356 from Megala21/master
Fixing EMM-1688
2016-10-06 12:07:20 +05:30
Megala
10372a7f4e Changing the equality check 2016-10-06 11:50:57 +05:30
Megala
51d6baf1d2 Reformatting code 2016-10-06 11:48:23 +05:30
Kamidu Sachith Punchihewa
4312d94e35 Merge pull request #355 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
2016-10-06 11:33:07 +05:30
Megala
4c54ba434a Fixing EMM-1688 2016-10-06 11:31:45 +05:30
thusithakalugamage
97f3dcf4c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-05 19:18:16 +05:30
thusithakalugamage
9d9e8a8195 [EMM-1694] - Header responsive issues fix 2016-10-05 19:18:06 +05:30
kamidu
7431654f25 Fix for device view consistancy problems 2016-10-05 18:15:11 +05:30
thusithakalugamage
3acaf47209 Device details view tablist container height defect fix 2016-10-05 12:50:47 +05:30
kamidu
22ec7aa695 Fixes for the ui isuess in EMM 2.2.0-beta 2016-10-05 12:25:37 +05:30
kamidu
5936884c16 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-05 12:23:04 +05:30
harshanl
529ed17f82 New android agent with complaince monitoring issue fix 2016-10-04 20:03:03 +05:30
Kamidu Sachith Punchihewa
aac9aba02c Merge pull request #344 from thusithak/master
Theme migration for 2.2.0 - Policy Creation, Edit, View panel header fixes
2016-10-04 17:09:42 +05:30
thusithakalugamage
c37ad8f56d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-04 15:15:47 +05:30
thusithakalugamage
73a600713c resolving conflicts 2016-10-04 15:13:04 +05:30
kamidu
faf0f36683 Fix for EMM-1665 2016-10-04 13:27:21 +05:30
Rasika Perera
119a3e16c5 Fixes to android sense download 2016-10-03 21:22:39 +05:30
Rasika Perera
214e56770b Upgrading carbon-analytics version from 1.0.6-ALPHA to 1.2.8 2016-10-03 21:22:39 +05:30
Rasika Perera
20f0720a72 Styling improvements to the virtual firealarm agent download 2016-10-03 16:18:54 +05:30
Rasika Perera
6cbbb75c45 Fixing android sense download issue 2016-10-03 16:05:22 +05:30
Rasika Perera
d58b8f1f53 Fixing realtime analytics websocket authentication 2016-10-03 16:05:22 +05:30
Chatura Dilan Perera
6dfb33ed33 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-03 14:16:49 +05:30
Chatura Dilan Perera
6e24d637bd Fixed version issues in pom.xml 2016-10-03 14:16:35 +05:30
harshanl
6b09844f56 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-03 12:17:02 +05:30
harshanl
df6b0f9612 Updated MSSQL scripts to have IF-NOT-EXISTS statements 2016-10-03 12:16:45 +05:30
thusithakalugamage
0cbf647854 resolving conflicts 2016-10-03 11:56:57 +05:30
kamidu
19a2c1d1bd Fix for Jira issue : EMM-1639 2016-10-03 11:50:57 +05:30
hasuniea
2ad390b877 removing duplicate event related classes 2016-09-30 13:40:17 +05:30
Chatura Dilan Perera
d64f1145c8 pom.xml version changes 2016-09-29 22:20:46 +05:30
Chatura Dilan Perera
0b66649841 [maven-release-plugin] prepare for next development iteration 2016-09-29 21:47:43 +05:30
Chatura Dilan Perera
362003c9ab [maven-release-plugin] prepare release v2.2.2 2016-09-29 21:47:34 +05:30
Chatura Dilan Perera
97b52b3645 changes to pom.xml 2016-09-29 21:44:15 +05:30
Chatura Dilan Perera
d2bb23208d Merge branch 'master' into release-2.2.2 2016-09-29 21:31:18 +05:30
harshanl
821142b78d windows ui fix 2016-09-29 21:29:51 +05:30
Chatura Dilan Perera
bba34ddec1 changes to pom.xml 2016-09-29 21:20:24 +05:30
Chatura Dilan Perera
84bafdf1fd change versions 2016-09-29 21:14:52 +05:30