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,153 Commits 31 Branches 461 Tags 183 MiB
b8d8b35847
Commit Graph

459 Commits

Author SHA1 Message Date
charitha
b8d8b35847 Merge branch 'IoTS-1.0.0' of https://github.com/sameeragunarathne/carbon-device-mgt into IoTS-1.0.0 2016-11-15 13:54:59 +05:30
sameera910409
02eec1033e add group sharing role create functionality 2016-11-15 12:20:58 +05:30
sinthuja
2f59f1566c Changing the port to the default port of the analytics pack. 2016-11-09 16:12:58 +05:30
ayyoob
44ac6b13b5 changes in UI after refactoring 2016-11-07 00:51:08 +05:30
charitha
bb60acd105 Fix device listing issue 2016-11-02 12:59:43 +05:30
ayyoob
33bb9b5a14 merged with IoTS-1.0.0 branch 2016-11-02 06:51:28 +05:30
sinthuja
a5212213cf Changing the default wbsocket URL to DAS endpoint. 2016-11-01 19:55:22 +05:30
charitha
d1a6353195 Synced with changes in master 2016-11-01 15:41:51 +05:30
charitha
4a115e5d3f Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-01 15:01:53 +05:30
charitha
ac30e7eb3e Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
 2016-11-01 14:47:21 +05:30
kamidu
0867b3d075 updating the footer 2016-10-31 15:39:10 +05:30
Rasika Perera
fbe423b824 Using permissionsUtil.hasPermission for clientside permission check 2016-10-29 23:46:49 +05:30
Rasika Perera
b1b6b94570 Adding permissionsUtil 2016-10-29 23:13:52 +05:30
sameera910409
f8f7dd08cd fixed share groups and group analytics in device grouping 2016-10-28 14:07:50 +05:30
Harshan Liyanage
261e8c510c Fixed syntax issue in device.js file 2016-10-27 15:32:38 +05:30
kamidu
12e609c737 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-26 17:40:05 +05:30
kamidu
0c70c87406 fix for EMM-1673 2016-10-26 17:39:47 +05:30
Kamidu Sachith Punchihewa
02d3adf51e Merge pull request #401 from madawas/modal-refactor 
Refactoring pages to use new modal unit
 2016-10-26 17:29:50 +05:30
Kamidu Sachith Punchihewa
9d90411189 Merge pull request #402 from madawas/EMM-1298 
Fix for EMM-1298
 2016-10-26 17:27:33 +05:30
sameera910409
204a0ed943 fixes for the comments of the PR#404 2016-10-26 15:14:53 +05:30
Megala
a088392b2f Adding css for required fields 2016-10-26 11:58:23 +05:30
sameera910409
fef7c07cb2 add device group deleting and updating fixes 2016-10-26 10:08:48 +05:30
sameera910409
41f367abfa add group listing and group device listing fixes 2016-10-25 17:48:16 +05:30
Ruwan
072119d7df Merge pull request #403 from ayyoob/commit-fixes 
Commit fixes
 2016-10-25 15:29:04 +05:30
charitha
5f68953b11 Merge branch 'master' into IoTS-1.0.0 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
 2016-10-25 14:22:44 +05:30
Madawa Soysa
774eaadb71 EMM-1298: Extracting serial number from the certificate itself when adding a certificate 2016-10-25 11:43:58 +05:30
kamidu
65ed6c2f6e include owner for the operations api 2016-10-25 11:31:00 +05:30
Madawa Soysa
f6ee6aeb8d Refactoring pages to use new modal unit 2016-10-21 17:19:36 +05:30
Megala
35d6d311a7 Fixing EMM-1763 2016-10-19 11:55:00 +05:30
Kamidu Sachith Punchihewa
fa7c8e85ce Merge pull request #393 from thusithak/master 
Fixing modal dialog markup defects in unit
 2016-10-18 16:58:48 +05:30
Megala
3416ae78c4 Fixing the problems in displaying user list when the user names has special chracters 2016-10-17 16:35:58 +05:30
Megala
1ff86289fd Fixing the problems that happend when we have special chracters in roles 2016-10-17 15:47:32 +05:30
Megala
4ec6883ec8 Merge remote-tracking branch 'upstream/master' 2016-10-17 14:51:20 +05:30
Megala
4a71be850c Refactoring code 2016-10-17 14:23:55 +05:30
Rasika Perera
b8f623e04a Supporting custom contentTypes for service invoker 2016-10-17 10:51:39 +05:30
Megala
d9ec203727 Fixing EMM-1755 2016-10-16 13:24:32 +05:30
thusithakalugamage
521a30c260 Fixing modal dialog markup defects in unit 2016-10-14 17:57:11 +05:30
Megala
d90d51d412 Merge remote-tracking branch 'upstream/master' 2016-10-14 16:04:01 +05:30
Megala
e55b3a6d5f Fixes related to having special characters in role name 2016-10-14 16:03:14 +05:30
kamidu
39bc2e6747 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-14 15:20:14 +05:30
kamidu
1af8184889 positioning modal content 2016-10-14 15:20:05 +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
Megala
a04f91cddb Fixing issues related to mapping users and roles from different user stores 2016-10-14 10:59:56 +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
Megala
0756294724 Merge remote-tracking branch 'upstream/master' 2016-10-13 17:01:32 +05:30