146 Commits

Author	SHA1	Message	Date
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
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	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
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	0f904e21d8	Fixed conflicts and merged	2016-07-11 22:12:15 +05:30
Chatura Dilan	4ec11e8c08	[maven-release-plugin] prepare for next development iteration	2016-07-08 19:11:40 +05:30
Chatura Dilan	ffedcac543	[maven-release-plugin] prepare release v1.1.1	2016-07-08 19:09:55 +05:30
mharindu	49623a4693	Implemented scope based authorization	2016-07-03 15:03:47 +05:30
mharindu	3e291c5b13	[maven-release-plugin] prepare for next development iteration	2016-05-20 16:43:16 +05:30
mharindu	9549ac446b	[maven-release-plugin] prepare release v1.1.0	2016-05-20 16:43:02 +05:30
prabathabey	a375252a94	Adding pluggable push notification framework	2016-05-19 00:20:45 +05:30
Madhawa Perera	66c12a8b1c	Adding swagger annotations to beans	2016-05-13 00:34:38 +05:30
inosh-perera	c945d63038	fixing issues in swagger dependancy	2016-05-12 23:01:21 +05:30
Madhawa	fffc7f3205	Adding swagger annotations to beans	2016-05-12 22:12:23 +05:30
Madhawa	707da02c7e	Adding swagger annotations to beans	2016-05-12 21:58:23 +05:30
geethkokila	7318502697	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-31 18:07:55 +05:30
geethkokila	e60a383f4d	Adding fixes to the device search	2016-03-31 18:07:05 +05:30
ayyoob	81ae512f13	Merge pull request #6 from ayyoob/merge-devicetype ... merge device type	2016-03-30 12:20:02 +05:30
geethkokila	888971ae39	Fixing the oracl and postgres sql datasources and removing the start and end from the search context	2016-03-29 22:46:09 +05:30
ayyoob	284a6645f0	import required packages	2016-03-29 12:07:58 +05:30
ayyoob	021378df3b	added org.wso2.carbon import package	2016-03-28 23:05:47 +05:30
ayyoob	e06565728e	removed duplicate imports and improper imports	2016-03-28 20:46:38 +05:30
prabathabey	3a7ef33c16	Fixing a build failure caused by unresolvable packages consumed by device.mgt.core and code cleanup	2016-03-27 16:58:11 +05:30
prabathabey	12c4ba10af	Code cleanup	2016-03-27 16:04:15 +05:30
geethkokila	e9da24c9e8	Changing the snapshot versions from 1.0.4 to 1.1.0	2016-03-24 11:41:52 +05:30
geethkokila	41191d6df0	Adding the search feature to device mgt plugin	2016-03-21 10:33:35 +05:30
geethkokila	7a809c1c01	Doing a partial commit	2016-03-14 11:48:43 +05:30
prabathabey	3726a57d96	Making email-sender a separate component and code cleanup	2016-03-13 00:51:54 +05:30
prabathabey	535c74a962	Improving email sender functionality	2016-03-12 12:46:36 +05:30
geethkokila	e0e0a57c11	[maven-release-plugin] prepare for next development iteration	2016-01-05 18:15:38 +05:30
geethkokila	cebb88e712	[maven-release-plugin] prepare release v1.0.3	2016-01-05 18:15:28 +05:30
geethkokila	e66d291947	[maven-release-plugin] prepare for next development iteration	2015-12-30 14:19:05 +05:30
geethkokila	f416a73e75	[maven-release-plugin] prepare release v1.0.2	2015-12-30 14:18:57 +05:30
geethkokila	185a59fbd4	[maven-release-plugin] prepare for next development iteration	2015-12-23 22:39:29 +05:30
geethkokila	b3580d754b	[maven-release-plugin] prepare release v1.0.1	2015-12-23 22:39:20 +05:30
geethkokila	4e9255fbc9	[maven-release-plugin] prepare for next development iteration	2015-12-22 08:28:42 +05:30
geethkokila	ceb60adb34	[maven-release-plugin] prepare release v1.0.0	2015-12-22 08:28:33 +05:30
harshanl	aeed8b92a1	Enabled adding custom permissions to permission-tree through webapps	2015-08-26 18:20:37 +05:30