WSO2 Builder
80bf3c8fbd
[WSO2 Release] [Jenkins #2266 ] [Release 2.0.56] prepare for next development iteration
2017-05-02 18:01:00 +05:30
WSO2 Builder
2a7173c66d
[WSO2 Release] [Jenkins #2266 ] [Release 2.0.56] prepare release v2.0.56
2017-05-02 18:00:46 +05:30
WSO2 Builder
95a80301e9
[WSO2 Release] [Jenkins #2265 ] [Release 2.0.55] prepare for next development iteration
2017-05-02 17:15:09 +05:30
WSO2 Builder
236db75700
[WSO2 Release] [Jenkins #2265 ] [Release 2.0.55] prepare release v2.0.55
2017-05-02 17:14:54 +05:30
Chatura Dilan
309352df1e
Merge pull request #722 from janakamarasena/mutual-ssl-handler
...
Added mutual SSL authentication handling for android
2017-05-02 17:04:38 +05:30
WSO2 Builder
43e76e4678
[WSO2 Release] [Jenkins #2263 ] [Release 2.0.54] prepare for next development iteration
2017-05-02 09:37:33 +05:30
WSO2 Builder
34865f0d25
[WSO2 Release] [Jenkins #2263 ] [Release 2.0.54] prepare release v2.0.54
2017-05-02 09:37:16 +05:30
Janak Amarasena
2b0800794d
Minor improvements to the code
2017-04-28 16:32:57 +05:30
Janak Amarasena
e5bd7566d3
Add Mutual SSL handling to AuthHandler
2017-04-28 16:32:57 +05:30
WSO2 Builder
3a9986d054
[WSO2 Release] [Jenkins #2257 ] [Release 2.0.53] prepare for next development iteration
2017-04-28 10:29:44 +05:30
WSO2 Builder
b53610ff8b
[WSO2 Release] [Jenkins #2257 ] [Release 2.0.53] prepare release v2.0.53
2017-04-28 10:29:35 +05:30
megala21
47ce861b49
Fixing basic authenticator issue
2017-04-28 10:01:54 +05:30
megala21
4560348697
Fixing isses in authentication
2017-04-27 23:21:29 +05:30
megala21
b5e4c22c31
Merge remote-tracking branch 'upstream/master'
2017-04-27 21:55:32 +05:30
megala21
121c289b39
Adding security filters to web.xml
2017-04-27 17:36:10 +05:30
WSO2 Builder
726422dc81
[WSO2 Release] [Jenkins #2250 ] [Release 2.0.52] prepare for next development iteration
2017-04-26 21:31:21 +05:30
WSO2 Builder
4bf6bf73cc
[WSO2 Release] [Jenkins #2250 ] [Release 2.0.52] prepare release v2.0.52
2017-04-26 21:31:08 +05:30
WSO2 Builder
4429482a29
[WSO2 Release] [Jenkins #2248 ] [Release 2.0.51] prepare for next development iteration
2017-04-26 15:26:48 +05:30
WSO2 Builder
1bbd982e1f
[WSO2 Release] [Jenkins #2248 ] [Release 2.0.51] prepare release v2.0.51
2017-04-26 15:26:35 +05:30
WSO2 Builder
52b0165275
[WSO2 Release] [Jenkins #2245 ] [Release 2.0.50] prepare for next development iteration
2017-04-26 11:16:14 +05:30
WSO2 Builder
ada2669ecf
[WSO2 Release] [Jenkins #2245 ] [Release 2.0.50] prepare release v2.0.50
2017-04-26 11:15:58 +05:30
ayyoob
9967d6e7da
few fixes after testing mqtt authorisation flow
...
(cherry picked from commit 4aba08b)
2017-04-26 10:20:03 +05:30
WSO2 Builder
543e603298
[WSO2 Release] [Jenkins #2242 ] [Release 2.0.49] prepare for next development iteration
2017-04-25 10:14:34 +05:30
WSO2 Builder
5010a3eebf
[WSO2 Release] [Jenkins #2242 ] [Release 2.0.49] prepare release v2.0.49
2017-04-25 10:14:21 +05:30
WSO2 Builder
eb8ba53092
[WSO2 Release] [Jenkins #2240 ] [Release 2.0.48] prepare for next development iteration
2017-04-25 08:58:47 +05:30
WSO2 Builder
4764bff47e
[WSO2 Release] [Jenkins #2240 ] [Release 2.0.48] prepare release v2.0.48
2017-04-25 08:58:32 +05:30
WSO2 Builder
c1b5a649f6
[WSO2 Release] [Jenkins #2234 ] [Release 2.0.47] prepare for next development iteration
2017-04-21 16:06:53 +05:30
WSO2 Builder
6ccccb67b4
[WSO2 Release] [Jenkins #2234 ] [Release 2.0.47] prepare release v2.0.47
2017-04-21 16:06:39 +05:30
Harshan Liyanage
0dc15324ad
Merge pull request #701 from amalhub/master
...
Merging Cloud updates to master
2017-04-21 15:59:00 +05:30
Madawa Soysa
0eeef0a568
Refactoring to use APIManager DCR
...
This commit is done to refactor the Auth application creation process to use the APIManager Key manager client registration endpoint instead of IOT DCR endpoint.
2017-04-21 15:46:18 +05:30
WSO2 Builder
1ecb4edbd7
[WSO2 Release] [Jenkins #2232 ] [Release 2.0.46] prepare for next development iteration
2017-04-21 15:31:09 +05:30
WSO2 Builder
48a8f43cb3
[WSO2 Release] [Jenkins #2232 ] [Release 2.0.46] prepare release v2.0.46
2017-04-21 15:30:57 +05:30
WSO2 Builder
16d97d62be
[WSO2 Release] [Jenkins #2229 ] [Release 2.0.45] prepare for next development iteration
2017-04-20 14:41:55 +05:30
WSO2 Builder
8891784b99
[WSO2 Release] [Jenkins #2229 ] [Release 2.0.45] prepare release v2.0.45
2017-04-20 14:41:41 +05:30
WSO2 Builder
f7d1a7cf99
[WSO2 Release] [Jenkins #2225 ] [Release 2.0.44] prepare for next development iteration
2017-04-18 10:40:31 +05:30
WSO2 Builder
4b85af950c
[WSO2 Release] [Jenkins #2225 ] [Release 2.0.44] prepare release v2.0.44
2017-04-18 10:40:22 +05:30
ayyoob
d121e557b8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-04-17 17:44:48 +05:30
ayyoob
8a842e8f8e
restricted basic auth support
2017-04-17 17:37:46 +05:30
WSO2 Builder
b9e614e383
[WSO2 Release] [Jenkins #2222 ] [Release 2.0.43] prepare for next development iteration
2017-04-17 16:39:50 +05:30
WSO2 Builder
d37951ef3f
[WSO2 Release] [Jenkins #2222 ] [Release 2.0.43] prepare release v2.0.43
2017-04-17 16:39:37 +05:30
WSO2 Builder
fc15f43b31
[WSO2 Release] [Jenkins #2210 ] [Release 2.0.42] prepare for next development iteration
2017-04-07 14:07:15 +05:30
WSO2 Builder
27b84bfc22
[WSO2 Release] [Jenkins #2210 ] [Release 2.0.42] prepare release v2.0.42
2017-04-07 14:07:01 +05:30
Harshan Liyanage
46f418bafb
Api publishing timeout fixes for cloud.
2017-04-07 13:46:52 +05:30
Ace
903ab9abe3
Adding logic to acknowledge 404 response when tiers not available
2017-04-07 13:44:23 +05:30
WSO2 Builder
5496159f9d
[WSO2 Release] [Jenkins #2206 ] [Release 2.0.41] prepare for next development iteration
2017-04-05 11:58:36 +05:30
WSO2 Builder
ef94e90366
[WSO2 Release] [Jenkins #2206 ] [Release 2.0.41] prepare release v2.0.41
2017-04-05 11:58:23 +05:30
WSO2 Builder
a826370019
[WSO2 Release] [Jenkins #2204 ] [Release 2.0.40] prepare for next development iteration
2017-04-05 09:37:06 +05:30
WSO2 Builder
4654a4db45
[WSO2 Release] [Jenkins #2204 ] [Release 2.0.40] prepare release v2.0.40
2017-04-05 09:36:53 +05:30
WSO2 Builder
8b7e458592
[WSO2 Release] [Jenkins #2201 ] [Release 2.0.39] prepare for next development iteration
2017-04-04 18:08:44 +05:30
WSO2 Builder
6297993560
[WSO2 Release] [Jenkins #2201 ] [Release 2.0.39] prepare release v2.0.39
2017-04-04 18:08:31 +05:30
WSO2 Builder
802c83de39
[WSO2 Release] [Jenkins #2193 ] [Release 2.0.38] prepare for next development iteration
2017-03-29 23:16:15 +05:30
WSO2 Builder
98dda03784
[WSO2 Release] [Jenkins #2193 ] [Release 2.0.38] prepare release v2.0.38
2017-03-29 23:16:04 +05:30
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
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
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
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
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
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
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
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
WSO2 Builder
15d57f71ad
[WSO2 Release] [Jenkins #2161 ] [Release 2.0.29] prepare for next development iteration
2017-03-16 11:10:29 +05:30
WSO2 Builder
3af9e1729a
[WSO2 Release] [Jenkins #2161 ] [Release 2.0.29] prepare release v2.0.29
2017-03-16 11:10:11 +05:30
WSO2 Builder
322f39596e
[WSO2 Release] [Jenkins #2158 ] [Release 2.0.28] prepare for next development iteration
2017-03-15 18:46:16 +05:30
WSO2 Builder
18244d6c96
[WSO2 Release] [Jenkins #2158 ] [Release 2.0.28] prepare release v2.0.28
2017-03-15 18:46:03 +05:30
WSO2 Builder
12f21868dc
[WSO2 Release] [Jenkins #2157 ] [Release 2.0.27] prepare for next development iteration
2017-03-15 18:04:26 +05:30
WSO2 Builder
4328c3c39d
[WSO2 Release] [Jenkins #2157 ] [Release 2.0.27] prepare release v2.0.27
2017-03-15 18:04:12 +05:30
WSO2 Builder
c6bb8e0128
[WSO2 Release] [Jenkins #2154 ] [Release 2.0.26] prepare for next development iteration
2017-03-14 17:47:54 +05:30
WSO2 Builder
da9002ba9f
[WSO2 Release] [Jenkins #2154 ] [Release 2.0.26] prepare release v2.0.26
2017-03-14 17:47:43 +05:30
WSO2 Builder
6114f4b2d5
[WSO2 Release] [Jenkins #2152 ] [Release 2.0.25] prepare for next development iteration
2017-03-14 15:27:06 +05:30
WSO2 Builder
ea8f19f26d
[WSO2 Release] [Jenkins #2152 ] [Release 2.0.25] prepare release v2.0.25
2017-03-14 15:26:55 +05:30
WSO2 Builder
d433525145
[WSO2 Release] [Jenkins #2150 ] [Release 2.0.24] prepare for next development iteration
2017-03-14 14:09:19 +05:30
WSO2 Builder
35ee3eca3a
[WSO2 Release] [Jenkins #2150 ] [Release 2.0.24] prepare release v2.0.24
2017-03-14 14:09:08 +05:30
WSO2 Builder
4e0afb7d39
[WSO2 Release] [Jenkins #2146 ] [Release 2.0.23] prepare for next development iteration
2017-03-13 18:09:06 +05:30
WSO2 Builder
33f1448c82
[WSO2 Release] [Jenkins #2146 ] [Release 2.0.23] prepare release v2.0.23
2017-03-13 18:08:55 +05:30
Harshan Liyanage
3ab025a6d8
Merge pull request #631 from ayyoob/cloud-3.1.0
...
added claimable property and fixed unsecured endpoint bug
2017-03-13 18:03:18 +05:30
WSO2 Builder
e95e96f06c
[WSO2 Release] [Jenkins #2141 ] [Release 2.0.22] prepare for next development iteration
2017-03-10 13:09:08 +05:30
WSO2 Builder
5d55413e02
[WSO2 Release] [Jenkins #2141 ] [Release 2.0.22] prepare release v2.0.22
2017-03-10 13:08:55 +05:30
Susinda
40469d0e4d
Adding maven.javadoc.skip to org.wso2.carbon.apimgt.integration.generated.client project
2017-03-10 12:57:47 +05:30
Susinda
7083c4ec9b
version corrected to 2.0.22-SNAPSHOT
2017-03-09 14:49:49 +05:30
Susinda Perera
bd7d6939e5
Merge pull request #628 from susinda/master
...
Merging from cloud-3.1.0
2017-03-09 13:58:59 +05:30
Susinda
e83fa8cb02
org.wso2.carbon.apimgt.integration.generated.client version increment
2017-03-09 13:50:15 +05:30
WSO2 Builder
ae3300afde
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare for next development iteration
2017-03-09 13:14:50 +05:30
WSO2 Builder
6646c0c56f
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare release v2.0.21
2017-03-09 13:14:38 +05:30
Susinda Perera
7c9659ed29
Merge pull request #1 from susinda/cloud-3.1.0
...
Cloud 3.1.0
2017-03-09 12:44:36 +05:30
WSO2 Builder
21cdcdd21a
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare for next development iteration
2017-03-09 12:38:02 +05:30
WSO2 Builder
23be60ebd0
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare release v2.0.20
2017-03-09 12:37:49 +05:30
ayyoob
2384755a97
added claimable property and fixed unsecured endpoint bug
2017-03-08 03:14:51 +05:30
ayyoob
964fb7ce72
regenerated swagger api based on apimgt 2.1.0 rest api
2017-03-07 01:56:51 +05:30
ayyoob
525b55d603
avoid race condition by loading tiers
2017-03-06 11:30:22 +05:30
ayyoob
5e4b0564b7
added permission fix for operation and synchronised application creation to avoid duplicate subscription
2017-03-03 17:02:36 +05:30
Susinda
09b74211c4
increment carbon-devicemgt version to 2.0.20
2017-03-02 12:39:19 +05:30
ayyoob
5d3aa49e06
added logger trace support for apim integration service
2017-03-02 00:31:34 +05:30
ayyoob
c088a9bc93
fixed api subscribe issue for device specific app creation
2017-03-01 23:26:17 +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
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
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
ayyoob
470500b80e
added ssl context
2017-02-27 16:44:21 +05:30
ayyoob
dac7d3c1ee
made device management to be default tag
2017-02-09 09:59:06 +05:30
ayyoob
67ae4c7c68
fixed api subscription issue
2017-02-09 09:11:22 +05:30
ayyoob
6c96d228ae
added subscription fix
2017-02-09 03:02:56 +05:30
ayyoob
b7566f4e4a
added artifact deployment support through UI
2017-02-05 17:51:48 +05:30
ayyoob
274d3e9aeb
used jwt grant type instead of saml
2017-02-04 20:51:56 +05:30
Kamidu Sachith Punchihewa
559fe98cc9
Merge pull request #585 from wso2/master
...
Cloud ui fixes and the new master fixes
2017-02-03 17:24:49 +05:30
WSO2 Builder
54a278a1bc
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare for next development iteration
2017-02-03 16:08:26 +05:30
WSO2 Builder
3bc46c4d2d
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare release v2.0.15
2017-02-03 16:08:12 +05:30
WSO2 Builder
1bc8f5c28d
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare for next development iteration
2017-02-02 15:56:43 +05:30
WSO2 Builder
1483503790
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare release v2.0.14
2017-02-02 15:56:36 +05:30
Milan Perera
701d6e4522
Updated the snapshot version of intergration client
2017-02-01 12:55:56 +05:30
Milan Perera
a5f41ef734
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
2017-02-01 12:14:59 +05:30
ayyoob
38f61adf94
few changes after testing multi tenancy
2017-01-30 22:14:26 +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
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
Milan Perera
2b4a3cde61
Fixed conflicts and merged
2017-01-26 14:59:05 +05:30
Milan Perera
21d8d14b7e
Fixed multy tenancy issues related to android device type
2017-01-26 14:50:12 +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
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
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
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
5927064435
apim seperation
2017-01-18 01:48:07 +05:30
ayyoob
2a538ff959
fixed multi tenant login issue
2017-01-16 16:07:36 +05:30
WSO2 Builder
585b9bde4d
[maven-release-plugin] prepare for next development iteration
2017-01-14 01:50:45 +00:00
WSO2 Builder
d206148841
[maven-release-plugin] prepare release v2.0.7
2017-01-14 01:46:41 +00:00
geethkokila
bf8ab0da11
Adding support for identifying the device type from the url
2017-01-13 16:23:47 +05:30
ayyoob
5b3a8091ec
fixed Null pointer exception
2017-01-12 23:18:54 +05:30
ayyoob
d4ec0705e7
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-12 19:09:12 +05:30
ayyoob
cdd144237f
removed unused parameter
2017-01-12 19:09:01 +05:30
Milan Perera
21c50c9a55
Fixed NPE occurred due to scope mapping
2017-01-12 19:01:57 +05:30
ayyoob
2fbaf31b93
fixed permission and assigned environment variables for url context
2017-01-12 18:13:43 +05:30
Rasika Perera
83aea1fd01
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-master
...
# Conflicts:
# components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/ExtendedFileProtocolIteratorFactory.java
# components/apimgt-extensions/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
# components/certificate-mgt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
# components/device-mgt-extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PasswordResetWrapper.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PolicyList.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/ProfileFeature.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Policy.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/SearchDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/impl/SearchDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/ProcessorImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/QueryBuilderImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/AnnotationProcessor.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedFileProtocolIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/pages/uuf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
# components/device-mgt/pom.xml
# components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
# components/email-sender/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/OAuthExtUtils.java
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
# components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
# components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
# components/identity-extensions/pom.xml
# components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
# components/policy-mgt/pom.xml
# components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
# components/webapp-authenticator-framework/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
# features/apimgt-extensions/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
# features/certificate-mgt/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
# features/device-mgt-extensions/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
# features/device-mgt/pom.xml
# features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml
# features/dynamic-client-registration/pom.xml
# features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
# features/email-sender/pom.xml
# features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
# features/jwt-client/pom.xml
# features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
# features/oauth-extensions/pom.xml
# features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
# features/policy-mgt/pom.xml
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
# features/webapp-authenticator-framework/pom.xml
# pom.xml
2017-01-08 11:45:46 +05:30
WSO2 Builder
5411d93103
[maven-release-plugin] prepare for next development iteration
2017-01-07 07:48:36 +00:00
WSO2 Builder
3ea83b925a
[maven-release-plugin] prepare release v2.0.6
2017-01-07 07:33:45 +00:00
geethkokila
7059ad1243
Changing the package name
2017-01-07 11:21:50 +05:30
geethkokila
2881079b27
Removing two unnecessary classes from the project and adding java documentation to class
2017-01-07 11:06:48 +05:30
Rasika Perera
08ab946e88
Added doc comments
2017-01-07 10:28:25 +05:30
Rasika Perera
a16052431c
Corrected a typo on [APIMCertificateMGTException]
2017-01-07 10:26:35 +05:30
Rasika Perera
c2490347b6
Corrected a typo
2017-01-07 10:25:32 +05:30
Joseph Fonseka
a5640f48b5
Changed auth type on API resources as configured in web.xml
2017-01-06 19:41:16 +05:30
Rasika Perera
dfcf72cae0
Merge pull request #518 from geethkokila/mutual_ssl_feature
...
Adding gateway support for IOS device type
2017-01-06 19:34:36 +05:30
Rasika Perera
8397b688e9
Merge branch 'release-2.0.x' into mutual_ssl_feature
2017-01-06 19:34:25 +05:30
Rasika Perera
bc93d48927
Merge pull request #520 from madhawap/release-2.0.x
...
fix to WebappPublisherConfig
2017-01-06 19:23:29 +05:30
madhawap
d22de197a1
fix to WebappPublisherConfig
2017-01-06 19:07:49 +05:30
geethkokila
3795a7e30f
Removing the hardcoded apis
2017-01-06 17:09:46 +05:30
geethkokila
44c7383b15
Adding support to send ios request the synapse gateway
2017-01-06 17:04:00 +05:30
Milan Perera
228848075c
Fixed conflicts and merged
2017-01-06 16:46:42 +05:30
Milan Perera
42a587904f
Fixed issues in permission-scope mapping
2017-01-06 16:10:52 +05:30
geethkokila
9200adebed
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
2017-01-06 15:17:44 +05:30
Rasika Perera
8706636b51
Merge pull request #511 from ayyoob/release-2.0.x
...
Made Policy Monitoring for device type to be multitenance & Added default values for push notification dynamic configuration
2017-01-06 14:15:21 +05:30
inoshperera
e6a70b2394
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-06 11:35:34 +05:30
inoshperera
11d2ecac10
removing basic auth headers from API definitions.
2017-01-06 11:34:48 +05:30
Milan Perera
e0ee2fc1e5
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-06 09:19:12 +05:30
ayyoob
b20a2e0997
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-05 17:51:34 +05:30
ayyoob
c69513e0f5
removed tenant domain from the web.xml
2017-01-05 17:51:23 +05:30
Milan Perera
f3409adc21
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-05 12:41:22 +05:30
Milan Perera
7b8a7c0b52
Merge pull request #1 from GPrathap/release-2.0.x
...
removed setting APIs secured as default.
2017-01-05 11:58:52 +05:30
Maninda
0fb5a577b8
Fixed some issues found in FindBugs security analysis.
2017-01-05 11:47:09 +05:30
inoshperera
c4a2ba0cea
adding http api publisher for Android agent to work out of the box
2017-01-04 16:54:46 +05:30
geethkokila
65cb12b5ac
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
2017-01-03 14:13:49 +05:30
Milan Perera
02d75b757c
Fixed conflicts and merged
2017-01-03 10:37:46 +05:30
GPrathap
f508bcfd0e
corrected method name
2017-01-01 22:03:50 +05:30
GPrathap
649879f998
removed setting APIs secured as default.
...
Because if secured is enabled, it is to be needed to provided parameters which are related to basic oauth, when this is false, jwt token is being used.
2017-01-01 21:13:53 +05:30
WSO2 Builder
6aea6195e9
[maven-release-plugin] prepare for next development iteration
2016-12-23 19:20:14 +00:00
WSO2 Builder
3db5b289ac
[maven-release-plugin] prepare release v2.0.5
2016-12-23 19:18:26 +00:00
WSO2 Builder
ed47094964
[maven-release-plugin] prepare for next development iteration
2016-12-23 07:05:25 +00:00
WSO2 Builder
8d409a7248
[maven-release-plugin] prepare release v2.0.4
2016-12-23 07:00:40 +00:00
Ace
1d2a5dc9ef
Updating identity/auth-saml dependencies to latest
2016-12-22 10:58:59 +05:30
geethkokila
83b9fd46cd
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
2016-12-20 16:59:03 +05:30
Rasika Perera
a633547d19
IOTS-340: Fixing consumer key and consumer secret is null on api-mgt-ext
2016-12-20 13:03:19 +05:30
geethkokila
8ca28fa1fd
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
2016-12-19 13:47:27 +05:30
Rasika Perera
1465c56822
Revert "[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit f9b6939cb7
2016-12-19 12:39:56 +05:30
Ace
47d8baccf7
upgrading to latest version of identity
2016-12-19 11:38:03 +05:30
geethkokila
8e2432c47b
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
2016-12-19 10:04:18 +05:30
