1299 Commits

Author	SHA1	Message	Date
mharindu	6db9b21623	Code cleanup in webapp publisher	2016-04-28 14:49:34 +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
dilanua	053d14b317	Adding temporary development code bits for dashboard analytics feature	2016-04-28 06:28:13 +05:30
Ace	a06327b731	refactoring and bug fixes	2016-04-27 20:43:13 +05:30
geethkokila	5a77e08fd5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 17:57:05 +05:30
charithag	6e84f0a5a3	Fix font issue	2016-04-27 16:37:05 +05:30
charithag	2a006684cc	Fix formatting	2016-04-27 16:07:14 +05:30
charithag	fb52c5845d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 15:41:41 +05:30
charithag	bcbde92143	Update new analytics components.	2016-04-27 15:40:49 +05:30
dilanua	36e5357cfd	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 15:21:30 +05:30
Ace	985d07cbc7	Cleaning up code	2016-04-27 14:53:12 +05:30
dilanua	2a55c50ad1	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 13:58:58 +05:30
dilanua	2b62eac4f5	Adding temporary development code bits for dashboard analytics feature	2016-04-27 13:58:53 +05:30
charithag	1e709bc394	Update new analytics components and remove obsoletes.	2016-04-27 13:43:37 +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
charithag	f6281c8ef0	Add jax-rs endpoints to modify and remove devices. ... Update clientside js to work with secured apis	2016-04-26 20:50:39 +05:30
Charitha Goonetilleke	15a6e4b63b	Fix formatting issues	2016-04-26 19:54:19 +05:30
charithag	d8a9b642ff	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-26 18:57:25 +05:30
charithag	42d11b9d78	Add tenant aware dynamic units routing	2016-04-26 18:56:41 +05:30
prabathabey	52b81dd3eb	Fixing compilation failures	2016-04-26 17:38:16 +05:30
prabathabey	f5f177a858	Wrapping all device provisioning related info in ProvisioningConfig	2016-04-26 17:16:48 +05:30
prabathabey	779ed5eac2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-26 16:43:45 +05:30
prabathabey	9068a3d893	Fixing compilation failures caused due to API changes	2016-04-26 16:40:30 +05:30
Prabath Abeysekara	6ddd5db8cc	Merge pull request #221 from ayyoob/das-ext ... Added device type specific graph loader	2016-04-26 16:35:43 +05:30
prabathabey	2133762792	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-26 15:59:34 +05:30
prabathabey	95d3b97c5f	Code cleanup	2016-04-26 15:59:22 +05:30
ayyoob	e0f47cba19	Added device type specific graph loader	2016-04-26 15:58:21 +05:30
charithag	6d5635465e	Add missing UI functionalities	2016-04-26 15:49:44 +05:30
Ruwan	f04705dda5	Merge pull request #213 from charithag/patch-1 ... Fix formatting	2016-04-26 11:45:29 +05:30
charithag	61b43ce5d8	Rename packages in device mgt jax-rs apis	2016-04-26 11:42:51 +05:30
charithag	646d87968c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-25 22:37:34 +05:30
charithag	dfb7e9a9c8	Fix permissions	2016-04-25 22:36:41 +05:30
prabathabey	aef892fece	Code cleanup	2016-04-25 21:08:14 +05:30
prabathabey	a10a693507	Fixing find bugs reported issues	2016-04-25 21:07:57 +05:30
prabathabey	f2ba20baeb	Code cleanup	2016-04-25 20:42:10 +05:30
prabathabey	47572d08f5	Removing obsolete dependencies to ApplicationManager interface from DeviceManagementService SPI	2016-04-25 20:29:11 +05:30
geethkokila	4cf37bb16c	Fixing the compilation error on the proprietory plugins.	2016-04-24 08:54:31 +05:30
dilanua	7027a3553a	Adding temporary development code bits for dashboard analytics feature	2016-04-24 08:24:43 +05:30
dilanua	2f2e8f391a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-23 22:52:25 +05:30
dilanua	c3bc22519a	Adding temporary development code bits for dashboard analytics feature	2016-04-23 22:51:58 +05:30
ayyoob	5e1ad22480	few changes on download api	2016-04-23 20:30:14 +05:30
ayyoob	1c0807a513	added userstore null check for permission scope validator	2016-04-23 00:07:12 +05:30
ayyoob	9f98f538de	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext	2016-04-22 20:59:23 +05:30
ayyoob	b99d10e075	few changes invoker util to support file downloading	2016-04-22 20:57:22 +05:30
dilanua	274aa0ecd3	Adding temporary development code bits for cdmf-product dashboard feature	2016-04-22 10:48:42 +05:30
dilanua	a888cf39c0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-21 13:32:58 +05:30
Ruwan	c6fbc8f1fe	Merge pull request #216 from GPrathap/master ... fixed some bugs which caused while enabling SSO in IoT Server	2016-04-20 23:48:48 +05:30
GPrathap	84492d70ac	added constants for authentications types	2016-04-20 22:10:04 +05:30