472 Commits (87b2fb36036e1edef4f9dc7f8d12dadf14aa7478)

Author	SHA1	Message	Date
geethkokila	d911281ad1	Merging master branch with release-2.0.x	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
charitha	265b6248ef	Add email templates	8 years ago
madhawap	bec4ae681d	Seperate out task operations	8 years ago
charitha	431ce58c65	Merge with release-2.0.x branch	8 years ago
charitha	1bcea7cc1b	Move components with org.wso2.mdm group id to org.wso2.carbon.devicemgt group	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	726bbcd35d	Merged with upstream	8 years ago
charitha	c07d77b85d	Updated group sharing model	8 years ago
ayyoob	fede8ec409	few changes after testing with authoriser	8 years ago
ayyoob	fe263efe60	changed device access verification approach	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
sinthuja	a8b5c92698	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	8 years ago
sinthuja	bb5ebd7b4d	changing the expected kernel version to be 4.4.9 or higher as it's needed to be installed in DAS.	8 years ago
charitha	a6064d2561	Update component versions for IoTS-1.0.0 release	8 years ago
Ace	5eaca0b1b1	merging with upstream	8 years ago
Ace	2aa1c98d0b	bringing common features to cdmf	8 years ago
ayyoob	202e0d5619	merged with origin	8 years ago
ayyoob	33bb9b5a14	merged with IoTS-1.0.0 branch	8 years ago
sinthuja	bc84ff85ea	Changing the default port of publishing to 7612.	8 years ago
sinthuja	8767dd9b44	Adding missing dependency jersey core with device mgt.	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	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
ayyoob	e3ef66aa1a	added deployer feature	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
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
hasuniea	2128f08658	fixing EMM-1750	8 years ago
hasuniea	fa972fbf36	adding platform ios to cdm-config.xml	8 years ago
hasuniea	799beb3c59	removing ios platform entry from cdm-config.xml	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	45e584a064	Fixed arithmetic overflow issue in MSSQL	8 years ago
ayyoob	92d30eaadc	config update	8 years ago
ayyoob	5727886ea1	few changes after apimgt integration	8 years ago
hasuniea	05e95e2675	fix the EMM-1702	8 years ago
charitha	e89b4015b6	Introduced pagination	8 years ago
harshanl	ee97631eac	Updated MSSQL scripts to have IF-NOT-EXISTS statements	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
dilanua	fea2170f65	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	8 years ago
Harshan Liyanage	cd06637546	Merge pull request #364 from Megala21/master ... Correcting the problem related with oracle syntax	8 years ago
dilanua	acae51d756	Fixing MSSQL dashboard create view script issues	8 years ago
charitha	e6c4053135	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	8 years ago