Commit Graph

2454 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
Kamidu Sachith Punchihewa
cb825a7f26 Merge pull request #389 from susinda/master
Device delete implemented (only in api level) for iot and the fix for the EMM-1715
2016-10-13 12:25:56 +05:30
kamidu
2ea21a6fdc renaming public js to match the unit structure 2016-10-13 12:22:07 +05:30
susinda
ca68181541 Fixing NPE of EMM-1715 2016-10-13 12:11:37 +05:30
susinda
eb20d1fc1c Device delete implemented (only in api level) for iot 2016-10-13 12:02:00 +05:30
kamidu
959e3a63af Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-13 11:17:32 +05:30
kamidu
bfc04a7f16 Fixing EMM-EMM-1753 2016-10-13 11:17:15 +05:30
hasuniea
2128f08658 fixing EMM-1750 2016-10-13 10:00:08 +05:30
Rasika Perera
790ca36443 Removed unnecessary debug log 2016-10-13 08:22:37 +05:30
Rasika Perera
135b6e8881 Fixing device view page 2016-10-13 08:16:51 +05:30
kamidu
c4a0ac4bf3 Enable centralized modal handling unit for cdmf 2016-10-12 17:39:31 +05:30
kamidu
6605a86bf7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-12 16:11:00 +05:30
kamidu
43b1a9f278 Fix for EMM-1651 2016-10-12 16:09:28 +05:30
charitha
528687bde3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-12 12:59:41 +05:30
charitha
0498c68ca5 Add validation to maximum limit value
(cherry picked from commit 4ed757f)
2016-10-12 12:57:57 +05:30
Megala
4999b84169 Reformatting code 2016-10-12 09:41:43 +05:30
Megala
5b96e1b849 Fixing EMM-1333 2016-10-12 09:38:11 +05:30
thusithakalugamage
fa3db47400 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-11 18:36:56 +05:30
thusithakalugamage
48337ee16c [EMM-1618] - related improvements on remaining occurences 2016-10-11 18:35:47 +05:30
Rasika Perera
2340611a9b Removing mdm specific dependencies from CDMF 2016-10-11 15:41:25 +05:30
Milan Perera
da4a558d87 Merge pull request #387 from ayyoob/st2
added gateway mode to decide to which oauth app to use.
2016-10-11 15:35:26 +05:30
ayyoob
2f58e0ba15 added gateway mode to decide to which oauth app to use. 2016-10-11 15:15: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
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
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
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
Megala
235e9797d4 Fixing EMM-1717 2016-10-10 11:36:25 +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
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
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
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
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
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
Kamidu Sachith Punchihewa
06e70c8326 Merge pull request #373 from shavidissa/master
swagger annotations and definitions changes for role management, configuration management and application management(admin)
2016-10-06 11:33:31 +05:30
Shavindri
f0164b5a01 swagger annotations and definitions changes for role management, configuration management and application management(admin) 2016-10-06 10:12:25 +05:30
thusithakalugamage
2ae60cc415 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-05 19:18:22 +05:30
thusithakalugamage
88ec5246ec [EMM-1694] - Header responsive issues fix 2016-10-05 19:17:51 +05:30
kamidu
1fe74905f2 Fix for the redirection and ui related issues 2016-10-05 18:11:46 +05:30
Imesh Chandrasiri
ebad678bab Datatables serverside paging redirection bug fix 2016-10-05 15:08:34 +05:30
kamidu
8c98accd18 Fixing conflitcs 2016-10-05 12:24:23 +05:30
kamidu
c6fffb0b3a Fixies for the ui issues in EMM -beta 2016-10-05 12:22:32 +05:30
Megala
e77d8b8b29 Adding isEmpty check 2016-10-05 11:34:05 +05:30
Megala
0642cc10d7 Reformatting code 2016-10-05 10:52:40 +05:30
Megala
f9204add08 Merge remote-tracking branch 'upstream/master' 2016-10-05 10:10:12 +05:30
Megala
42a9ba92a6 Fixing EMM-1683 2016-10-05 10:09:35 +05:30
Megala
b7990b9146 Fixing problems in retriveing data from secondary user store 2016-10-04 17:22:45 +05:30
Kamidu Sachith Punchihewa
c7bd0de033 Merge pull request #369 from thusithak/master
Platform configuration style defect fixes
2016-10-04 17:09:53 +05:30
Dilan U. Ariyaratne
2d7506d9b8 Merge pull request #368 from amalhub/master
Fixing issue: EMM-1537
2016-10-04 17:04:55 +05:30
dilanua
dff32af832 Adding initial swagger annotations and permissions to Dashboard APIs 2016-10-04 16:25:17 +05:30
dilanua
1ca5762c44 Uncommenting Dashboard APIs 2016-10-04 15:49:29 +05:30
thusithakalugamage
f664749c1f platform configuration style defect fixes 2016-10-04 15:22:41 +05:30
Shavindri
3d383b0414 test push reverse 2016-10-04 13:39:08 +05:30
Shavindri
b77aefa02c test push 2016-10-04 13:34:44 +05:30
kamidu
f32caf1833 UI fixes in 2.2.0-beta 2016-10-04 13:20:09 +05:30
kamidu
7898a7475c UI fixes in 2.2.0-beta 2016-10-04 12:24:41 +05:30
amalhub
c87c5a8322 Fixing issue: EMM-1537 2016-10-04 11:14:39 +05:30
harshanl
f0f0182d20 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-03 18:28:43 +05:30
harshanl
a4538a6d6c Removed unnecessary params from paginated queries 2016-10-03 18:27:20 +05:30
Rasika Perera
35c23174be Fixing android sense download issue 2016-10-03 16:05:49 +05:30
Rasika Perera
0290c710e1 Fixing enrollment url for device types 2016-10-03 16:05:49 +05:30
Harshan Liyanage
13d9bdfb53 Merge pull request #367 from Megala21/master
[EMM-1129]Fixing SSO problem
2016-10-03 15:42:13 +05:30
Megala
359bd8f317 Fixing tenant loading problem 2016-10-03 15:15:27 +05:30
harshanl
672de3a09e Device status change fix for iOS 2016-10-03 14:57:46 +05:30
Megala
e8eb0123c7 Fixing the tenant loading problem when sso is enabled 2016-10-03 14:18:43 +05:30
harshanl
befb5b0ad8 EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password. 2016-10-03 14:13:06 +05:30
amalhub
8b4649b4e5 Fixing issue: EMM-1537 2016-10-03 11:39:03 +05:30
Megala
a0586ca977 Adding comment 2016-10-03 11:34:00 +05:30
Megala
e5870e1306 Fixing the problem of common log out 2016-10-02 23:15:25 +05:30
Megala
b10c323582 Fixing the problem in login 2016-10-02 21:26:13 +05:30
Megala
bacd7ccfd2 Merge remote-tracking branch 'upstream/master' 2016-10-01 22:02:35 +05:30
Megala
4af2a37d9d Fixing SSO problem 2016-10-01 22:00:59 +05:30
harshanl
406d49ad61 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-30 18:43:38 +05:30
harshanl
399ef2fc06 Windows getOpending operations fix 2016-09-30 15:33:59 +05:30
kamidu
5595100cc2 UI fixes in role and policy management 2016-09-30 15:10:34 +05:30
harshanl
9d31590e83 Windows getPending operations fix 2016-09-30 14:27:11 +05:30