1316 Commits

Author	SHA1	Message	Date
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	a2cb6937c1	Fix device listing page title	2016-04-29 12:46:53 +05:30
charithag	68361f01ed	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-29 12:30:00 +05:30
geethkokila	aa3e7a9eda	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-29 11:03:18 +05:30
dilanua	b8972c9019	Adding temporary development code bits for dashboard analytics feature	2016-04-29 05:40:34 +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
dilanua	330e1a1e19	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-28 18:11:44 +05:30
dilanua	46117b4e84	Adding temporary development code bits for dashboard analytics feature	2016-04-28 18:10:52 +05:30
mharindu	548f71ca2e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-28 16:43:24 +05:30
mharindu	c824e63f1e	Refactored and fixed findbug issues in OAuth extension	2016-04-28 16:43:13 +05:30
mharindu	04fa0f4874	Implemented new password grant handler	2016-04-28 14:50:52 +05:30
mharindu	6db9b21623	Code cleanup in webapp publisher	2016-04-28 14:49:34 +05:30
dilanua	49513ba79b	Adding temporary development code bits for dashboard analytics feature	2016-04-28 14:26:22 +05:30
dilanua	b9be51d50d	Adding temporary development code bits for dashboard analytics feature	2016-04-28 12:18:43 +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
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