322 Commits (652d77667291176fc9cf5d3b46e4207cf453a46d)

Author	SHA1	Message	Date
Supun94	c91da9219d	fixed policy conflicts	8 years ago
Rasika Perera	1465c56822	Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4" ... This reverts commit f9b6939cb7.	8 years ago
WSO2 Builder	f9b6939cb7	[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4	8 years ago
Rasika Perera	42930fe8c4	Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4" ... This reverts commit 78b9052c37.	8 years ago
WSO2 Builder	78b9052c37	[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4	8 years ago
geethkokila	2b7d5fd66b	Fixing the null pointer issue in policy manager	8 years ago
WSO2 Builder	a59edee410	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	8f9b21b41b	[maven-release-plugin] prepare release v2.0.3	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
geethkokila	20ca76640d	Adding changes for the grouping and ownership changes	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
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
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
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
WSO2 Builder	27a2c9b979	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	eae935f91c	[maven-release-plugin] prepare release v1.2.5	8 years ago
harshanl	370f6de260	Removed applied policy upon removal of the last policy applicable for a device	8 years ago
WSO2 Builder	6a55e1be83	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	11c2e59f61	[maven-release-plugin] prepare release v1.2.4	8 years ago
harshanl	036ed6fe41	Added POLICY_REVOKE operation upon deletion of the last policy	8 years ago
harshanl	73539362d4	Refactored PolicyAdministratorPointImpl	8 years ago
harshanl	6e1fdabaad	EMM-1342:Added policy revoke operation	8 years ago
harshanl	24c38602b8	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	8 years ago
harshanl	51910ee67a	EMM-1675:Added policy revoke operation	8 years ago
susinda	ca68181541	Fixing NPE of EMM-1715	8 years ago
hasuniea	2128f08658	fixing EMM-1750	8 years ago
kamidu	2f852d84f4	Fix for the issue : EMM policy updating issue	8 years ago
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	8 years ago
harshanl	4bcf350236	EMM-1678:Updated the oauth component versions	8 years ago
charitha	f22d392978	Upgrade to comply with latest CDMF changes	8 years ago
harshanl	f9ba45f439	Fixed the device status changing issue when there are multiple enrollments for the same device	8 years ago
Chatura Dilan Perera	c16cc4cae1	[maven-release-plugin] prepare for next development iteration	8 years ago
Chatura Dilan Perera	ed4bca7032	[maven-release-plugin] prepare release v1.2.2	8 years ago
harshanl	f24242fb8a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	8 years ago
harshanl	dd03d0b740	Added device status change upon inactivity mechanism	8 years ago
Ruwan	0c92f80e68	Merge pull request #361 from ruwany/carbon-kernel-4.4.7 ... Migrating kernel/apim/appm/identity to latest versions	8 years ago
harshanl	1b6c7ea502	Refactored PolcyMgt component	8 years ago
Ace	154a6082ce	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 ... # Conflicts: # features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml	8 years ago
harshanl	108ea98677	Refactor policy mgt components and fixed add operations for invalid devices from task service	8 years ago
harshanl	c967fc34d0	Fixed EMM-1513	8 years ago
Chatura Dilan Perera	50d8885f8b	[maven-release-plugin] prepare for next development iteration	8 years ago
Chatura Dilan Perera	a00d6aafd4	[maven-release-plugin] prepare release v1.2.1	8 years ago
Ace	6a8a5cbd5a	Merging with master	8 years ago