364 Commits (42a587904f9163f4d8c6bebfe21541970921a0bc)

Author	SHA1	Message	Date
Milan Perera	637c014866	Refactored scope strings	8 years ago
Milan Perera	157ef998a6	Resolved conflicts and merged	8 years ago
Milan Perera	e0ee2fc1e5	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
GPrathap	5d1435c7bc	renamed permission string	8 years ago
Milan Perera	2a4a636eb4	Resolved conflicts and merged	8 years ago
Milan Perera	d13dadff08	Renamed prefix of scopes	8 years ago
GPrathap	0bd7b90e9a	added scope annotation	8 years ago
Maninda	0fb5a577b8	Fixed some issues found in FindBugs security analysis.	8 years ago
Milan Perera	b860be0150	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
charitha	295921b289	Fixed following issues: ... https://wso2.org/jira/browse/IOTS-218 https://wso2.org/jira/browse/IOTS-236 https://wso2.org/jira/browse/IOTS-263 https://wso2.org/jira/browse/IOTS-173	8 years ago
Milan Perera	02d75b757c	Fixed conflicts and merged	8 years ago
Rasika Perera	acb2c38799	Fixing user is not authorized to view devices	8 years ago
charitha	1a93868424	Fixed https://wso2.org/jira/browse/IOTS-335	8 years ago
Ruwan	46c3b015fa	Merge pull request #498 from charithag/release-2.0.x-email-invites ... Release 2.0.x email invites	8 years ago
Charitha Goonetilleke	5318601df0	Add license header	8 years ago
charitha	2b1d46f45f	Finalized enrollment invitations	8 years ago
charitha	795ccb740c	Add backend support for enrollment invitations	8 years ago
Supun94	09572a9977	Removed redundant classes	8 years ago
Supun94	eb1575126f	Minor refactoring on policy merging	8 years ago
Supun94	33b79dcbba	Adding effective policy service	8 years ago
Harshan Liyanage	a2a03a523e	Refactored RoleMgtServiceImpl.	8 years ago
Harshan Liyanage	de2f85de2e	IOTS-337:Fixed permission remove issue when updating role permissions.	8 years ago
Milan Perera	bcbf61a886	Fixed conflicts	8 years ago
Milan Perera	36ee55f493	Implemented permission-scope mapping for IoTs	8 years ago
Milan Perera	dd353e1bfb	Commiting permission-scope mapping improvements	8 years ago
geethkokila	d911281ad1	Merging master branch with release-2.0.x	8 years ago
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.	8 years ago
Rasika Perera	aaade2363c	Adding new api to create combined roles	8 years ago
charitha	a2db592d69	Updated group management APIs and service	8 years ago
charitha	726bbcd35d	Merged with upstream	8 years ago
charitha	c07d77b85d	Updated group sharing model	8 years ago
ayyoob	ec3dbd37dd	fixed commit comments	8 years ago
ayyoob	e3849ef21e	removed feature lifecycle implementation	8 years ago
ayyoob	3fb42ef32e	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	8 years ago
ayyoob	fede8ec409	few changes after testing with authoriser	8 years ago
GPrathap	6efc5bc1ed	removed @API and @Permission annotations	8 years ago
ayyoob	fe263efe60	changed device access verification approach	8 years ago
ayyoob	28faf53802	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	8 years ago
ayyoob	59e2a33e4a	exposed device access authorisation as a service	8 years ago
sameera910409	02eec1033e	add group sharing role create functionality	8 years ago
charitha	4a115e5d3f	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	8 years ago
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	8 years ago
sameera910409	f8f7dd08cd	fixed share groups and group analytics in device grouping	8 years ago
Kamidu Sachith Punchihewa	33874f95b6	Merge pull request #399 from saadsahibjan/master ... Fix incorrect spacing	8 years ago
sameera910409	204a0ed943	fixes for the comments of the PR#404	8 years ago
sameera910409	41f367abfa	add group listing and group device listing fixes	8 years ago
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	8 years ago
Harshan Liyanage	f961b57f9f	EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.	8 years ago
Saad Sahibjan	1cb969eb6d	Fix incorrect spacing	8 years ago
Megala	3416ae78c4	Fixing the problems in displaying user list when the user names has special chracters	8 years ago