thusithakalugamage
|
47ca8942b6
|
resolving conflicts - removing deprecated modal related methods
|
2016-10-14 14:11:49 +05:30 |
|
thusithakalugamage
|
308eeb6cf8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-14 13:52:42 +05:30 |
|
harshanl
|
a89b50197f
|
EMM-1757:Fixed admin device-detail view issue
|
2016-10-14 13:21:51 +05:30 |
|
harshanl
|
954a2eb870
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-14 10:14:12 +05:30 |
|
kamidu
|
6886233bb9
|
removing unnecessary and improving styling in modal unit
|
2016-10-13 19:53:54 +05:30 |
|
thusithakalugamage
|
6667a41378
|
resolving conflicts
|
2016-10-13 19:03:44 +05:30 |
|
harshanl
|
24c38602b8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-13 17:11:42 +05:30 |
|
harshanl
|
51910ee67a
|
EMM-1675:Added policy revoke operation
|
2016-10-13 17:11:36 +05:30 |
|
kamidu
|
bbfa1c334d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-13 15:16:31 +05:30 |
|
kamidu
|
ed70cb02b6
|
Sample implimentation using the new cdmf.ui.modal unit
|
2016-10-13 15:16:09 +05:30 |
|
Kamidu Sachith Punchihewa
|
cce4428a9d
|
Merge pull request #390 from shavidissa/master
Removed the GroupManagementService and GroupManagementAdminService references from the APIs and continued adding swagger annotations
|
2016-10-13 14:01:49 +05:30 |
|
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 |
|