Commit Graph

3017 Commits

Author SHA1 Message Date
kamidu
bfc04a7f16 Fixing EMM-EMM-1753 2016-10-13 11:17:15 +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
Harshan Liyanage
1b1733e2ee Merge pull request #388 from Megala21/master
Fixing EMM-1333
2016-10-12 10:26:11 +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
hasuniea
33cc38defb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-11 16:56:10 +05:30
hasuniea
fa972fbf36 adding platform ios to cdm-config.xml 2016-10-11 16:55:40 +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
hasuniea
4f42980500 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-11 13:53:03 +05:30
hasuniea
799beb3c59 removing ios platform entry from cdm-config.xml 2016-10-11 13:52:46 +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
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