3086 Commits

Author	SHA1	Message	Date
Megala	a2d0c59e17	Revert 2988357eb9	2017-03-02 15:18:34 +05:30
Megala	4fdeec89cc	Revert f3f7635d3b	2017-03-02 15:11:59 +05:30
Susinda	09b74211c4	increment carbon-devicemgt version to 2.0.20	2017-03-02 12:39:19 +05:30
WSO2 Builder	7f98d37835	[WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration	2017-02-28 21:22:53 +05:30
WSO2 Builder	b03936ca49	[WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19	2017-02-28 21:19:50 +05:30
charitha	abdffdbf39	Add tenant id to Enrollment Certificate	2017-02-28 21:18:46 +05:30
charitha	14dfc1b538	Fix minor issues found with jmeter tests	2017-02-28 21:18:22 +05:30
madhawap	f1b761d987	Minor code formating	2017-02-28 21:16:56 +05:30
Kamidu Sachith Punchihewa	8e530b0523	adding the removed tenant based token handlers	2017-02-28 21:16:21 +05:30
WSO2 Builder	82888e1d20	[WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration	2017-02-28 21:15:10 +05:30
WSO2 Builder	b11c2e451b	[WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18	2017-02-28 21:14:44 +05:30
WSO2 Builder	67a091ff5a	[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration	2017-02-28 21:12:47 +05:30
WSO2 Builder	dcc2088455	[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17	2017-02-28 21:12:14 +05:30
lakshani	eb12e5b9f1	Adding commit 'added java doc comments'	2017-02-28 21:11:15 +05:30
lakshani	9e5574dccc	Adding commit 'added change device status to device view page'	2017-02-28 21:09:05 +05:30
lakshani	3f90b403c0	Adding lakshani's commit 'updated device status button'	2017-02-28 21:03:53 +05:30
WSO2 Builder	927b2d451d	[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration	2017-02-28 21:00:32 +05:30
WSO2 Builder	dfe9b1ff9c	[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16	2017-02-28 21:00:08 +05:30
charitha	7374a0825d	Fix https://wso2.org/jira/browse/IOTS-436	2017-02-28 20:56:32 +05:30
charitha	d2991585aa	Applying charithas commit on IOTS-436	2017-02-28 20:56:25 +05:30
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