WSO2 Builder
|
7d3025a25b
|
[WSO2 Release] [Jenkins #2280] [Release 2.0.61] prepare release v2.0.61
|
8 years ago |
ayyoob
|
cedb6cb798
|
fixed device stats loading page issue
|
8 years ago |
|
WSO2 Builder
|
a546355cf3
|
[WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
eb6b1db3fe
|
[WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare release v2.0.60
|
8 years ago |
Madawa Soysa
|
c4d0ca7134
|
Merge pull request #734 from madhawap/master
Removed commented lines
|
8 years ago |
madhawap
|
c4ba14376e
|
Removed commented lines
|
8 years ago |
|
WSO2 Builder
|
4797fc9600
|
[WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
896bc24f21
|
[WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare release v2.0.59
|
8 years ago |
|
WSO2 Builder
|
98991fe89b
|
[WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
8b31b93181
|
[WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare release v2.0.58
|
8 years ago |
|
WSO2 Builder
|
6fddf9c8d0
|
[WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
2f4051019c
|
[WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare release v2.0.57
|
8 years ago |
|
WSO2 Builder
|
80bf3c8fbd
|
[WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
2a7173c66d
|
[WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare release v2.0.56
|
8 years ago |
|
WSO2 Builder
|
95a80301e9
|
[WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
236db75700
|
[WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare release v2.0.55
|
8 years ago |
|
WSO2 Builder
|
43e76e4678
|
[WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
34865f0d25
|
[WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare release v2.0.54
|
8 years ago |
|
WSO2 Builder
|
3a9986d054
|
[WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
b53610ff8b
|
[WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare release v2.0.53
|
8 years ago |
|
WSO2 Builder
|
726422dc81
|
[WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
4bf6bf73cc
|
[WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare release v2.0.52
|
8 years ago |
|
WSO2 Builder
|
4429482a29
|
[WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
1bbd982e1f
|
[WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare release v2.0.51
|
8 years ago |
|
ayyoob
|
a3910908f8
|
fixed an issue in the logging
|
8 years ago |
|
ayyoob
|
018d875a84
|
removed temporary logs
(cherry picked from commit 615e44e)
|
8 years ago |
|
WSO2 Builder
|
52b0165275
|
[WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
ada2669ecf
|
[WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare release v2.0.50
|
8 years ago |
|
ayyoob
|
1e2ca17275
|
fixed few issues after testing
(cherry picked from commit 5b6d8d3)
|
8 years ago |
|
WSO2 Builder
|
543e603298
|
[WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
5010a3eebf
|
[WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare release v2.0.49
|
8 years ago |
|
WSO2 Builder
|
eb8ba53092
|
[WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
4764bff47e
|
[WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare release v2.0.48
|
8 years ago |
|
ayyoob
|
3df2912a6a
|
added default UI for realtime,batch, device view and type view
|
8 years ago |
|
ayyoob
|
2a89a2fb23
|
resolved issues in event management service
|
8 years ago |
|
ayyoob
|
f834001d22
|
merged with origin
|
8 years ago |
|
ayyoob
|
4ce8352690
|
added device event api
|
8 years ago |
|
WSO2 Builder
|
c1b5a649f6
|
[WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
6ccccb67b4
|
[WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare release v2.0.47
|
8 years ago |
Harshan Liyanage
|
0dc15324ad
|
Merge pull request #701 from amalhub/master
Merging Cloud updates to master
|
8 years ago |
Jasintha
|
e6b38fbdb4
|
Implemeting dynamic recivers and streams deployment into DAS
|
8 years ago |
|
WSO2 Builder
|
1ecb4edbd7
|
[WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
48a8f43cb3
|
[WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare release v2.0.46
|
8 years ago |
megala21
|
32ea2e52c4
|
Fixes https://github.com/wso2/product-iots/issues/373 and https://github.com/wso2/product-iots/issues/370
|
8 years ago |
|
WSO2 Builder
|
16d97d62be
|
[WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
8891784b99
|
[WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare release v2.0.45
|
8 years ago |
|
ayyoob
|
0e9bb7caf6
|
corrected operation definition
|
8 years ago |
|
ayyoob
|
c28f820455
|
added missing apis - operation and device management
|
8 years ago |
|
WSO2 Builder
|
f7d1a7cf99
|
[WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
4b85af950c
|
[WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare release v2.0.44
|
8 years ago |
|
WSO2 Builder
|
b9e614e383
|
[WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
d37951ef3f
|
[WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare release v2.0.43
|
8 years ago |
|
megala21
|
2360b338d8
|
Fixing the role creation problem
|
8 years ago |
|
WSO2 Builder
|
fc15f43b31
|
[WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
27b84bfc22
|
[WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare release v2.0.42
|
8 years ago |
|
WSO2 Builder
|
5496159f9d
|
[WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
ef94e90366
|
[WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare release v2.0.41
|
8 years ago |
|
megala21
|
2b92676191
|
Fixes https://github.com/wso2/product-iots/issues/346
|
8 years ago |
|
WSO2 Builder
|
a826370019
|
[WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
4654a4db45
|
[WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare release v2.0.40
|
8 years ago |
|
WSO2 Builder
|
8b7e458592
|
[WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
6297993560
|
[WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare release v2.0.39
|
8 years ago |
|
WSO2 Builder
|
802c83de39
|
[WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
98dda03784
|
[WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare release v2.0.38
|
8 years ago |
|
WSO2 Builder
|
f3e119cd78
|
[WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
a8f8a49a80
|
[WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare release v2.0.37
|
8 years ago |
|
WSO2 Builder
|
0e5895ec78
|
[WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
d6080159cb
|
[WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare release v2.0.36
|
8 years ago |
Amal Gunatilake
|
e9c2f3e72d
|
Merge branch 'master' into cloud-3.1.0
|
8 years ago |
|
WSO2 Builder
|
3f8f8b3ab9
|
[WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
6a9a5ba9c8
|
[WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35
|
8 years ago |
kamidu
|
cda0dd417f
|
fixing the role filtering api issues
|
8 years ago |
|
kamidu
|
73ab0a38bf
|
adding get location api witch was missing from previous emm versions
|
8 years ago |
|
kamidu
|
a6f5c002a9
|
adding get location api witch was missing from previous emm versions
|
8 years ago |
|
kamidu
|
a77794f81a
|
adding role filtering for device cloud via api
|
8 years ago |
|
kamidu
|
fc6c8e0290
|
adding get location api witch was missing from previous emm versions
|
8 years ago |
|
WSO2 Builder
|
e8ee33e7a4
|
[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
6cc898d2ab
|
[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare release v2.0.34
|
8 years ago |
|
WSO2 Builder
|
a26a4bb539
|
[WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
000601911f
|
[WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare release v2.0.33
|
8 years ago |
|
WSO2 Builder
|
50c9eb9ba4
|
[WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
ca79804c5c
|
[WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare release v2.0.32
|
8 years ago |
|
WSO2 Builder
|
a35205c480
|
[WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
ac379c9bf9
|
[WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare release v2.0.31
|
8 years ago |
|
WSO2 Builder
|
de25f3afe3
|
[WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
55ecafe7f4
|
[WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare release v2.0.30
|
8 years ago |
|
WSO2 Builder
|
15d57f71ad
|
[WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
3af9e1729a
|
[WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare release v2.0.29
|
8 years ago |
|
WSO2 Builder
|
322f39596e
|
[WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
18244d6c96
|
[WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare release v2.0.28
|
8 years ago |
|
WSO2 Builder
|
12f21868dc
|
[WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
4328c3c39d
|
[WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare release v2.0.27
|
8 years ago |
|
WSO2 Builder
|
c6bb8e0128
|
[WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
da9002ba9f
|
[WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare release v2.0.26
|
8 years ago |
|
WSO2 Builder
|
6114f4b2d5
|
[WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
ea8f19f26d
|
[WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare release v2.0.25
|
8 years ago |
|
WSO2 Builder
|
d433525145
|
[WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
35ee3eca3a
|
[WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare release v2.0.24
|
8 years ago |
|
WSO2 Builder
|
4e0afb7d39
|
[WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
33f1448c82
|
[WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare release v2.0.23
|
8 years ago |
|
WSO2 Builder
|
e95e96f06c
|
[WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
5d55413e02
|
[WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare release v2.0.22
|
8 years ago |
|
WSO2 Builder
|
ae3300afde
|
[WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
6646c0c56f
|
[WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare release v2.0.21
|
8 years ago |
|
WSO2 Builder
|
21cdcdd21a
|
[WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
23be60ebd0
|
[WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare release v2.0.20
|
8 years ago |
|
WSO2 Builder
|
7f98d37835
|
[WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
b03936ca49
|
[WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19
|
8 years ago |
|
WSO2 Builder
|
82888e1d20
|
[WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
b11c2e451b
|
[WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18
|
8 years ago |
|
WSO2 Builder
|
67a091ff5a
|
[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
dcc2088455
|
[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17
|
8 years ago |
lakshani
|
eb12e5b9f1
|
Adding commit 'added java doc comments'
|
8 years ago |
|
lakshani
|
3f90b403c0
|
Adding lakshani's commit 'updated device status button'
|
8 years ago |
|
WSO2 Builder
|
927b2d451d
|
[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
dfe9b1ff9c
|
[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16
|
8 years ago |
charitha
|
d2991585aa
|
Applying charithas commit on IOTS-436
|
8 years ago |
|
ayyoob
|
87910bc92b
|
transferred mutual authenticator to jwt authenticator
|
8 years ago |
|
ayyoob
|
b7566f4e4a
|
added artifact deployment support through UI
|
8 years ago |
|
ayyoob
|
0999bb70a0
|
exposed artefact deployment through api
Merged Jasintha’s code
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
559fe98cc9
|
Merge pull request #585 from wso2/master
Cloud ui fixes and the new master fixes
|
8 years ago |
|
WSO2 Builder
|
54a278a1bc
|
[WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
3bc46c4d2d
|
[WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15
|
8 years ago |
|
WSO2 Builder
|
1bc8f5c28d
|
[WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
1483503790
|
[WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14
|
8 years ago |
Hasunie
|
54d0d7a5ee
|
Merge pull request #582 from charithag/master-update-swagger-docs
Update swagger docs
|
8 years ago |
Milan Perera
|
a5f41ef734
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
|
8 years ago |
|
charitha
|
8e01a98ded
|
Removed unused Dashboard API
|
8 years ago |
|
charitha
|
423879bee7
|
Updated swagger docs
|
8 years ago |
|
charitha
|
3cf797fba6
|
Removed hardcoded device types in swagger docs
|
8 years ago |
|
WSO2 Builder
|
5dc55bb5b5
|
[WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
c7fe9c3a20
|
[WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13
|
8 years ago |
|
lakshani
|
26f2e2d2ae
|
added role query param to getdevices restapis
|
8 years ago |
|
WSO2 Builder
|
c17bead1fc
|
[WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
14100d3cc8
|
[WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12
|
8 years ago |
GPrathap
|
47e6f6d292
|
adding username as parameter
|
8 years ago |
|
ayyoob
|
b42505c1fe
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
|
8 years ago |
|
WSO2 Builder
|
cd7e0feaa6
|
[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
abb150d9bd
|
[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11
|
8 years ago |
|
ayyoob
|
3423ef025d
|
merged with upstream
|
8 years ago |
|
ayyoob
|
e74b4e23c4
|
removed apim dependency from cdmf
|
8 years ago |
|
WSO2 Builder
|
002fb8719b
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
04f32902fd
|
[maven-release-plugin] prepare release v2.0.10
|
8 years ago |
Rasika Perera
|
704680d68d
|
Fixing null pointer when roles are not specified on creating new user
|
8 years ago |
|
Rasika Perera
|
d723e22a8c
|
Fixed roleUpdate issue
|
8 years ago |
|
WSO2 Builder
|
5c207897ad
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
233d14edbd
|
[maven-release-plugin] prepare release v2.0.9
|
8 years ago |
|
Rasika Perera
|
8e6855a203
|
Adding DEFAULT_DEVICE_USER on adding user
|
8 years ago |
|
WSO2 Builder
|
eedecf00ed
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
ef57fc463b
|
[maven-release-plugin] prepare release v2.0.8
|
8 years ago |
sameera910409
|
1bec5e5186
|
fixed user password reset failure issue in iot console
|
8 years ago |
Maninda
|
1f5448c2a0
|
Corrected the caching filter pattern
|
8 years ago |
|
Maninda
|
8aed7c67a9
|
Added devicemgt web app configs to secure web app
|
8 years ago |
|
WSO2 Builder
|
585b9bde4d
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
d206148841
|
[maven-release-plugin] prepare release v2.0.7
|
8 years ago |
|
ayyoob
|
671d931d3e
|
merged with origin after resolving conflicts
|
8 years ago |
|
Rasika Perera
|
f57de670ea
|
Adding devices:update into /devices scopes list
|
8 years ago |
|
Rasika Perera
|
e11d2244f5
|
Fixing scope annotation /enrollment-invite
|
8 years ago |
|
Rasika Perera
|
63cb0e1fde
|
Adding swagger annotations and scope for /effective-policy
|
8 years ago |
|
ayyoob
|
cdd144237f
|
removed unused parameter
|
8 years ago |
|
ayyoob
|
2fbaf31b93
|
fixed permission and assigned environment variables for url context
|
8 years ago |
Rasika Perera
|
8311828c5d
|
Merge pull request #537 from ayyoob/release-2.0.x
updated ui config
|
8 years ago |
|
Rasika Perera
|
ef2a1b84a2
|
IOTS-376 : Fixing cannot delete a device
|
8 years ago |
kamidu
|
4588cfbed4
|
Fixing the permission management issue in EMM console
|
8 years ago |
Ace
|
643acd7827
|
Adding api for renaming devices
|
8 years ago |
|
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
|
8 years ago |
|
WSO2 Builder
|
5411d93103
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
3ea83b925a
|
[maven-release-plugin] prepare release v2.0.6
|
8 years ago |
Milan Perera
|
228848075c
|
Fixed conflicts and merged
|
8 years ago |
|
Milan Perera
|
637c014866
|
Refactored scope strings
|
8 years ago |
|
Milan Perera
|
157ef998a6
|
Resolved conflicts and merged
|
8 years ago |
|
Milan Perera
|
e0ee2fc1e5
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
ayyoob
|
b20a2e0997
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
GPrathap
|
5d1435c7bc
|
renamed permission string
|
8 years ago |
|
Milan Perera
|
2a4a636eb4
|
Resolved conflicts and merged
|
8 years ago |
|
Milan Perera
|
d13dadff08
|
Renamed prefix of scopes
|
8 years ago |
|
GPrathap
|
0bd7b90e9a
|
added scope annotation
|
8 years ago |
|
ayyoob
|
db2ddc7bed
|
policy manager refactored to support tenancy
|
8 years ago |
|
Maninda
|
0fb5a577b8
|
Fixed some issues found in FindBugs security analysis.
|
8 years ago |
|
Milan Perera
|
b860be0150
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
charitha
|
295921b289
|
Fixed following issues:
https://wso2.org/jira/browse/IOTS-218
https://wso2.org/jira/browse/IOTS-236
https://wso2.org/jira/browse/IOTS-263
https://wso2.org/jira/browse/IOTS-173
|
8 years ago |
|
Milan Perera
|
02d75b757c
|
Fixed conflicts and merged
|
8 years ago |
|
WSO2 Builder
|
6aea6195e9
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
3db5b289ac
|
[maven-release-plugin] prepare release v2.0.5
|
8 years ago |
|
Rasika Perera
|
acb2c38799
|
Fixing user is not authorized to view devices
|
8 years ago |
|
WSO2 Builder
|
ed47094964
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
8d409a7248
|
[maven-release-plugin] prepare release v2.0.4
|
8 years ago |
|
charitha
|
1a93868424
|
Fixed https://wso2.org/jira/browse/IOTS-335
|
8 years ago |
|
Ace
|
674048ab27
|
Coorecting version import ranges
|
8 years ago |
|
Ruwan
|
46c3b015fa
|
Merge pull request #498 from charithag/release-2.0.x-email-invites
Release 2.0.x email invites
|
8 years ago |
Charitha Goonetilleke
|
5318601df0
|
Add license header
|
8 years ago |
|
charitha
|
2b1d46f45f
|
Finalized enrollment invitations
|
8 years ago |
|
Ace
|
64da9479a1
|
Bumping identity dependencies
|
8 years ago |
|
Ace
|
1d2a5dc9ef
|
Updating identity/auth-saml dependencies to latest
|
8 years ago |
|
charitha
|
795ccb740c
|
Add backend support for enrollment invitations
|
8 years ago |
Supun94
|
09572a9977
|
Removed redundant classes
|
8 years ago |
|
Supun94
|
eb1575126f
|
Minor refactoring on policy merging
|
8 years ago |
|
Supun94
|
33b79dcbba
|
Adding effective policy service
|
8 years ago |
|
Rasika Perera
|
1465c56822
|
Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4"
This reverts commit f9b6939cb7.
|
8 years ago |
|
Ace
|
47d8baccf7
|
upgrading to latest version of identity
|
8 years ago |
