453 Commits (f7729b51ae8ac2652797d0bc6ba871e724b1b6db)

Author	SHA1	Message	Date
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
charitha	da0977bd85	Fix SQL error when could happen due to large response payloads	8 years ago
Megala	47d6268c9e	Correcting the problem related with oracle syntax	8 years ago
Megala	82be4ef5a8	Fixing oracle script issues	8 years ago
amalhub	428ce25b6f	Fixing issue: https://wso2.org/jira/browse/EMM-1646	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	9b6973226c	EMM-1609 : Changed postgres and oracle db scripts to support boolean data	8 years ago
harshanl	5a6120d6fa	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	8 years ago
harshanl	a6ee98cb7f	Increased notification description column size	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
Ace	f4d6eb6898	Upgrading jscep and other fixes	8 years ago
dilanua	87f4939ba5	Updating MSSQL script with dasboard analytics views	8 years ago
Ace	9548bdc263	Fixing dependency related issues	8 years ago
Ace	099ffd6a74	Updating velocity dependencies to OSGI enabled bundle version	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
Ace	1dfb8e22e1	Updating to latest appm/apim/identity dependencies	8 years ago
Chatura Dilan Perera	de23a8cf27	[maven-release-plugin] prepare for next development iteration	8 years ago
Chatura Dilan Perera	8905fae0d9	[maven-release-plugin] prepare release v1.2.0	8 years ago