235 Commits

Author	SHA1	Message	Date
hasuniea	d7527e95f0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-05-27 18:45:49 +05:30
prabathabey	ba9d85b065	Adding swagger related dependencies to android agent webapp	2016-05-27 18:26:34 +05:30
inoshperera	aa4a4889a5	adding API header	2016-05-27 15:36:22 +05:30
prabathabey	9a01df5d55	Renaming android agent webapp	2016-05-27 14:58:19 +05:30
prabathabey	23343eb765	Fixing the name of android agent webapp	2016-05-27 12:50:29 +05:30
prabathabey	8f3a2eec5d	Merging the latest changes introduced to master	2016-05-27 11:47:28 +05:30
prabathabey	6f7f706428	Renaming TenantConfiguration as PlatformCongfiguration	2016-05-27 11:23:19 +05:30
prabathabey	fd1d62454a	Improving Android JAX-RS API definitions	2016-05-26 18:01:14 +05:30
hasuniea	ab70703da8	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-05-25 13:54:12 +05:30
hasuniea	2eb5aebb60	fixed code issues in EventService	2016-05-25 13:53:39 +05:30
geethkokila	57a9834145	Changing apis to return activity when an operation is added	2016-05-25 11:43:19 +05:30
Kasun Delgolla	4f33789d38	Committing MDM android APIs responses standardization	2016-05-24 15:34:43 +05:30
Hasunie	df6f420d6e	Merge pull request #279 from hasuniea/master ... fixed code issues	2016-05-23 15:11:15 +05:30
hasuniea	4757ac797c	fixed code issues	2016-05-23 15:09:33 +05:30
ayyoob	dc32a8f8d3	Merge branch 'release-2.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into transport	2016-05-23 10:18:46 +05:30
mharindu	f3730c64ae	[maven-release-plugin] prepare for next development iteration	2016-05-20 17:49:18 +05:30
mharindu	7a982093a1	[maven-release-plugin] prepare release v2.1.0	2016-05-20 17:49:08 +05:30
mharindu	be4078cf38	[maven-release-plugin] rollback the release of v2.1.0	2016-05-20 17:35:17 +05:30
mharindu	a2d2f26123	[maven-release-plugin] prepare for next development iteration	2016-05-20 17:26:28 +05:30
mharindu	3af112898d	[maven-release-plugin] prepare release v2.1.0	2016-05-20 17:26:19 +05:30
hasuniea	a48529be59	fix code conflicts	2016-05-20 16:38:33 +05:30
hasuniea	5c29ac8c4f	fix code conflicts	2016-05-20 16:29:24 +05:30
hasuniea	a7665033b4	refactored events	2016-05-20 16:18:24 +05:30
prabathabey	5b0748489d	Improving virtual fire alarm plugin to use newly introduced push notification framework	2016-05-19 00:22:01 +05:30
hasuniea	8eb53927a6	add swagger annotations to windows plugin	2016-05-17 10:20:31 +05:30
inosh-perera	bf7975c5d4	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-05-13 02:59:27 +05:30
dilanua	bc1dfb86f2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-05-13 02:56:34 +05:30
dilanua	2dabfa02fa	Adding swagger annotations	2016-05-13 02:56:15 +05:30
inosh-perera	0787aa2ac1	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-05-13 02:51:54 +05:30
inosh-perera	afc7be590e	adding swagger annotations for Android APIs	2016-05-13 02:50:17 +05:30
Madhawa Perera	f25cb51679	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins ... Adding swagger annotations to beans	2016-05-13 02:43:43 +05:30
Madhawa Perera	0d8010c25a	Adding swagger annotations to beans	2016-05-13 02:43:23 +05:30
dilanua	f66aad9e0e	Adding swagger annotations	2016-05-13 02:39:30 +05:30
hasuniea	3cdb490908	added swagger annotations	2016-05-12 21:41:49 +05:30
charithag	f74a8ddf0d	Add device type plugins and features related to emm with IoTS base feature.	2016-03-30 01:57:32 +05:30