community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,208 Commits 31 Branches 461 Tags 183 MiB
a56b953fcb
Commit Graph

3208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kamidu
1af8184889 positioning modal content 2016-10-14 15:20:05 +05:30
Kamidu Sachith Punchihewa
3c0dc09be1 Merge pull request #391 from thusithak/master 
EMM 2.2.0-Alpha2 theme migration and issue fixes
 2016-10-14 14:17:51 +05:30
thusithakalugamage
3aae81d9e4 resolving conflicts - removing deprecated modal related methods 2016-10-14 14:16:53 +05:30
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
Megala
a04f91cddb Fixing issues related to mapping users and roles from different user stores 2016-10-14 10:59:56 +05:30
harshanl
954a2eb870 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-14 10:14:12 +05:30
Megala
87150f5074 Fixing secondary role deletion 2016-10-14 00:01:15 +05:30
Megala
2195a164e5 Merge remote-tracking branch 'upstream/master' 2016-10-13 21:28:51 +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
Megala
0756294724 Merge remote-tracking branch 'upstream/master' 2016-10-13 17:01:32 +05:30
Megala
d8555c34ab Fixing issues related with roles of secondary user store 2016-10-13 16:58:22 +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
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
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
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
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