3066 Commits

Author	SHA1	Message	Date
ayyoob	470500b80e	added ssl context	2017-02-27 16:44:21 +05:30
geethkokila	e90dc8b6c1	Fixing the compile error	2017-02-24 12:32:00 +05:30
geethkokila	d8303356cd	Fixing the conflicts	2017-02-24 12:16:14 +05:30
kamidu	b7e3b28722	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-20 18:20:14 +05:30
kamidu	4e16e29b1c	removing group sharing	2017-02-20 18:20:04 +05:30
Imesh Chandrasiri	3c90f8ad49	temporary removal of view analytics	2017-02-20 17:19:20 +05:30
Imesh Chandrasiri	8cf92e8a5b	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-20 15:11:08 +05:30
Imesh Chandrasiri	a938d57a65	Removing analytics link from groups listing	2017-02-20 15:11:00 +05:30
Kamidu Sachith Punchihewa	587c798f09	Merge pull request #613 from Kamidu/cloud-3.1.0 ... remove tennent related token handlers	2017-02-19 21:49:58 +05:30
Kamidu Sachith Punchihewa	4a5c99af78	remove tennent related token handlers	2017-02-19 21:49:19 +05:30
Imesh Chandrasiri	5097416d69	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-19 19:34:35 +05:30
Imesh Chandrasiri	368647f176	Temporary advance search removal commit	2017-02-19 19:34:28 +05:30
Kamidu Sachith Punchihewa	112efda8d5	Merge pull request #611 from Kamidu/cloud-3.1.0 ... removing device edit option	2017-02-19 18:45:07 +05:30
Kamidu Sachith Punchihewa	0da8847787	removing device edit option	2017-02-19 18:44:39 +05:30
Imesh Chandrasiri	f5e5dce872	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-19 18:25:07 +05:30
Imesh Chandrasiri	ee209064e3	Tooltip css fix	2017-02-19 18:24:59 +05:30
Kamidu Sachith Punchihewa	367dc1a30b	resolving return type issue in group mgt	2017-02-19 17:48:11 +05:30
Kamidu Sachith Punchihewa	527b844ee3	Error handled on the user session invalidation	2017-02-19 16:03:49 +05:30
Kamidu Sachith Punchihewa	318fbf9215	role loading issues	2017-02-19 15:54:53 +05:30
Kamidu Sachith Punchihewa	282801c814	updating cloud dashboard	2017-02-19 15:32:28 +05:30
kamidu	7480ccaa15	fixing datatable issues	2017-02-17 17:56:29 +05:30
kamidu	3e061f6e8b	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-17 16:29:22 +05:30
kamidu	6a67f251ac	cloud related ui fixs	2017-02-17 16:29:11 +05:30
Hasunie	8bb75d291c	Avoiding package exporting org.wso2.carbon.device.mgt.core.internal	2017-02-16 18:30:40 +05:30
Hasunie	2a9027a15e	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-16 18:19:35 +05:30
Hasunie	6b1ab86276	fixing policyManagementDataHolder issue	2017-02-16 18:19:05 +05:30
Imesh Chandrasiri	3786ef2636	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-16 16:49:54 +05:30
Imesh Chandrasiri	0cddd896d4	Tooltip fix	2017-02-16 16:49:44 +05:30
kamidu	4725eb3c3b	chenge the group creating steps	2017-02-16 11:59:47 +05:30
kamidu	486e02fd71	adding ui changes to the cloud related uis	2017-02-16 06:11:42 +05:30
Hasunie	315be0a3c7	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-15 18:09:29 +05:30
Rasika Perera	9ca552584a	Merge pull request #602 from rasika/cloud-3.1.0 ... Adding tooltips	2017-02-15 13:49:28 +05:30
Rasika Perera	b8a1b945bb	Adding tooltips	2017-02-15 13:47:59 +05:30
Imesh Chandrasiri	9d80fcfd54	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-14 22:38:27 +05:30
Imesh Chandrasiri	7bc5d35746	data table padding fix	2017-02-14 22:38:09 +05:30
Kamidu Sachith Punchihewa	4d02f9971e	Merge pull request #591 from Kamidu/cloud-3.1.0 ... enable cloud related configurations to the devicemgt application	2017-02-14 22:29:25 +05:30
Hasunie	b584a39a41	removing comma seperation in import packages	2017-02-14 22:28:00 +05:30
Hasunie	476e439fe2	Fixing the task to get the only device registered tenants	2017-02-14 22:16:55 +05:30
Rasika Perera	d92c52b89b	Adding cloud error pages for jaggery.conf	2017-02-14 19:49:41 +05:30
Rasika Perera	8931478a55	Moving error into common logic page. If in cloud mode; change "default": "uuf.page.error" into "default": "cdmf.page.error" in config.json	2017-02-14 19:38:11 +05:30
kamidu	aba4ceaf76	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-14 19:28:22 +05:30
kamidu	587f847934	ui improvements to device cloud	2017-02-14 19:28:09 +05:30
Milan Perera	28606f1729	Merge pull request #598 from ayyoob/210releasepatch ... 210releasepatch	2017-02-14 15:52:05 +05:30
Imesh Chandrasiri	c26d7fd15d	Changed device loading icon for device loading page	2017-02-14 15:15:38 +05:30
Imesh Chandrasiri	dcb29b7792	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-14 14:48:48 +05:30
Imesh Chandrasiri	5a7fa99e0a	Fix data table icon padding issue	2017-02-14 14:48:38 +05:30
Rasika Perera	fbae181f07	Fixing footer getting cluttered on /devicemgt/devices/search page	2017-02-14 14:46:17 +05:30
Imesh Chandrasiri	b579870672	Data table icon cursor added	2017-02-14 13:21:59 +05:30
Imesh Chandrasiri	23edb1de7a	Model Popup title space issue fix	2017-02-14 10:23:58 +05:30
Imesh Chandrasiri	8bbb612de6	Fixing cloud header height issue and theme color	2017-02-13 16:06:28 +05:30