Commit Graph

3883 Commits

Author SHA1 Message Date
charitha
423879bee7 Updated swagger docs 2017-01-30 20:41:05 +05:30
charitha
3cf797fba6 Removed hardcoded device types in swagger docs 2017-01-30 17:25:27 +05:30
WSO2 Builder
5dc55bb5b5 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration 2017-01-30 16:05:41 +05:30
WSO2 Builder
c7fe9c3a20 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13 2017-01-30 16:05:29 +05:30
Hasunie
b8d9ec782a Merge pull request #578 from lakshani/rest-connector-3.1.0
removed unwanted new lines
2017-01-30 15:54:49 +05:30
lakshani
3b32635cf9 removed unwanted new lines 2017-01-30 15:48:15 +05:30
Chatura Dilan
56e4dfd743 Merge pull request #576 from lakshani/rest-connector-3.1.0
Added role query param to getdevices restapis
2017-01-30 10:34:44 +05:30
lakshani
bbcdf7aeda removed unwanted new line 2017-01-30 07:54:43 +05:30
lakshani
26f2e2d2ae added role query param to getdevices restapis 2017-01-30 07:50:10 +05:30
WSO2 Builder
c17bead1fc [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration 2017-01-29 19:46:03 +05:30
WSO2 Builder
14100d3cc8 [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12 2017-01-29 19:45:51 +05:30
Rasika Perera
d1c34706f2 Merge pull request #575 from GPrathap/master
fixing permission issue when viewing device analytics dashboard
2017-01-29 19:33:02 +05:30
GPrathap
9cdcb58103 uncommenting required fields 2017-01-29 17:02:38 +05:30
GPrathap
e7e8cb62b6 fixing permission issue when viewing device analytics dashboard 2017-01-29 16:51:59 +05:30
GPrathap
47e6f6d292 adding username as parameter 2017-01-29 16:51:37 +05:30
Milan Perera
de47812d6d Merge pull request #573 from milanperera/cloud
Fixed multi tenancy issues related to android device type and implemented a scope validation delegator
2017-01-26 15:04:01 +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 Hamza
eb5cd087ec Merge pull request #572 from ayyoob/release-2.0.y
removed apim dependency from core
2017-01-26 12:03:39 +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
Rasika Perera
d7a3c625a0 Merge pull request #570 from wso2/release-2.0.10
Release 2.0.10
2017-01-24 14:57:19 +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
Rasika Perera
704680d68d Fixing null pointer when roles are not specified on creating new user 2017-01-24 01:54:37 +05:30
WSO2 Builder
04f32902fd [maven-release-plugin] prepare release v2.0.10 2017-01-23 20:21:44 +00:00
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
Rasika Perera
ede140a1f4 Merge pull request #568 from wso2/release-2.0.9
Release 2.0.9
2017-01-23 14:29:39 +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
04ffa1eb8a Merge pull request #565 from Vishanth/release-2.0.x
fixing dm_profile constraint issue
2017-01-20 16:11:57 +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
Rasika Perera
2816d374d2 Merge pull request #564 from DimalChandrasiri/release-2.0.x
Release 2.0.x
2017-01-20 15:39:48 +05:30