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,294 Commits 31 Branches 461 Tags 183 MiB
84a0b398fe
Commit Graph

338 Commits

Author SHA1 Message Date
Madawa Soysa
c61cd484a0 IOTS-296: Adding group selection capability when adding a policy 
This commit introduces the device group select capabilty and saving the policy when creating and editing policies.
 2016-11-29 18:34:25 +05:30
Rasika Perera
aaade2363c Adding new api to create combined roles 2016-11-25 08:18:10 +05:30
charitha
a2db592d69 Updated group management APIs and service 2016-11-23 14:06:24 +05:30
charitha
726bbcd35d Merged with upstream 2016-11-23 13:51:50 +05:30
charitha
c07d77b85d Updated group sharing model 2016-11-22 21:13:18 +05:30
ayyoob
ec3dbd37dd fixed commit comments 2016-11-22 15:03:23 +05:30
ayyoob
e3849ef21e removed feature lifecycle implementation 2016-11-21 20:49:27 +05:30
ayyoob
3fb42ef32e Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-21 19:16:32 +05:30
ayyoob
fede8ec409 few changes after testing with authoriser 2016-11-21 19:13:59 +05:30
GPrathap
6efc5bc1ed removed @API and @Permission annotations 2016-11-20 19:10:45 +05:30
ayyoob
fe263efe60 changed device access verification approach 2016-11-20 02:37:37 +05:30
ayyoob
28faf53802 Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-19 11:07:00 +05:30
ayyoob
59e2a33e4a exposed device access authorisation as a service 2016-11-19 11:02:48 +05:30
sameera910409
02eec1033e add group sharing role create functionality 2016-11-15 12:20:58 +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
sameera910409
f8f7dd08cd fixed share groups and group analytics in device grouping 2016-10-28 14:07:50 +05:30
Kamidu Sachith Punchihewa
33874f95b6 Merge pull request #399 from saadsahibjan/master 
Fix incorrect spacing
 2016-10-26 17:28:59 +05:30
sameera910409
204a0ed943 fixes for the comments of the PR#404 2016-10-26 15:14:53 +05:30
sameera910409
41f367abfa add group listing and group device listing fixes 2016-10-25 17:48:16 +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
Harshan Liyanage
f961b57f9f EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device. 2016-10-25 11:50:38 +05:30
Saad Sahibjan
1cb969eb6d Fix incorrect spacing 2016-10-21 13:52:33 +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
Shavindri
28cb653b06 Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file. 2016-10-17 14:21:30 +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
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 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
susinda
eb20d1fc1c Device delete implemented (only in api level) for iot 2016-10-13 12:02:00 +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
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
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
ayyoob
93c1725e32 fixed api name for device type 2016-10-10 20:47:31 +05:30
charitha
e53b0c3860 Fix group count listing in dashboard 2016-10-10 20:00:39 +05:30
charitha
670ca7c228 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
 2016-10-10 15:29:10 +05:30
ayyoob
5727886ea1 few changes after apimgt integration 2016-10-09 03:16:02 +05:30
charitha
94a50584f4 Improve group listing with pagination 2016-10-06 16:01:41 +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
charitha
ce5d63925a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-06 11:58:12 +05:30