Commit Graph

3002 Commits

Author SHA1 Message Date
Shavindri
c64581dc59 Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex 2016-10-13 13:45:02 +05:30
Shavindri
9ceb031677 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-11 11:16:50 +05:30
Kamidu Sachith Punchihewa
ecc70ead08 Merge pull request #385 from hastef88/emm1726
EMM-1726
2016-10-11 11:12:57 +05:30
Kamidu Sachith Punchihewa
af4989e56d Merge pull request #384 from shavidissa/master
swagger annotations and definition update continued for device type, …
2016-10-11 11:12:16 +05:30
Shavindri
1e32d5f89f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-11 11:05:25 +05:30
Hasitha Amal De Silva
4555819211 EMM-1726 - disable apply changes button if the priority has changed without pressing save priority button. 2016-10-11 11:01:30 +05:30
Shavindri
0842dcb2bb swagger annotations and definition update continued for device type, device, policy, role, user, group and user management. 2016-10-11 10:33:05 +05:30
Milan Perera
bb60caa171 Merge pull request #383 from ayyoob/st2
fixed api name for device type
2016-10-10 20:51:40 +05:30
ayyoob
93c1725e32 fixed api name for device type 2016-10-10 20:47:31 +05:30
kamidu
6d5fae0b0c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-10 18:27:59 +05:30
kamidu
8c94e83431 Fix for Jira : EMM-1682 and EMM-1653 2016-10-10 18:27:53 +05:30
kamidu
2f852d84f4 Fix for the issue : EMM policy updating issue 2016-10-10 16:37:37 +05:30
harshanl
a4b6bb85b1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-10 14:46:14 +05:30
harshanl
45e584a064 Fixed arithmetic overflow issue in MSSQL 2016-10-10 14:46:05 +05:30
kamidu
836ed2bc1c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-10 14:16:00 +05:30
kamidu
3223e29df9 Fix for EMM-1185 , EMM- 1619 2016-10-10 14:15:52 +05:30
Harshan Liyanage
83c36d4d3c Merge pull request #382 from Megala21/master
Fixing EMM-1717
2016-10-10 11:42:17 +05:30
Megala
235e9797d4 Fixing EMM-1717 2016-10-10 11:36:25 +05:30
Ruwan
9687d554a6 Merge pull request #381 from ayyoob/st2
Fixed the issues related to apimgt integration
2016-10-09 21:41:27 +04:00
ayyoob
92d30eaadc config update 2016-10-09 22:47:17 +05:30
ayyoob
852ea00403 refactored method name 2016-10-09 19:10:43 +05:30
ayyoob
5727886ea1 few changes after apimgt integration 2016-10-09 03:16:02 +05:30
hasuniea
05e95e2675 fix the EMM-1702 2016-10-07 15:48:43 +05:30
Kamidu Sachith Punchihewa
8740eae61a Merge pull request #380 from DimalChandrasiri/master
Fix for modal popup overlay bug
2016-10-07 14:38:04 +05:30
Imesh Chandrasiri
125b827f4f Fix for modal popup overlay bug 2016-10-07 14:27:00 +05:30
Kamidu Sachith Punchihewa
a8e7396589 Merge pull request #377 from DimalChandrasiri/master
Parameterized datatable sorting function
2016-10-07 13:10:35 +05:30
Kamidu Sachith Punchihewa
6dafd11ca9 Merge pull request #379 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
2016-10-07 13:10:20 +05:30
harshanl
4ce9c95044 Changed getOperations API to return operation list of removed devices 2016-10-07 12:34:42 +05:30
thusithakalugamage
84a7d5517f EMM-1685] - fix and few other related improvements 2016-10-07 12:31:46 +05:30
thusithakalugamage
11544fab15 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-07 12:09:48 +05:30
Imesh Chandrasiri
bce1d9e060 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-07 10:11:35 +05:30
Imesh Chandrasiri
3e4c1f9121 Parametarized datatable sorting function 2016-10-07 10:11:21 +05:30
Kamidu Sachith Punchihewa
5e6d8e667d Merge pull request #376 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
2016-10-06 22:46:51 +05:30
kamidu
131bcd48f9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-06 22:33:15 +05:30
kamidu
cc6922bfad Fix for EMM-1680 2016-10-06 22:33:08 +05:30
thusithakalugamage
8b221b2fc6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-06 19:48:52 +05:30
harshanl
4bcf350236 EMM-1678:Updated the oauth component versions 2016-10-06 19:43:23 +05:30
thusithakalugamage
1a1f79b1b4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-06 17:46:59 +05:30
thusithakalugamage
ac27349dae Header nav menu responsiveness improvements 2016-10-06 17:45:55 +05:30
kamidu
fc902ba602 fix database extended issue 2016-10-06 17:25:47 +05:30
thusithakalugamage
a56aac7b87 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-06 16:42:20 +05:30
thusithakalugamage
909e7836ca Header nav menu responsiveness improvements 2016-10-06 16:41:31 +05:30
kamidu
fc50b851bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-06 16:26:55 +05:30
kamidu
4bbb378d26 conicting solving 2016-10-06 16:26:50 +05:30
Kamidu Sachith Punchihewa
848e58f094 Merge pull request #375 from Megala21/master
Fixing EMM-1587
2016-10-06 16:20:57 +05:30
Megala
c022f51467 Fixing EMM-1587 2016-10-06 15:44:53 +05:30
kamidu
e2ee797462 Fix for EMM-1700 2016-10-06 12:20:07 +05:30
Kamidu Sachith Punchihewa
7d7977cbdc Merge pull request #374 from madhawap/master
changes to swagger SecurityDefinitionConfigurator and annotations
2016-10-06 12:16:00 +05:30
madhawap
16b334b0b3 changes to swagger SecurityDefinitionConfigurator and annotations 2016-10-06 12:13:27 +05:30
madhawap
7b8518a9db changes to swagger SecurityDefinitionConfigurator and annotations 2016-10-06 11:59:20 +05:30