27 Commits

Author	SHA1	Message	Date
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	5bdb4630af	Fixed conflicts and merged	2016-08-08 19:38:49 +05:30
hasuniea	1b07b18678	adding security fixes	2016-08-08 18:05:12 +05:30
mharindu	b3d309583d	Fixed issues in scope service	2016-07-21 20:13:38 +05:30
mharindu	186432e1df	Fixed webapp name resolving issue	2016-07-18 20:08:51 +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
prabathabey	6e5148a374	Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services	2016-05-30 08:21:59 +05:30
prabathabey	32cb32b706	modifying the name of the device management admin api war	2016-05-27 12:28:48 +05:30
prabathabey	0f5cf86d04	Adding the base path to be included in the swagger docs and appending the proper version to the webapp name	2016-05-26 18:00:45 +05:30
prabathabey	8b9cf0da85	Resolving conflicts caused by merging with the updates in master	2016-05-25 17:37:21 +05:30
inoshperera	a40e44899a	syncing REST apis of core and product EMM	2016-05-25 12:38:24 +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
mharindu	9f93570b29	Fixed issues in webapp-publisher	2016-05-18 22:00:16 +05:30
mharindu	82b90522a0	Migrated to APIM 5.0.4	2016-05-18 11:49:20 +05:30
mharindu	9a4b904702	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-16 11:55:35 +05:30
prabathabey	9e4b4d2205	Improving swagger annotations	2016-05-13 04:02:42 +05:30
mharindu	fd39b31369	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-12 22:00:24 +05:30
prabathabey	bc894f2517	Adding Swagger-annotation dependency to carbon-device-mgt	2016-05-11 12:38:15 +05:30
mharindu	5ad8d2938e	Fixed issues of publishing APIs to synapse gateway	2016-05-11 10:50:32 +05:30
charithag	516155dae5	Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins	2016-04-18 16:39:35 +05:30
Kasun Delgolla	4e57e5bc85	Committing restructuring mdm-admin + UI merging style fixes	2016-04-07 10:42:56 +05:30