282 Commits

Author	SHA1	Message	Date
WSO2 Builder	cff6e242c8	[maven-release-plugin] prepare release v2.0.0	2016-11-16 12:16:25 +00:00
sinthuja	a8b5c92698	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	2016-11-16 14:50:39 +05:30
sinthuja	bb5ebd7b4d	changing the expected kernel version to be 4.4.9 or higher as it's needed to be installed in DAS.	2016-11-16 14:48:00 +05:30
charitha	a6064d2561	Update component versions for IoTS-1.0.0 release	2016-11-16 13:32:13 +05:30
Ace	5eaca0b1b1	merging with upstream	2016-11-04 20:09:01 +05:30
Ace	2aa1c98d0b	bringing common features to cdmf	2016-11-04 19:12:06 +05:30
ayyoob	33bb9b5a14	merged with IoTS-1.0.0 branch	2016-11-02 06:51:28 +05:30
sinthuja	8767dd9b44	Adding missing dependency jersey core with device mgt.	2016-11-01 18:32:27 +05:30
WSO2 Builder	9517a3d30f	[maven-release-plugin] prepare for next development iteration	2016-10-31 10:34:22 +00:00
WSO2 Builder	a8568299b9	[maven-release-plugin] prepare release v1.2.6	2016-10-31 10:32:11 +00:00
kamidu	9aaf5fc683	upgrading carbon version	2016-10-31 13:15:20 +05:30
ayyoob	e3ef66aa1a	added deployer feature	2016-10-22 22:36:38 +05:30
WSO2 Builder	27a2c9b979	[maven-release-plugin] prepare for next development iteration	2016-10-18 12:17:27 +00:00
WSO2 Builder	eae935f91c	[maven-release-plugin] prepare release v1.2.5	2016-10-18 12:09:16 +00:00
Hasitha Amal De Silva	011d29bd90	Adopt common interceptor from identity server for appmgt authentication	2016-10-18 14:49:53 +05:30
WSO2 Builder	6a55e1be83	[maven-release-plugin] prepare for next development iteration	2016-10-17 14:15:22 +00:00
WSO2 Builder	11c2e59f61	[maven-release-plugin] prepare release v1.2.4	2016-10-17 14:13:25 +00:00
harshanl	4bcf350236	EMM-1678:Updated the oauth component versions	2016-10-06 19:43:23 +05:30
Chatura Dilan Perera	c16cc4cae1	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30
Chatura Dilan Perera	ed4bca7032	[maven-release-plugin] prepare release v1.2.2	2016-09-29 20:32:59 +05:30
warunalakshitha	397c1daa2a	Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle	2016-09-29 00:40:58 +05:30
amalhub	428ce25b6f	Fixing issue: https://wso2.org/jira/browse/EMM-1646	2016-09-27 20:46:00 +05:30
Ace	6aad76eff1	Synching with master and updating jscep and bcpkix dependencies	2016-09-23 11:24:49 +05:30
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	2016-09-22 19:08:21 +05:30
Ace	f4d6eb6898	Upgrading jscep and other fixes	2016-09-22 08:24:58 +05:30
Ace	9548bdc263	Fixing dependency related issues	2016-09-21 12:56:40 +05:30
Ace	5f90587564	Synching with master	2016-09-20 18:13:53 +05:30
Ace	099ffd6a74	Updating velocity dependencies to OSGI enabled bundle version	2016-09-20 10:38:39 +05:30
Chatura Dilan Perera	50d8885f8b	[maven-release-plugin] prepare for next development iteration	2016-09-19 18:54:48 +05:30
Chatura Dilan Perera	a00d6aafd4	[maven-release-plugin] prepare release v1.2.1	2016-09-19 18:54:38 +05:30
Ace	6a8a5cbd5a	Merging with master	2016-09-19 12:21:41 +05:30
Ace	1dfb8e22e1	Updating to latest appm/apim/identity dependencies	2016-09-14 17:23:09 +05:30
Chatura Dilan Perera	de23a8cf27	[maven-release-plugin] prepare for next development iteration	2016-09-09 20:18:25 +05:30
Chatura Dilan Perera	8905fae0d9	[maven-release-plugin] prepare release v1.2.0	2016-09-09 20:18:12 +05:30
Chatura Dilan Perera	2d5262e21e	[maven-release-plugin] prepare for next development iteration	2016-09-09 17:10:19 +05:30
Chatura Dilan Perera	5ccd752404	[maven-release-plugin] prepare release v1.2.0	2016-09-09 17:10:04 +05:30
mharindu	24930b3042	Partial commit of migration	2016-09-05 16:37:09 +05:30
hasuniea	624643c3b5	removing commented exclusions	2016-08-26 19:35:38 +05:30
hasuniea	d1e058ce8e	fixing api-mgt upgrading issues	2016-08-26 17:40:30 +05:30
mharindu	d7e8cc30dd	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7	2016-08-24 14:56:06 +05:30
Chatura Dilan Perera	8b17cbb339	Fix conflicts	2016-08-19 15:00:57 +05:30
Chatura Dilan Perera	654e1d9938	[maven-release-plugin] prepare for next development iteration	2016-08-18 22:09:42 +05:30
Chatura Dilan Perera	aa24821667	[maven-release-plugin] prepare release v1.1.2	2016-08-18 22:09:33 +05:30
mharindu	71c71402f8	Fixed dependancy issues	2016-08-12 08:41:13 +05:30
mharindu	f5609cc8ff	Adding carbon 4.4.7 migration changes	2016-08-11 12:19:05 +05:30
hasuniea	1b07b18678	adding security fixes	2016-08-08 18:05:12 +05:30
Milan Perera	c49dc435e1	Merge pull request #319 from ayyoob/transport ... Updated grant type implementation	2016-07-28 14:14:03 +05:30
ayyoob	d5e756c205	Updated Grant Type Implementation	2016-07-27 14:43:44 +05:30
prabathabey	3afd43e14a	Reverting the carbon kernel version back to 4.4.3	2016-07-26 12:24:51 +05:30
prabathabey	ea032337d3	Changing Kernel version that carbon-device-mgt repository depends on and fixing the axiom version range	2016-07-26 11:30:28 +05:30