WSO2 Builder
997affda65
[WSO2 Release] [Jenkins #2401 ] [Release 3.0.11] prepare release v3.0.11
8 years ago
WSO2 Builder
e23ef52e61
[maven-release-plugin]prepare for next development iteration
8 years ago
WSO2 Builder
c333f28461
[maven-release-plugin]prepare release v3.0.10
8 years ago
Madhawa Perera
25aaf92641
Merge pull request #810 from sinthuja/master
...
Updating source/target versions to jdk 1.8.
8 years ago
sinthuja
fce84b9942
Updating source/target versions to jdk 1.8.
8 years ago
Harshan Liyanage
188c80f52a
Merge pull request #808 from hasuniea/master
...
Fixing issue wso2/product-iot#527
8 years ago
Hasunie
9206f74790
Fixing issue wso2/product-iot##527
8 years ago
WSO2 Builder
27e494f153
[WSO2 Release] [Jenkins #2393 ] [Release 3.0.9] prepare for next development iteration
8 years ago
WSO2 Builder
21ab65e6d5
[WSO2 Release] [Jenkins #2393 ] [Release 3.0.9] prepare release v3.0.9
8 years ago
WSO2 Builder
54d25522ba
[WSO2 Release] [Jenkins #2390 ] [Release 3.0.8] prepare for next development iteration
8 years ago
WSO2 Builder
69b168f3b2
[WSO2 Release] [Jenkins #2390 ] [Release 3.0.8] prepare release v3.0.8
8 years ago
ayyoob
d70cea2e46
fixed commit issues
8 years ago
ayyoob
536d100fd6
fixed comment issues
8 years ago
ayyoob
abacc0ce2a
fixed comment issues
8 years ago
ayyoob
2dab109ad3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
Ace
ac01fef7be
Adding import enhancements
8 years ago
Ace
dcbffac198
Adding fixes for https://github.com/wso2/product-iots/issues/997
8 years ago
ayyoob
6c041c7b6a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
Rasika Perera
fc4576082c
Changing artifact uploader admin service resource path
8 years ago
ayyoob
80cc690a42
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
WSO2 Builder
68cb8d3f81
[WSO2 Release] [Jenkins #2380 ] [Release 3.0.7] prepare for next development iteration
8 years ago
WSO2 Builder
d0f52c48ef
[WSO2 Release] [Jenkins #2380 ] [Release 3.0.7] prepare release v3.0.7
8 years ago
Geeth
3deffa99dd
Merge pull request #790 from dunithd/master
...
Adding an API method to retrieve an activity by it's ID and a device ID
8 years ago
WSO2 Builder
2896b55f5e
[WSO2 Release] [Jenkins #2378 ] [Release 3.0.6] prepare for next development iteration
8 years ago
WSO2 Builder
bdb57383b1
[WSO2 Release] [Jenkins #2378 ] [Release 3.0.6] prepare release v3.0.6
8 years ago
dunithd
4cf3e2d421
Adding an API method to retrieve an activity by it's ID and a device ID
8 years ago
WSO2 Builder
8badc2bc37
[WSO2 Release] [Jenkins #2375 ] [Release 3.0.5] prepare for next development iteration
8 years ago
WSO2 Builder
43182aede9
[WSO2 Release] [Jenkins #2375 ] [Release 3.0.5] prepare release v3.0.5
8 years ago
WSO2 Builder
f70535ed20
[WSO2 Release] [Jenkins #2373 ] [Release 3.0.4] prepare for next development iteration
8 years ago
WSO2 Builder
c3d154ee65
[WSO2 Release] [Jenkins #2373 ] [Release 3.0.4] prepare release v3.0.4
8 years ago
Harshan Liyanage
a21c374b00
Code refactoring.
8 years ago
Harshan Liyanage
074ceeb0c7
Merged with master
8 years ago
Harshan Liyanage
967efa1fee
Fixed user enrolled device showing problem which resolves wso2/product-iots#406
8 years ago
ayyoob
3b7d4d8966
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
ca33f035df
merge ui fixes
8 years ago
Ayyoob Hamza
2875fb2ca0
Merge pull request #755 from rasika/geo-fencing
...
Added Geo Service into Device Mgt Core
8 years ago
WSO2 Builder
e924a86d73
[WSO2 Release] [Jenkins #2368 ] [Release 3.0.3] prepare for next development iteration
8 years ago
WSO2 Builder
b35aaab992
[WSO2 Release] [Jenkins #2368 ] [Release 3.0.3] prepare release v3.0.3
8 years ago
Rasika Perera
8da1f62cd9
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
8 years ago
WSO2 Builder
2b76317f40
[WSO2 Release] [Jenkins #2366 ] [Release 3.0.2] prepare for next development iteration
8 years ago
WSO2 Builder
02bc10e6d2
[WSO2 Release] [Jenkins #2366 ] [Release 3.0.2] prepare release v3.0.2
8 years ago
ayyoob
f47d0deb1a
few changes after testing.
8 years ago
WSO2 Builder
1e58f762da
[WSO2 Release] [Jenkins #2365 ] [Release 3.0.1] prepare for next development iteration
8 years ago
WSO2 Builder
bae931f3c5
[WSO2 Release] [Jenkins #2365 ] [Release 3.0.1] prepare release v3.0.1
8 years ago
ayyoob
0d08c42f5e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
WSO2 Builder
69d2cff7bd
[WSO2 Release] [Jenkins #2363 ] [Release 3.0.0] prepare for next development iteration
8 years ago
WSO2 Builder
3795011895
[WSO2 Release] [Jenkins #2363 ] [Release 3.0.0] prepare release v3.0.0
8 years ago
ayyoob
07bdd5cb6c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
da68f8fac1
fixed on config operation flow
8 years ago
Rasika Perera
798e551673
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
8 years ago
WSO2 Builder
16420433b5
[WSO2 Release] [Jenkins #2352 ] [Release 2.0.75] prepare for next development iteration
8 years ago
WSO2 Builder
5c06b9dcb2
[WSO2 Release] [Jenkins #2352 ] [Release 2.0.75] prepare release v2.0.75
8 years ago
Rasika Perera
ce6ab9b354
Refactoring "executionPlanType" -> "alertType"
8 years ago
Rasika Perera
6d02075a99
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
8 years ago
ayyoob
22a4716443
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
WSO2 Builder
8927158086
[WSO2 Release] [Jenkins #2346 ] [Release 2.0.74] prepare for next development iteration
8 years ago
WSO2 Builder
28423c45bc
[WSO2 Release] [Jenkins #2346 ] [Release 2.0.74] prepare release v2.0.74
8 years ago
ayyoob
6c7f911cbc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
...
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
8 years ago
ayyoob
7ab52af66e
add http pushnotification
8 years ago
Harshan Liyanage
a30982207b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Harshan Liyanage
3766ba0349
Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991
8 years ago
WSO2 Builder
e3dfbdfdbd
[WSO2 Release] [Jenkins #2342 ] [Release 2.0.73] prepare for next development iteration
8 years ago
WSO2 Builder
598332b640
[WSO2 Release] [Jenkins #2342 ] [Release 2.0.73] prepare release v2.0.73
8 years ago
inoshperera
9f9208cebc
adding default values for timestamp
8 years ago
Rasika Perera
05b11a5099
Adding Exit Alerts feature
8 years ago
WSO2 Builder
73fa026eeb
[WSO2 Release] [Jenkins #2340 ] [Release 2.0.72] prepare for next development iteration
8 years ago
WSO2 Builder
2415762ccb
[WSO2 Release] [Jenkins #2340 ] [Release 2.0.72] prepare release v2.0.72
8 years ago
ayyoob
f3393080ba
fixed few issues after testing
8 years ago
Rasika Perera
ec343cef1a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
8 years ago
Rasika Perera
886eaec271
Geo service alerts history method added
8 years ago
ayyoob
194e4d99b5
added policy compliance support
8 years ago
ayyoob
5b46dc03a5
few fixes on event reciever definition
8 years ago
ayyoob
7cba43ccbb
few changes after testing HTTP and MQTT flow
8 years ago
ayyoob
a7ebc96cb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
a1b20f1663
changed response payload definition for pull notification
8 years ago
WSO2 Builder
39a7037821
[WSO2 Release] [Jenkins #2334 ] [Release 2.0.71] prepare for next development iteration
8 years ago
WSO2 Builder
22782ec125
[WSO2 Release] [Jenkins #2334 ] [Release 2.0.71] prepare release v2.0.71
8 years ago
ayyoob
04b8b74e4f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
a0d7518cbe
Implemented Pull Notification Support
8 years ago
WSO2 Builder
c7fd70145d
[WSO2 Release] [Jenkins #2331 ] [Release 2.0.70] prepare for next development iteration
8 years ago
WSO2 Builder
0c9d104401
[WSO2 Release] [Jenkins #2331 ] [Release 2.0.70] prepare release v2.0.70
8 years ago
Rasika Perera
0a8929c7ee
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
8 years ago
WSO2 Builder
69a63baa43
[WSO2 Release] [Jenkins #2328 ] [Release 2.0.69] prepare for next development iteration
8 years ago
WSO2 Builder
713b948ea9
[WSO2 Release] [Jenkins #2328 ] [Release 2.0.69] prepare release v2.0.69
8 years ago
madhawap
c4d433a1a0
Fix for disabling reboot and upgrade-firmware operations on UI and Code formatting
...
In order to execute these two operations the enrolled device needs to have the system app installed. Therefore, in order to stop users from trying these two operations on cloud, the icons related to these two operations, on operation bar are disabled. In addition change a c-style for loop to a foreach loop in PolicyManagementServiceImpl.java
8 years ago
Rasika Perera
ea3ed9c444
Added Geo Service into Device Mgt Core
8 years ago
ayyoob
c3f23fa564
fixed multi tenant issues after testing custom device type impl
8 years ago
ayyoob
56faa75861
fixed analytics issues
8 years ago
ayyoob
75d6813d8a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
5acf5912e4
added comment
8 years ago
ayyoob
a037f91f56
removed task Config from template
8 years ago
ayyoob
4d22bc7064
fixed UI Issues
8 years ago
WSO2 Builder
7e83b53bb4
[WSO2 Release] [Jenkins #2314 ] [Release 2.0.68] prepare for next development iteration
8 years ago
WSO2 Builder
768073ea51
[WSO2 Release] [Jenkins #2314 ] [Release 2.0.68] prepare release v2.0.68
8 years ago
ayyoob
dd1c2e4338
Added few fixes after testing and added default UI for device type management
8 years ago
ayyoob
f945da194d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
abc9315f95
Added Pluggable Device Type
8 years ago
WSO2 Builder
88bab85750
[WSO2 Release] [Jenkins #2308 ] [Release 2.0.67] prepare for next development iteration
8 years ago
WSO2 Builder
4e506a547e
[WSO2 Release] [Jenkins #2308 ] [Release 2.0.67] prepare release v2.0.67
8 years ago
WSO2 Builder
3092423d4d
[WSO2 Release] [Jenkins #2305 ] [Release 2.0.66] prepare for next development iteration
8 years ago
WSO2 Builder
e21520392c
[WSO2 Release] [Jenkins #2305 ] [Release 2.0.66] prepare release v2.0.66
8 years ago
Megala Uthayakumar
8830d627e9
Merge pull request #747 from sinthuja/master
...
Fixing some issues reported for product-iots.
8 years ago
WSO2 Builder
d4baa72328
[WSO2 Release] [Jenkins #2300 ] [Release 2.0.65] prepare for next development iteration
8 years ago
WSO2 Builder
7b549f623d
[WSO2 Release] [Jenkins #2300 ] [Release 2.0.65] prepare release v2.0.65
8 years ago
sinthuja
4df590caa1
Fixing https://github.com/wso2/product-iots/issues/447 .
8 years ago
ayyoob
fbb5f5ae88
merged with origin
8 years ago
WSO2 Builder
84d305dcd4
[WSO2 Release] [Jenkins #2293 ] [Release 2.0.64] prepare for next development iteration
8 years ago
WSO2 Builder
3bf945fe95
[WSO2 Release] [Jenkins #2293 ] [Release 2.0.64] prepare release v2.0.64
8 years ago
ayyoob
d2d7be6fd6
fixed tenant related issue for mqtt push notification and stream artifact publishing
8 years ago
ayyoob
035403495c
made default stat permission as constant
8 years ago
ayyoob
483d09ebf1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into new-master
8 years ago
WSO2 Builder
f7300645a5
[WSO2 Release] [Jenkins #2289 ] [Release 2.0.63] prepare for next development iteration
8 years ago
WSO2 Builder
ca83609703
[WSO2 Release] [Jenkins #2289 ] [Release 2.0.63] prepare release v2.0.63
8 years ago
ayyoob
b36ff4b874
added a authorisation resource for stat
8 years ago
ayyoob
77ceed5368
renamed device type publisher service to DeviceAnalyticsArtifactUploaderAdminService
8 years ago
WSO2 Builder
964eae6f92
[WSO2 Release] [Jenkins #2285 ] [Release 2.0.62] prepare for next development iteration
8 years ago
WSO2 Builder
31f91f80b9
[WSO2 Release] [Jenkins #2285 ] [Release 2.0.62] prepare release v2.0.62
8 years ago
WSO2 Builder
639eeb225a
[WSO2 Release] [Jenkins #2280 ] [Release 2.0.61] prepare for next development iteration
8 years ago
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
WSO2 Builder
f9b6939cb7
[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4
8 years ago
Rasika Perera
42930fe8c4
Revert "[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit 78b9052c37
.
8 years ago
Harshan Liyanage
a2a03a523e
Refactored RoleMgtServiceImpl.
8 years ago
Harshan Liyanage
de2f85de2e
IOTS-337:Fixed permission remove issue when updating role permissions.
8 years ago
WSO2 Builder
78b9052c37
[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4
8 years ago
Milan Perera
bcbf61a886
Fixed conflicts
8 years ago
Milan Perera
36ee55f493
Implemented permission-scope mapping for IoTs
8 years ago
Milan Perera
dd353e1bfb
Commiting permission-scope mapping improvements
8 years ago
WSO2 Builder
a59edee410
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
8f9b21b41b
[maven-release-plugin] prepare release v2.0.3
8 years ago
geethkokila
d911281ad1
Merging master branch with release-2.0.x
8 years ago
WSO2 Builder
228b24ca79
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
5dbb258f55
[maven-release-plugin] prepare release v2.0.2
8 years ago
Madawa Soysa
c61cd484a0
IOTS-296: Adding group selection capability when adding a policy
...
This commit introduces the device group select capabilty and saving the policy when creating and editing policies.
8 years ago
WSO2 Builder
8431b30ddc
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
ae2e283f14
[maven-release-plugin] prepare release v2.0.1
8 years ago
Rasika Perera
aaade2363c
Adding new api to create combined roles
8 years ago
charitha
a2db592d69
Updated group management APIs and service
8 years ago
charitha
726bbcd35d
Merged with upstream
8 years ago
charitha
c07d77b85d
Updated group sharing model
8 years ago
ayyoob
ec3dbd37dd
fixed commit comments
8 years ago
ayyoob
e3849ef21e
removed feature lifecycle implementation
8 years ago
ayyoob
3fb42ef32e
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ayyoob
fede8ec409
few changes after testing with authoriser
8 years ago
GPrathap
6efc5bc1ed
removed @API and @Permission annotations
8 years ago
ayyoob
fe263efe60
changed device access verification approach
8 years ago
ayyoob
28faf53802
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ayyoob
59e2a33e4a
exposed device access authorisation as a service
8 years ago
WSO2 Builder
19c1b3566d
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
cff6e242c8
[maven-release-plugin] prepare release v2.0.0
8 years ago
charitha
a6064d2561
Update component versions for IoTS-1.0.0 release
8 years ago
sameera910409
02eec1033e
add group sharing role create functionality
8 years ago
charitha
4a115e5d3f
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
charitha
ac30e7eb3e
Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
8 years ago
WSO2 Builder
9517a3d30f
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
a8568299b9
[maven-release-plugin] prepare release v1.2.6
8 years ago
sameera910409
f8f7dd08cd
fixed share groups and group analytics in device grouping
8 years ago
Kamidu Sachith Punchihewa
33874f95b6
Merge pull request #399 from saadsahibjan/master
...
Fix incorrect spacing
8 years ago
sameera910409
204a0ed943
fixes for the comments of the PR#404
8 years ago
sameera910409
41f367abfa
add group listing and group device listing fixes
8 years ago
charitha
5f68953b11
Merge branch 'master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
8 years ago
Harshan Liyanage
f961b57f9f
EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.
8 years ago
Saad Sahibjan
1cb969eb6d
Fix incorrect spacing
8 years ago
WSO2 Builder
27a2c9b979
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
eae935f91c
[maven-release-plugin] prepare release v1.2.5
8 years ago
Kamidu Sachith Punchihewa
7666bbfd05
Merge pull request #395 from Megala21/master
...
Fixing EMM-1752 and EMM-1755
8 years ago
WSO2 Builder
6a55e1be83
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
11c2e59f61
[maven-release-plugin] prepare release v1.2.4
8 years ago
Megala
3416ae78c4
Fixing the problems in displaying user list when the user names has special chracters
8 years ago
Megala
1ff86289fd
Fixing the problems that happend when we have special chracters in roles
8 years ago
Megala
4ec6883ec8
Merge remote-tracking branch 'upstream/master'
8 years ago
Megala
4a71be850c
Refactoring code
8 years ago
Shavindri
28cb653b06
Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.
8 years ago
Megala
a04f91cddb
Fixing issues related to mapping users and roles from different user stores
8 years ago
Megala
87150f5074
Fixing secondary role deletion
8 years ago
Megala
0756294724
Merge remote-tracking branch 'upstream/master'
8 years ago
Megala
d8555c34ab
Fixing issues related with roles of secondary user store
8 years ago
Kamidu Sachith Punchihewa
cce4428a9d
Merge pull request #390 from shavidissa/master
...
Removed the GroupManagementService and GroupManagementAdminService references from the APIs and continued adding swagger annotations
8 years ago
Shavindri
c64581dc59
Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex
8 years ago
susinda
eb20d1fc1c
Device delete implemented (only in api level) for iot
8 years ago
charitha
528687bde3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
0498c68ca5
Add validation to maximum limit value
...
(cherry picked from commit 4ed757f)
8 years ago
Megala
4999b84169
Reformatting code
8 years ago
Megala
5b96e1b849
Fixing EMM-1333
8 years ago
Kamidu Sachith Punchihewa
af4989e56d
Merge pull request #384 from shavidissa/master
...
swagger annotations and definition update continued for device type, …
8 years ago
Shavindri
1e32d5f89f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Shavindri
0842dcb2bb
swagger annotations and definition update continued for device type, device, policy, role, user, group and user management.
8 years ago
ayyoob
93c1725e32
fixed api name for device type
8 years ago
charitha
e53b0c3860
Fix group count listing in dashboard
8 years ago
charitha
670ca7c228
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
8 years ago
ayyoob
5727886ea1
few changes after apimgt integration
8 years ago
charitha
94a50584f4
Improve group listing with pagination
8 years ago
madhawap
16b334b0b3
changes to swagger SecurityDefinitionConfigurator and annotations
8 years ago
madhawap
7b8518a9db
changes to swagger SecurityDefinitionConfigurator and annotations
8 years ago
charitha
ce5d63925a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
e89b4015b6
Introduced pagination
8 years ago
Kamidu Sachith Punchihewa
06e70c8326
Merge pull request #373 from shavidissa/master
...
swagger annotations and definitions changes for role management, configuration management and application management(admin)
8 years ago
Shavindri
f0164b5a01
swagger annotations and definitions changes for role management, configuration management and application management(admin)
8 years ago
charitha
06176898d0
Exposed group id to API level
8 years ago
Megala
e77d8b8b29
Adding isEmpty check
8 years ago
Megala
0642cc10d7
Reformatting code
8 years ago
Megala
f9204add08
Merge remote-tracking branch 'upstream/master'
8 years ago
charitha
f22d392978
Upgrade to comply with latest CDMF changes
8 years ago
Megala
b7990b9146
Fixing problems in retriveing data from secondary user store
8 years ago
dilanua
dff32af832
Adding initial swagger annotations and permissions to Dashboard APIs
8 years ago
dilanua
1ca5762c44
Uncommenting Dashboard APIs
8 years ago
charitha
a0050d8f4d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
d1d6eefd17
Upgrading grouping backend
8 years ago
harshanl
a4538a6d6c
Removed unnecessary params from paginated queries
8 years ago
harshanl
befb5b0ad8
EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password.
8 years ago
Chatura Dilan Perera
c16cc4cae1
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
ed4bca7032
[maven-release-plugin] prepare release v1.2.2
8 years ago
Rasika Perera
b2eb715fb7
REsolving conflicts
8 years ago
Rasika Perera
5c8c28d28c
Merge pull request #1 from warunalakshitha/master
...
upgrade product iot to carbon 4.4.9
8 years ago
Rasika Perera
237b9a7078
Creating api endpoint to retrieve features of a device-type
8 years ago
amalhub
428ce25b6f
Fixing issue: https://wso2.org/jira/browse/EMM-1646
8 years ago
Rasika Perera
a61be7a7ec
Enable group management api
8 years ago
Ace
154a6082ce
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
...
# Conflicts:
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
8 years ago
Chatura Dilan Perera
7395c76408
Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
Ace
33d8829540
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
8 years ago
dilanua
d8e057abdd
Fix for JIRA: https://wso2.org/jira/browse/EMM-1582
8 years ago
Ace
87ad1e0e71
Fixing intermittent jackson bind issue
8 years ago
Chatura Dilan Perera
50d8885f8b
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
a00d6aafd4
[maven-release-plugin] prepare release v1.2.1
8 years ago
harshanl
75df243a33
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Ace
6a8a5cbd5a
Merging with master
8 years ago
harshanl
4169d3b2bd
Fixed EMM-1554
8 years ago
dilanua
713c8ac4d8
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
8 years ago
dilanua
58f8656e94
Changing permissions - /devices/owning to /devices/owning-device
8 years ago
harshanl
78cab76101
Fixed EMM-1531
8 years ago
Ace
1dfb8e22e1
Updating to latest appm/apim/identity dependencies
8 years ago
Chatura Dilan Perera
de23a8cf27
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
8905fae0d9
[maven-release-plugin] prepare release v1.2.0
8 years ago
harshanl
0eaf33aa5c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl
87a5b09266
Added users/count API
8 years ago
thusithakalugamage
0d02e88955
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
kamidu
0fdcbae817
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
878daae5c5
Permission modifications
8 years ago
Chatura Dilan Perera
2d5262e21e
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
5ccd752404
[maven-release-plugin] prepare release v1.2.0
8 years ago
harshanl
7dc93ff010
MSSQL script fixes and added the /users/count REST API
8 years ago
mharindu
115099c8fe
Implemented permission based authorization
8 years ago
dilanua
d24ba98643
Updating activate and deactivate policy endpoints from PUT to POST
8 years ago
charitha
3575c9a33d
Fix issue in get devices with since parameter.
8 years ago
Chatura Dilan Perera
f29b9e84f2
Fixed 200 returns when activities are empty and since is a future date
8 years ago
Chatura Dilan Perera
9aa5f2793f
return date format as UTC in APIs
8 years ago
Chatura Dilan Perera
475b832c59
Changed return date format to UTC date
8 years ago
charitha
0fe827ca9f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
9246cdcf30
Return empty array when results not found with since parameter
8 years ago
Saad Sahibjan
a72b47f6f7
Fixing incorrect response for remove policy
8 years ago
harshanl
f3aefcca77
Fixed EMM-1450
8 years ago
Chatura Dilan Perera
8b17cbb339
Fix conflicts
8 years ago
Chatura Dilan Perera
654e1d9938
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
aa24821667
[maven-release-plugin] prepare release v1.1.2
8 years ago
harshanl
67942d5c1d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
6b4ab635af
Fixing jiras: EMM-1472, EMM-1505
8 years ago
harshanl
2cb8f0b313
Fixed EMM-1392
8 years ago
Ruwan
6134f94e3c
Merge pull request #332 from ayyoob/com
...
fixing commit issues
8 years ago
hasuniea
282f53bf09
Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3
8 years ago
hasuniea
c269f35ef2
fixing getAllActivity H2 issue
8 years ago
mharindu
7346313d27
Modified scope management service
8 years ago
ayyoob
442c2b86da
fixed formatting issues
8 years ago
harshanl
a7d7c689e8
Removed unsupported roleName parameter from device API
8 years ago
ayyoob
3b56668af0
merged with upstream
8 years ago
madhawap
ecfe94235f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
madhawap
c6cc5e8df3
fixes to role updating endpoint
8 years ago
ayyoob
3edc68d204
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com
8 years ago
ayyoob
058f9e4cfa
merged with origin
8 years ago
harshanl
e80c2f4050
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
352643a421
Changing deactivate-policy api method to PUT
8 years ago
harshanl
34e97aeeae
Removed device search using roleName parameter.
8 years ago
mharindu
5bdb4630af
Fixed conflicts and merged
9 years ago
mharindu
886e2e08f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
mharindu
2e79dd290e
Modified scopes
9 years ago
hasuniea
1b07b18678
adding security fixes
9 years ago
harshanl
657e4864fb
Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
9 years ago
mharindu
ed4c762bfd
Refactored scopes
9 years ago
ayyoob
a7074e2e4e
refactored general configuration
9 years ago
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
9 years ago
mharindu
eb5216091e
Fixed conflicts and merged
9 years ago
harshanl
6cc1bb088c
Fixed EMM-1447, EMM-1424
9 years ago
mharindu
6e742ee6ac
Added scope beans
9 years ago
mharindu
564c2b280e
Fixed conflicts and merged
9 years ago
Chatura Dilan
7af8ecc686
Added userstore for role listing
9 years ago
mharindu
b3d309583d
Fixed issues in scope service
9 years ago
mharindu
7f1e2fdf0b
Implemented scope management service
9 years ago
mharindu
bdec8880bb
Fixed conflicts and merged
9 years ago
mharindu
186432e1df
Fixed webapp name resolving issue
9 years ago
Timo Briddigkeit
ed07774552
Fixed literal string comparison.
...
This line is in the form of
String str = ...
str.equals("someOtherString");
//or
str.compareTo("someOtherString");
A NullPointerException may occur if the String variable str is null. If instead the code was restructured to
String str = ...
"someOtherString".equals(str);
//or
"someOtherString".compareTo(str);
that is, call equals() or compareTo() on the string literal, passing the variable as an argument, this exception could never happen as both equals() and compareTo() check for null.
9 years ago
Timo Briddigkeit
90910518d6
Fixed null pointer dereferences
9 years ago
Timo Briddigkeit
09020ccb9f
Fixed predictable pseudorandom number generator
9 years ago
mharindu
99664b23c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
Dilan U. Ariyaratne
ab5aa3e31c
Merge pull request #315 from madhawap/master
...
Added missing end-point to the permissions.xml
9 years ago
madhawap
0b338a1d25
Added missing end-point to the permissions.xml
9 years ago
mharindu
789086a667
Changed context paths
9 years ago
mharindu
0f904e21d8
Fixed conflicts and merged
9 years ago
Chatura Dilan
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
9 years ago
Chatura Dilan
ffedcac543
[maven-release-plugin] prepare release v1.1.1
9 years ago
mharindu
79a6da82f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu
c7eef634ac
Added send-invitation endpoint
9 years ago
dilanua
c61ef1c98e
Fixing issues of GET /compliance-data API
9 years ago
Ace
58666bc4b0
Adding device name url param for device search
9 years ago
madhawap
c3cbc5b4fb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap
0b1e4ad86b
Updated permissions.xml according to new end-points
9 years ago
Ace
d58fb57f4e
Enabling device search for multiple params
9 years ago
madhawap
e52fed0b2d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap
34354c032e
Added end-point to get devices enrolled under a specific user
9 years ago
prabathabey
6edfad5fb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
9 years ago
Dilan U. Ariyaratne
73551590b9
Merge pull request #313 from madhawap/master
...
Added end point to get Compliance Data Of a Device
9 years ago
madhawap
09e2d2ecaf
Removing the internal status code added to the compliance data wrapper
9 years ago
madhawap
68b7d304a0
Added end point to get Compliance Data Of a Device
9 years ago
prabathabey
0125310440
Prepending the url template configured for updating notifications with a '/'
9 years ago
prabathabey
78057b2992
Adding an API to return the list of device types registered in the underlying device management platform
9 years ago
mharindu
aa6085ac8c
Added scopes to APIs
9 years ago
mharindu
ff82accb48
added scopes to notification API
9 years ago
mharindu
60659ce15b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
mharindu
fe28bc25f1
Refactored scopes
9 years ago
madhawap
2136ebbeee
changes to 'updateNotificationStatus' swagger annotations
9 years ago
mharindu
ac75ff1d71
Fixed conflict and merged
9 years ago
mharindu
49623a4693
Implemented scope based authorization
9 years ago
madhawap
b55a164457
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
9 years ago
madhawap
dbf938416b
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
9 years ago
prabathabey
be7e63c390
merging rest-api-improvements branch to master
9 years ago
prabathabey
ed5d611c35
Code cleanup
9 years ago
prabathabey
37852051ff
Improving Device and Policy Management APIs and cleaning up code of Role and User Management APIs
9 years ago
Chatura Dilan
f100853031
Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
dilanua
d34f29ab46
Fixing device types not retrieving issue
9 years ago
Chatura Dilan
bb6d2f2012
Fixed user search
9 years ago
madhawap
d9b35c29cd
swagger annotation fix to policy 'apply-changes' end point
9 years ago
madhawap
88feb5a852
Add Pagination to Notification end points
9 years ago
prabathabey
624e7df688
Improving HTTP status code handling and the resource implementations
9 years ago
prabathabey
a23f44e682
Improving AcitivityManagement API implementation with proper error handling, etc
9 years ago
prabathabey
ad6b95ff62
Code cleanup
9 years ago
prabathabey
a46bd9194b
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
4236744d39
Improving UserManagement and RoleManagement API implementations to return proper error codes when no role/user exists, etc
9 years ago
Dilan U. Ariyaratne
a278b788d6
Merge pull request #308 from madhawap/rest-api-improvements
...
added priorities end-point to PolicyManagement
9 years ago
madhawap
b50e007897
added /priorities end-point to PolicyManagement
9 years ago
madhawap
9c215c4ac9
added /priorities end-point to PolicyManagement
9 years ago
inoshperera
50009c7ac5
adding apply policy end point
9 years ago
madhawap
ee11bde8b0
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
madhawap
235d690f1e
Implemented 'offset' and 'limit' parameters to the 'operation' api
9 years ago
prabathabey
0c54753b34
Cleaning up UserManagementService API implementation
9 years ago
prabathabey
9a7286a84b
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
9 years ago
prabathabey
aeb4ad3295
Merging rest-api-improvements branch to master
9 years ago
geethkokila
c07914eb36
Adding the activity count for the activty paginantion
9 years ago
geethkokila
a67f432993
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
geethkokila
236eb90ce2
Fixing the limit and offset for activity
9 years ago
madhawap
f2ab923df5
fix related to http status code in 'getDevices' endpoint
9 years ago
ayyoob
ebebca8573
Added support for push notification for xmpp, mqtt and few changes to the after testing
9 years ago
madhawap
ea56d4ced3
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
madhawap
015ca0575e
added 'updatedTimeStamp' to the Activity get response
9 years ago
dilanua
1513c6cf8a
Adding isActive property to PolicyWrapper
9 years ago
madhawap
7cdb7dcee1
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
dilanua
0eed97e84c
Adding API for getting device types
9 years ago
madhawap
b3f95d19c1
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
9 years ago
inoshperera
96eb71314b
Merge pull request #297 from madhawap/rest-api-improvements
...
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
9 years ago
madhawap
d7b860b955
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
madhawap
59119f9167
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
9 years ago
ayyoob
7b2c04152f
changed the UI calls from tomcat to apimgt gateway
9 years ago
Ace
7b62d2769e
Changing response code returned when adding user
9 years ago
madhawap
3d416da6fe
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
9 years ago
Ace
016414c076
Bug fixes for role search
9 years ago
madhawap
f80603a365
Fixes to if-modified-since in activity provider
9 years ago
Ace
4609888ad1
Fixes to ifmodified-since in activity provider
9 years ago
prabathabey
8819c6e36b
Adding support for 'If-Modified-Since' header and 'since' query filter
9 years ago
inoshperera
d71f0c6e6d
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
inoshperera
037acbe5bb
fixing platform configuration appearing twice issue.
9 years ago
prabathabey
67c9ee0e70
Fixing commit conflict
9 years ago
prabathabey
b24250f3f2
Returning device info within the device bean itself
9 years ago
hasuniea
dc72fd1553
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
hasuniea
e2cebcd430
removed If-Modified-Since header param
9 years ago
inoshperera
ee948abc9d
fixing conflicts and improving swagger annotations and validations
9 years ago
inoshperera
5620e38681
adding proper error messages for APIs
9 years ago
prabathabey
d32cd96a74
Fixing merge conflicts
9 years ago
prabathabey
9ebf705323
Re-enabling retrieval of device info
9 years ago
prabathabey
e002ffb54a
Re-enabling retrieval of device info
9 years ago
dilanua
dada719486
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
dilanua
0bd2a46690
Adding H2/MSSQL/ORACLE/POSTGRESQL support for GET /admin/devices API
9 years ago
ayyoob
aa6298b5e7
updated device management admin api permission
9 years ago
ayyoob
d926bdaa34
removed unused permission from permission.xml
9 years ago
dilanua
07a4a65c7c
Fixing permission issues with GET /devices/*/*/features API
9 years ago
dilanua
25e45dc9f1
Fixing issues in GET /operations and /admin/devices APIs
9 years ago
mharindu
7a029743ba
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
mharindu
81aa298740
Fixed RoleManagementService API issues
9 years ago
prabathabey
3cb9b5bae2
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
61beca5048
Fixing getDevice method to support status, ownership, etc as query param filters
9 years ago
ayyoob
9f1de717c5
updated permissions in the permission.xml
9 years ago
mharindu
7aa37ff4d5
Fixed issues in RoleManagementService
9 years ago
mharindu
63ea40eb27
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
mharindu
ce557266ec
Fixed issues in RoleManagementService
9 years ago
ayyoob
d9c15b62e7
few changes after testing user management api
9 years ago
Prabath Abeysekara
14322d4ba5
Merge pull request #283 from ayyoob/rest-api-improvements
...
fixed api issues in policy
9 years ago
ayyoob
5b8b15f69b
fixed api issues in policy
9 years ago
prabathabey
c9a2dc4399
Improving user management API implementation
9 years ago
prabathabey
627d99e913
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
00a16ea2bc
Improving Role management API implementation
9 years ago
dilanua
4a74ea8100
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
dilanua
374d509881
Updating DeviceManagementAdminServiceImpl
9 years ago
prabathabey
3e21c6d50d
Improving ceritificate management webapp impl
9 years ago
Ace
ddfd678b2a
Adding user management API bug fixes and improvements
9 years ago
Ace
d13368d144
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago