3198 Commits

Author	SHA1	Message	Date
sinthuja	18583af6b4	Fixing the case where multiple tags were passed for searching the APIs.	2017-03-29 23:07:18 +05:30
WSO2 Builder	f3e119cd78	[WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare for next development iteration	2017-03-28 12:48:31 +05:30
WSO2 Builder	a8f8a49a80	[WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare release v2.0.37	2017-03-28 12:48:20 +05:30
Harshan Liyanage	9e4d84dfb2	Fix for Advanced Search Issue #670	2017-03-28 12:37:28 +05:30
lakshani	5c7cfda487	Fixed jira IOTS-438	2017-03-24 15:42:54 +05:30
WSO2 Builder	0e5895ec78	[WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare for next development iteration	2017-03-24 12:06:23 +05:30
WSO2 Builder	d6080159cb	[WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare release v2.0.36	2017-03-24 12:06:12 +05:30
Amal Gunatilake	e9c2f3e72d	Merge branch 'master' into cloud-3.1.0	2017-03-24 11:55:35 +05:30
WSO2 Builder	3f8f8b3ab9	[WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration	2017-03-23 18:59:18 +05:30
WSO2 Builder	6a9a5ba9c8	[WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35	2017-03-23 18:59:07 +05:30
amalhub	c65f9c6dcb	Fixing issue: https://github.com/wso2/product-iots/issues/314	2017-03-23 15:51:46 +05:30
kamidu	3b9ae200e7	fixing posible null pointer excep	2017-03-23 14:12:12 +05:30
kamidu	a85b5688a9	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-03-23 12:23:39 +05:30
kamidu	0b94a284ad	new role filtering related fixes	2017-03-23 12:23:21 +05:30
kamidu	8c17418198	fixing the null pointer exception	2017-03-23 12:23:02 +05:30
kamidu	530e603fb5	enable role filtering and role count in device cloud	2017-03-23 12:22:27 +05:30
kamidu	cda0dd417f	fixing the role filtering api issues	2017-03-23 12:21:41 +05:30
Harshan Liyanage	d468ac07d0	Revert "Allowing configuration management in cloud environment"	2017-03-23 11:12:15 +05:30
Madawa Soysa	da69bc9fe5	Allowing configuration management in cloud environment	2017-03-23 11:06:52 +05:30
charitha	6656f9e6f0	Add support for hybrid device types which has emulation/virtual capabilities ... (cherry picked from commit 78b7037)	2017-03-23 01:07:28 +05:30
kamidu	e205fd97cd	fix the user view related issues and device location out dated issue	2017-03-22 20:14:50 +05:30
kamidu	1f572998f8	enable role filtering in device cloud	2017-03-22 20:13:59 +05:30
kamidu	73ab0a38bf	adding get location api witch was missing from previous emm versions	2017-03-22 20:13:08 +05:30
kamidu	a6f5c002a9	adding get location api witch was missing from previous emm versions	2017-03-22 20:12:50 +05:30
kamidu	a77794f81a	adding role filtering for device cloud via api	2017-03-22 20:12:30 +05:30
kamidu	fc6c8e0290	adding get location api witch was missing from previous emm versions	2017-03-22 20:11:41 +05:30
Susinda Perera	643be65cf9	Merge pull request #662 from amalhub/master ... Once the password is changed - Curent user should be immediately logout	2017-03-22 15:54:33 +05:30
amalhub	4c6781d6b6	Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/645 , Once the password is changed - Curent user should be immediately logout	2017-03-22 15:37:16 +05:30
WSO2 Builder	e8ee33e7a4	[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare for next development iteration	2017-03-22 15:24:27 +05:30
WSO2 Builder	6cc898d2ab	[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare release v2.0.34	2017-03-22 15:24:16 +05:30
Geeth	c0a474f6fc	Merge pull request #661 from charithag/master ... Fixes and improvments	2017-03-22 15:18:50 +05:30
charitha	78b7037aa9	Add support for hybrid device types which has emulation/virtual capabilities	2017-03-22 15:04:21 +05:30
WSO2 Builder	a26a4bb539	[WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare for next development iteration	2017-03-22 14:25:54 +05:30
WSO2 Builder	000601911f	[WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare release v2.0.33	2017-03-22 14:25:43 +05:30
amalhub	af4ab19132	Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/647	2017-03-22 12:16:12 +05:30
WSO2 Builder	50c9eb9ba4	[WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare for next development iteration	2017-03-21 20:02:26 +05:30
WSO2 Builder	ca79804c5c	[WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare release v2.0.32	2017-03-21 20:02:14 +05:30
sinthuja	54888b6727	Adding back the webscoket credential method invocation, as it's needed by the pugins.	2017-03-21 19:44:02 +05:30
charitha	5ff3ba3fcc	Fix issue in showing dynamic icons	2017-03-21 11:14:27 +05:30
kamidu	bf1548c062	title app name changed	2017-03-21 10:52:12 +05:30
WSO2 Builder	a35205c480	[WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare for next development iteration	2017-03-20 16:49:31 +05:30
WSO2 Builder	ac379c9bf9	[WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare release v2.0.31	2017-03-20 16:49:20 +05:30
Harshan Liyanage	df6d8d4496	Merge pull request #656 from Kamidu/cloud-3.1.0 ... Fixing Git Issue : https://github.com/wso2/carbon-device-mgt/issues/643	2017-03-20 16:43:33 +05:30
kamidu	fef7a58ad4	title app name changed	2017-03-20 14:29:27 +05:30
Susinda	5d10575de8	Merge remote-tracking branch 'upstream/master'	2017-03-16 18:04:52 +05:30
Susinda	dc0606f207	Fixing typo in above commit	2017-03-16 17:24:19 +05:30
Susinda	96d45d006d	Fixing #645 , when password is changed redirect to logout	2017-03-16 17:21:48 +05:30
WSO2 Builder	de25f3afe3	[WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare for next development iteration	2017-03-16 16:59:42 +05:30
WSO2 Builder	55ecafe7f4	[WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare release v2.0.30	2017-03-16 16:59:28 +05:30
Amal Gunatilake	f93bac489f	Merge pull request #654 from susinda/master ... Fixing #644	2017-03-16 15:37:56 +05:30