303 Commits

Author	SHA1	Message	Date
hasuniea	dfc673b08f	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-31 13:13:32 +05:30
hasuniea	1443c7757e	fixing code issues	2016-05-31 13:13:01 +05:30
prabathabey	fc3d6cccbf	Fixing Issues in notification management APIs	2016-05-31 12:49:51 +05:30
charitha	e2c03adec4	FIx for https://wso2.org/jira/browse/IOTS-169	2016-05-31 11:14:37 +05:30
hasuniea	9c3c08b4ca	fix UnAuthorizedDeviceAccessException.java	2016-05-30 17:15:21 +05:30
prabathabey	5ed982beb4	Adding more improvements to the JAX-RS APIs of CDM-F	2016-05-30 16:40:57 +05:30
prabathabey	fd7a137b07	Improving jax-rs APIS of CDM-F	2016-05-30 13:39:52 +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
inoshperera	db3dc0517b	adding activity status related details.	2016-05-28 07:48:45 +05:30
prabathabey	425c0e7498	Improving swagger annotations of CDM-F core APIs further	2016-05-28 04:52:00 +05:30
geethkokila	62c84319d8	Fixing the device search for application list	2016-05-28 01:15:52 +05:30
prabathabey	37aa05f79c	Committing improved swagger annotated cdm-f APIs	2016-05-28 00:55:25 +05:30
geethkokila	6328d35797	Changing the device info object by adding the application list	2016-05-28 00:19:04 +05:30
prabathabey	30f6fc53b5	Merging the latest changes introduced in master	2016-05-27 11:44:58 +05:30
prabathabey	ebefd60533	Renaming TenantConfiguration as PlatformConfiguration	2016-05-27 11:22:54 +05:30
geethkokila	86e564713d	Adding the changes for getting activity ids which are changes after a certain time	2016-05-26 21:16:01 +05:30
geethkokila	01e3cc4987	Fixing the activity related issues	2016-05-26 18:44:12 +05:30
prabathabey	8b9cf0da85	Resolving conflicts caused by merging with the updates in master	2016-05-25 17:37:21 +05:30
geethkokila	c64a6e0ec5	Changing apis to return activity when an operation is added	2016-05-25 11:42:44 +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
ayyoob	51d46213c2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport	2016-05-13 15:03:11 +05:30
Madhawa Perera	43648e4692	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Adding swagger annotations to beans	2016-05-13 08:07:44 +05:30
Madhawa Perera	b5741b420c	Adding swagger annotations to beans	2016-05-13 08:07:28 +05:30
prabathabey	a0dbb25824	Fixing code conflicts and improving swagger annotations	2016-05-13 07:12:03 +05:30
ayyoob	48912a05bb	merged with upstream	2016-05-13 05:23:19 +05:30
inosh-perera	0cf0ec6e77	adding swagger annotations to APIs	2016-05-13 01:30:17 +05:30
Madhawa Perera	26c10f84ec	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Adding swagger annotations to beans	2016-05-13 00:34:54 +05:30
Madhawa Perera	66c12a8b1c	Adding swagger annotations to beans	2016-05-13 00:34:38 +05:30
geethkokila	3bec779e0b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-13 00:27:27 +05:30
geethkokila	362cf40d85	Fixing the operation activity id issues	2016-05-13 00:25:13 +05:30
inosh-perera	797c7a02d0	adding swagger annotation to beans	2016-05-13 00:24:59 +05:30
Madhawa	07c5362104	Adding swagger annotations to beans and some modifications to api interfaces	2016-05-12 23:11:23 +05:30
inosh-perera	c945d63038	fixing issues in swagger dependancy	2016-05-12 23:01:21 +05:30
ayyoob	ec7727e8bf	removed method and type from features	2016-05-12 22:01:48 +05:30
hasuniea	e633d28013	added annotation for ConfigurationEntry	2016-05-12 22:00:09 +05:30
hasuniea	e4dfe63548	code conflicts	2016-05-12 21:15:53 +05:30
hasuniea	1267db52ce	added swagger annotations for TenantConfiguration	2016-05-12 21:11:51 +05:30
inosh-perera	5597c752ac	Adding sawgger annotations to admin Jax-rs apis.	2016-05-12 20:17:20 +05:30
Rasika Perera	938eda7c46	Adding group permissions checking	2016-05-03 19:29:12 +05:30
Rasika Perera	9cb24d8cec	Adding enum to hold default role to default permissions mapping	2016-05-03 19:18:58 +05:30
Rasika Perera	4eb588ac60	Group Constants moved to common	2016-05-03 14:37:34 +05:30
Rasika Perera	38cdd94f3c	Adding group permission checking for Device Access Authorizations	2016-05-03 00:33:19 +05:30
geethkokila	f2128762f0	Adding the changes for removing repeated operations from pending operations, if same operation is added twice, are making them repeated, Device will not recieve them	2016-04-30 19:37:23 +05:30
geethkokila	3396a5066d	Adding changes for the updated time of device info and device location	2016-04-29 22:30:07 +05:30
geethkokila	6f9851413e	Adding the changes for operation activity id	2016-04-28 19:53:42 +05:30
geethkokila	4029c86da4	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 10:26:51 +05:30
geethkokila	2fb42518b6	Adding the changes for the device group with policy.	2016-04-27 10:26:47 +05:30
prabathabey	52b81dd3eb	Fixing compilation failures	2016-04-26 17:38:16 +05:30