4077 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
charitha	d2991585aa	Applying charithas commit on IOTS-436	2017-02-28 20:56:25 +05:30
WSO2 Builder	13bb9aebf7	[WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration	2017-02-28 15:08:01 +05:30
WSO2 Builder	937d283052	[WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19	2017-02-28 15:07:51 +05:30
Geeth	58d47928fb	Merge pull request #584 from charithag/IOT-436 ... Fix https://wso2.org/jira/browse/IOTS-436	2017-02-28 15:01:07 +05:30
charitha	8ad49c86f8	Add tenant id to Enrollment Certificate	2017-02-28 14:59:29 +05:30
charitha	b5768dde11	Fix minor issues found with jmeter tests	2017-02-28 14:49:06 +05:30
charitha	8e033e86e9	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-02-27 16:47:51 +05:30
ayyoob	470500b80e	added ssl context	2017-02-27 16:44:21 +05:30
Geeth	54e5203612	Merge pull request #617 from madhawap/master ... Minor code formating	2017-02-24 23:29:12 +05:30
madhawap	e0c5ff78fa	Minor code formating	2017-02-24 23:24:00 +05:30
Geeth	264cd7e1f1	Merge pull request #592 from geethkokila/cloud-3.1.0 ... Fixing the task to get the only device registered tenants	2017-02-24 12:33:14 +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 Sachith Punchihewa	96bdb7c4ae	Merge pull request #616 from Kamidu/cloud-3.1.0 ... Cloud 3.1.0	2017-02-20 18:21:58 +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
Geeth	349e1448eb	Merge pull request #615 from DimalChandrasiri/cloud-3.1.0 ... Removed analytics link temporarily	2017-02-20 17:33:46 +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	ee4ab2fda8	Merge pull request #614 from Kamidu/master ... adding the removed tenant based token handlers	2017-02-19 22:12:56 +05:30
Kamidu Sachith Punchihewa	66baa3a71b	adding the removed tenant based token handlers	2017-02-19 22:11:28 +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
Kamidu Sachith Punchihewa	f03d701c24	Merge pull request #612 from DimalChandrasiri/cloud-3.1.0 ... Temporary advance search removal commit	2017-02-19 19:39:13 +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
Kamidu Sachith Punchihewa	616d42ccaa	Merge pull request #610 from DimalChandrasiri/cloud-3.1.0 ... Tooltip overflow fix	2017-02-19 18:26:30 +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
WSO2 Builder	93258c598d	[WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration	2017-02-19 18:04:13 +05:30
WSO2 Builder	2da8898755	[WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18	2017-02-19 18:04:00 +05:30
Kamidu Sachith Punchihewa	617ffb6578	Merge pull request #608 from Kamidu/cloud-3.1.0 ... resolving return type issue in group mgt	2017-02-19 17:54:39 +05:30
Kamidu Sachith Punchihewa	5a1331d805	Merge pull request #609 from Kamidu/master ... remove websocket related codes	2017-02-19 17:54:30 +05:30
Kamidu Sachith Punchihewa	5fbe92107d	remove websocket related codes	2017-02-19 17:53:35 +05:30
Kamidu Sachith Punchihewa	367dc1a30b	resolving return type issue in group mgt	2017-02-19 17:48:11 +05:30
Kamidu Sachith Punchihewa	7ad808f2fb	Merge pull request #607 from Kamidu/cloud-3.1.0 ... Cloud 3.1.0	2017-02-19 16:05:29 +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 Sachith Punchihewa	8f9e53fc91	Merge pull request #606 from Kamidu/cloud-3.1.0 ... cloud related ui fixes	2017-02-17 17:58:50 +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	d1783bc0eb	Merge pull request #601 from hasuniea/cloud-3.1.0 ... Fixing the task to get the only device registered tenants	2017-02-16 18:45:37 +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