2968 Commits

Author	SHA1	Message	Date
ayyoob	38f61adf94	few changes after testing multi tenancy	2017-01-30 22:14:26 +05:30
Milan Perera	2b4a3cde61	Fixed conflicts and merged	2017-01-26 14:59:05 +05:30
Milan Perera	7ba1dc989a	Implemented a scope delegation validator	2017-01-26 14:51:30 +05:30
Milan Perera	21d8d14b7e	Fixed multy tenancy issues related to android device type	2017-01-26 14:50:12 +05:30
ayyoob	30119ff263	fixed data holder issue	2017-01-26 12:38:26 +05:30
geethkokila	713ddbf416	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-01-26 12:08:10 +05:30
geethkokila	2988357eb9	Changing the task to run for all the tenants	2017-01-26 12:07:29 +05:30
ayyoob	0c4a78f3e9	fixed api Id issue for subscription	2017-01-26 00:02:17 +05:30
ayyoob	3c45f9af11	fixed api Id issue for subscription	2017-01-25 22:15:03 +05:30
ayyoob	159e067fed	changed integration client version	2017-01-25 14:03:38 +05:30
ayyoob	b42505c1fe	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y	2017-01-25 14:01:03 +05:30
ayyoob	1a7a215441	added missing license headers	2017-01-25 14:00:31 +05:30
ayyoob	1370b87618	fixed apim application issue	2017-01-25 09:24:23 +05:30
WSO2 Builder	cd7e0feaa6	[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration	2017-01-24 23:22:44 +05:30
WSO2 Builder	abb150d9bd	[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11	2017-01-24 23:22:33 +05:30
ayyoob	7348ae2f2a	resolved merge issues	2017-01-24 19:49:40 +05:30
ayyoob	3423ef025d	merged with upstream	2017-01-24 19:39:49 +05:30
ayyoob	e74b4e23c4	removed apim dependency from cdmf	2017-01-24 19:32:59 +05:30
Milan Perera	e29aa58e19	Removed tenant domain from Basic Authenticator	2017-01-24 14:22:12 +05:30
WSO2 Builder	002fb8719b	[maven-release-plugin] prepare for next development iteration	2017-01-23 20:24:47 +00:00
WSO2 Builder	04f32902fd	[maven-release-plugin] prepare release v2.0.10	2017-01-23 20:21:44 +00:00
Rasika Perera	704680d68d	Fixing null pointer when roles are not specified on creating new user	2017-01-24 01:54:37 +05:30
Rasika Perera	9a0ba9137b	Fixed permissions issue on grouping	2017-01-23 16:24:20 +05:30
Rasika Perera	d723e22a8c	Fixed roleUpdate issue	2017-01-23 14:35:03 +05:30
WSO2 Builder	5c207897ad	[maven-release-plugin] prepare for next development iteration	2017-01-20 12:44:14 +00:00
WSO2 Builder	233d14edbd	[maven-release-plugin] prepare release v2.0.9	2017-01-20 12:41:33 +00:00
Rasika Perera	8e6855a203	Adding DEFAULT_DEVICE_USER on adding user	2017-01-20 18:01:56 +05:30
Rasika Perera	5ce413012e	Adding DEFAULT_DEVICE_USER and DEFAULT_DEVICE_ADMIN	2017-01-20 18:01:55 +05:30
Rasika Perera	5aa8776bfe	Fixing iot.analytics.host%:%iot.analytics.https.host => iot.analytics.host%:%iot.analytics.https.port	2017-01-20 15:50:35 +05:30
Rasika Perera	42816101bb	Merge pull request #566 from wso2/release-2.0.8 ... Release 2.0.8	2017-01-20 15:42:12 +05:30
Imesh Chandrasiri	3983780f7f	Fix for multiple advance search element	2017-01-20 15:09:00 +05:30
Imesh Chandrasiri	a5d1f70c93	git status	2017-01-20 15:08:27 +05:30
Imesh Chandrasiri	ef80d62307	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-20 11:50:46 +05:30
Imesh Chandrasiri	9f262c1afb	Message container markup fix for advance search	2017-01-20 11:50:39 +05:30
WSO2 Builder	eedecf00ed	[maven-release-plugin] prepare for next development iteration	2017-01-19 23:23:04 +00:00
WSO2 Builder	ef57fc463b	[maven-release-plugin] prepare release v2.0.8	2017-01-19 23:20:20 +00:00
Ayyoob Hamza	96f0c633d9	Merge pull request #563 from madhawap/release-2.0.x ... parameterizing sso config	2017-01-20 01:05:19 +05:30
madhawap	348b349a37	parameterizing sso config	2017-01-20 00:27:36 +05:30
Rasika Perera	212cc52eb2	Merge pull request #562 from Kamidu/release-2.0.x ... improvements for location view	2017-01-19 22:45:38 +05:30
kamidu	eb17093747	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-19 22:37:19 +05:30
kamidu	bf38ad5f70	adding location history to map view	2017-01-19 22:37:08 +05:30
Rasika Perera	fb1f7771c4	Fixing "process" not found on devicemgt	2017-01-19 22:36:21 +05:30
Rasika Perera	b39caade98	Adding system params picking up for app-conf.json	2017-01-19 19:42:41 +05:30
Rasika Perera	3a2b206fe6	Fixing certificate management api returns 403 forbidden	2017-01-19 19:41:21 +05:30
Rasika Perera	ff2cd32bce	Merge pull request #561 from geethkokila/release-2.0.x ... Adding the fixes for device search	2017-01-19 19:32:39 +05:30
geethkokila	2743bf9458	Fixing the security issue due to not using prepared statement	2017-01-19 17:51:42 +05:30
geethkokila	7359b4c536	Fixing the security issue due to not using prepared statement	2017-01-19 17:51:32 +05:30
kamidu	bd75b789c2	Enable location histry for android sense	2017-01-19 17:43:33 +05:30
Imesh Chandrasiri	bc59ac6819	Adding action buttons to listing views	2017-01-19 14:08:59 +05:30
Imesh Chandrasiri	ba23e5cfd9	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-19 10:58:47 +05:30