710 Commits

Author	SHA1	Message	Date
mharindu	968cb00f35	Fixed conflicts and merged	2016-05-19 00:42:14 +05:30
prabathabey	a375252a94	Adding pluggable push notification framework	2016-05-19 00:20:45 +05:30
mharindu	bca1b4b059	Fixed conflicts	2016-05-18 22:01:38 +05:30
geethkokila	c7dd386c94	Adding new apis for device informations	2016-05-18 14:56:46 +05:30
mharindu	89026c2b7f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-17 20:33:23 +05:30
charitha	6dc0a9dd38	Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario	2016-05-17 18:40:39 +05:30
mharindu	5ccc480ddb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-17 12:25:57 +05:30
charitha	e0fc7c4018	Fix for https://wso2.org/jira/browse/IOTS-110	2016-05-16 21:01:33 +05:30
mharindu	83ec18c38d	Removed external dependancies from webapp publisher component	2016-05-16 14:20:34 +05:30
mharindu	c68b92c7b4	Fixed conflicts	2016-05-16 14:12:28 +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
Ace	cbc505c459	changing profile name	2016-05-15 01:35:57 +05:30
Ace	4517a7f1aa	Making API publish destination configurable and other changes	2016-05-15 01:15:11 +05:30
Ace	6d9f2f92a4	Making API publish destination configurable	2016-05-15 01:12:45 +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	362cf40d85	Fixing the operation activity id issues	2016-05-13 00:25:13 +05:30
mharindu	ed1eb217ea	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-12 23:03:15 +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
mharindu	1f21144668	Renamed EMM permission to CDMF	2016-05-12 22:00:15 +05:30
Madhawa	707da02c7e	Adding swagger annotations to beans	2016-05-12 21:58:23 +05:30
dilanua	0534cd0a7e	Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature	2016-05-10 18:52:44 +05:30
Rasika Perera	18edc21a04	Adding group permissions validation for operations	2016-05-04 04:14:09 +05:30
Rasika Perera	5c680b3f65	Fixing issue on group permission validating	2016-05-04 04:13:39 +05:30
Charitha Goonetilleke	8c62d9d64c	Add authorization check for shared devices in groups	2016-05-04 00:07:48 +05:30
Charitha Goonetilleke	92784120bd	Add group sharing UI functionality	2016-05-03 23:28:26 +05:30
Charitha Goonetilleke	b705352fb7	Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt	2016-05-03 19:32:05 +05:30
Charitha Goonetilleke	f74a5b7a59	Merge remote-tracking branch 'rasika/master'	2016-05-03 19:31:31 +05:30
Rasika Perera	938eda7c46	Adding group permissions checking	2016-05-03 19:29:12 +05:30
Rasika Perera	142ab10eea	Code refactoring	2016-05-03 19:18:07 +05:30
geethkokila	d32e822055	Fixing the shutdown errors	2016-05-03 14:10:30 +05:30
Rasika Perera	38cdd94f3c	Adding group permission checking for Device Access Authorizations	2016-05-03 00:33:19 +05:30
geethkokila	e2d67fc92c	Adding the changes for device search	2016-05-02 14:36:14 +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	d4f2a95972	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-29 17:35:13 +05:30
charithag	fd531555a3	Fix bugs	2016-04-29 13:34:46 +05:30
charithag	68361f01ed	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-29 12:30:00 +05:30
geethkokila	3dd830c7d0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-28 19:53:56 +05:30
geethkokila	6f9851413e	Adding the changes for operation activity id	2016-04-28 19:53:42 +05:30
mharindu	6f8bb64e1c	Fixed merge conflicts	2016-04-28 11:59:03 +05:30
mharindu	ffc7542d4d	Modified authorization to support API gateway	2016-04-28 11:36:34 +05:30
charithag	25ea00f26f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-28 08:02:55 +05:30
charithag	b1683c1ccb	Add capability to assign device in to a group and bug fixes	2016-04-28 08:01:46 +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	f5f177a858	Wrapping all device provisioning related info in ProvisioningConfig	2016-04-26 17:16:48 +05:30
prabathabey	95d3b97c5f	Code cleanup	2016-04-26 15:59:22 +05:30
prabathabey	f2ba20baeb	Code cleanup	2016-04-25 20:42:10 +05:30