1346 Commits

Author	SHA1	Message	Date
Charitha Goonetilleke	e01b62086f	Fix parameter mismatch	2016-05-04 01:47:50 +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	d15e52491a	Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt	2016-05-03 19:57:36 +05:30
Rasika Perera	33eed1f6cd	Adding permissions for roles updating	2016-05-03 19:52:52 +05:30
Rasika Perera	b6c33a0aec	Fixing group roles listing	2016-05-03 19:49:09 +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	9cb24d8cec	Adding enum to hold default role to default permissions mapping	2016-05-03 19:18:58 +05:30
Rasika Perera	142ab10eea	Code refactoring	2016-05-03 19:18:07 +05:30
Rasika Perera	64a262d3e4	Fixing 404 on groups listing	2016-05-03 15:34:50 +05:30
Rasika Perera	4eb588ac60	Group Constants moved to common	2016-05-03 14:37:34 +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
dilanua	af973dacc6	Adding temporary development code bits for dashboard analytics feature	2016-05-02 18:45:23 +05:30
Rasika Perera	07c0aa1045	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-02 18:12:03 +05:30
dilanua	d9015b92a0	Adding temporary development code bits for dashboard analytics feature	2016-05-02 15:27:32 +05:30
dilanua	c828a5264b	Adding temporary development code bits for dashboard analytics feature	2016-05-02 15:15:45 +05:30
geethkokila	a0d260e6a3	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-02 14:36:52 +05:30
geethkokila	e2d67fc92c	Adding the changes for device search	2016-05-02 14:36:14 +05:30
Kasun Delgolla	d1def26602	Committing group listing back end pagination UI	2016-05-02 12:56:22 +05:30
dilanua	f2f153a2b4	Adding temporary development code bits for dashboard analytics feature	2016-05-01 09:51:09 +05:30
geethkokila	f200f37c80	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-30 19:37:38 +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
inosh-perera	486190f182	adding more error logs for client certificate not present scenario	2016-04-30 14:44:22 +05:30
geethkokila	c0dd2c423e	Fixing the build failure on java 8	2016-04-29 22:44:01 +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	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