993 Commits (d8881244fdb3ded91bba6f49f09156dbe39d3070)

Author	SHA1	Message	Date
charitha	78dfddbbed	Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x	8 years ago
madhawap	d62a9c8b83	resolving conflicts	8 years ago
madhawap	b889f6e384	adding separate tasks for each device type	8 years ago
Hasunie	9a1c12d730	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Hasunie	60d1281949	fixing windows device name issue	8 years ago
geethkokila	a0615d3d63	Merge branch 'release-2.0.x' into merge-master	8 years ago
geethkokila	d911281ad1	Merging master branch with release-2.0.x	8 years ago
Rasika Perera	641cc58bbf	Fixing enrollment broken issue	8 years ago
Rasika Perera	289987db8e	Throwing exception on getDevice when device is not found	8 years ago
Hasunie	b9e0b099a1	fixing device update issue	8 years ago
WSO2 Builder	228b24ca79	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	5dbb258f55	[maven-release-plugin] prepare release v2.0.2	8 years ago
Chatura Dilan	82d865b104	Merge pull request #453 from madhawap/release-2.0.x ... Seperate out task operations	8 years ago
madhawap	bec4ae681d	Seperate out task operations	8 years ago
charitha	564cece94b	Bug fixes	8 years ago
WSO2 Builder	8431b30ddc	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	ae2e283f14	[maven-release-plugin] prepare release v2.0.1	8 years ago
charitha	ca5d96df67	Add test cases to verify DAO functionality	8 years ago
Rasika Perera	54211bc3cc	Fixing minor issues on GroupDAO	8 years ago
charitha	a2db592d69	Updated group management APIs and service	8 years ago
charitha	726bbcd35d	Merged with upstream	8 years ago
Madawa Soysa	55bc5042bb	Merge pull request #422 from madawas/grouping-policy ... Generalize Policy Implementation - Creating system groups based on ownership	8 years ago
charitha	c07d77b85d	Updated group sharing model	8 years ago
Madawa Soysa	2f431504fe	creating groups from ownership and changing group owner ... This commit includes following changes, Creating groups using the device ownership Changing the default system group owner to wso2.system.user	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
Madawa Soysa	8ab73ce07d	fixing issue with javadocs	8 years ago
Madawa Soysa	2164a30f88	changing group owner to super user ... Changing the owner of the default system generated groups from the group creator to the super user of the system.	8 years ago
Madawa Soysa	c29bf24a75	Adding mobile devices to default groupes based on device ownership ... Adding mobile devices to default system generated groups based on the device ownership (BYOD, COPE)	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
WSO2 Builder	19c1b3566d	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	cff6e242c8	[maven-release-plugin] prepare release v2.0.0	8 years ago
charitha	a6064d2561	Update component versions for IoTS-1.0.0 release	8 years ago
ayyoob	44ac6b13b5	changes in UI after refactoring	8 years ago
ayyoob	33bb9b5a14	merged with IoTS-1.0.0 branch	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
WSO2 Builder	9517a3d30f	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	a8568299b9	[maven-release-plugin] prepare release v1.2.6	8 years ago
charitha	1bfba25c5e	Remove user list and role list attributes from group object ... Move group components to same devicemgt package levels	8 years ago
Harshan Liyanage	72522ad759	Fixed SQL syntax issue	8 years ago
Harshan Liyanage	9bf5ca94fb	Fixed SQL syntax issue	8 years ago
kamidu	1c2d339fed	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	8 years ago
kamidu	7212e969d8	Fix for SQL query issue in mysql	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
ayyoob	d17241e51e	added comments and license	8 years ago
ayyoob	45c0d2d2f5	added logs if device type registration failed	8 years ago