WSO2 Builder
c3d154ee65
[WSO2 Release] [Jenkins #2373 ] [Release 3.0.4] prepare release v3.0.4
2017-06-19 16:22:42 +05:30
Harshan Liyanage
a21c374b00
Code refactoring.
2017-06-19 12:52:31 +05:30
Harshan Liyanage
074ceeb0c7
Merged with master
2017-06-19 12:46:22 +05:30
Harshan Liyanage
967efa1fee
Fixed user enrolled device showing problem which resolves wso2/product-iots#406
2017-06-19 12:41:22 +05:30
ayyoob
3b7d4d8966
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-17 19:17:42 +05:30
ayyoob
ca33f035df
merge ui fixes
2017-06-17 18:52:25 +05:30
Ayyoob Hamza
2875fb2ca0
Merge pull request #755 from rasika/geo-fencing
...
Added Geo Service into Device Mgt Core
2017-06-17 12:20:10 +05:30
WSO2 Builder
e924a86d73
[WSO2 Release] [Jenkins #2368 ] [Release 3.0.3] prepare for next development iteration
2017-06-16 17:40:41 +05:30
WSO2 Builder
b35aaab992
[WSO2 Release] [Jenkins #2368 ] [Release 3.0.3] prepare release v3.0.3
2017-06-16 17:40:27 +05:30
Rasika Perera
8da1f62cd9
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-06-16 15:50:45 +05:30
WSO2 Builder
2b76317f40
[WSO2 Release] [Jenkins #2366 ] [Release 3.0.2] prepare for next development iteration
2017-06-16 11:00:40 +05:30
WSO2 Builder
02bc10e6d2
[WSO2 Release] [Jenkins #2366 ] [Release 3.0.2] prepare release v3.0.2
2017-06-16 11:00:26 +05:30
ayyoob
f47d0deb1a
few changes after testing.
2017-06-16 03:48:08 +05:30
WSO2 Builder
1e58f762da
[WSO2 Release] [Jenkins #2365 ] [Release 3.0.1] prepare for next development iteration
2017-06-15 16:23:05 +05:30
WSO2 Builder
bae931f3c5
[WSO2 Release] [Jenkins #2365 ] [Release 3.0.1] prepare release v3.0.1
2017-06-15 16:22:51 +05:30
ayyoob
0d08c42f5e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-15 09:48:00 +05:30
WSO2 Builder
69d2cff7bd
[WSO2 Release] [Jenkins #2363 ] [Release 3.0.0] prepare for next development iteration
2017-06-14 18:08:46 +05:30
WSO2 Builder
3795011895
[WSO2 Release] [Jenkins #2363 ] [Release 3.0.0] prepare release v3.0.0
2017-06-14 18:08:31 +05:30
ayyoob
07bdd5cb6c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-14 13:19:07 +05:30
ayyoob
da68f8fac1
fixed on config operation flow
2017-06-14 12:38:56 +05:30
Rasika Perera
798e551673
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-06-14 10:43:19 +05:30
WSO2 Builder
16420433b5
[WSO2 Release] [Jenkins #2352 ] [Release 2.0.75] prepare for next development iteration
2017-06-13 17:26:56 +05:30
WSO2 Builder
5c06b9dcb2
[WSO2 Release] [Jenkins #2352 ] [Release 2.0.75] prepare release v2.0.75
2017-06-13 17:26:42 +05:30
Rasika Perera
ce6ab9b354
Refactoring "executionPlanType" -> "alertType"
2017-06-12 22:43:14 +05:30
Rasika Perera
6d02075a99
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-06-12 15:11:14 +05:30
ayyoob
22a4716443
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-12 11:35:43 +05:30
WSO2 Builder
8927158086
[WSO2 Release] [Jenkins #2346 ] [Release 2.0.74] prepare for next development iteration
2017-06-09 12:57:29 +05:30
WSO2 Builder
28423c45bc
[WSO2 Release] [Jenkins #2346 ] [Release 2.0.74] prepare release v2.0.74
2017-06-09 12:57:15 +05:30
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
2017-06-08 14:39:51 +05:30
ayyoob
7ab52af66e
add http pushnotification
2017-06-08 14:24:33 +05:30
Harshan Liyanage
a30982207b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-07 16:29:15 +05:30
Harshan Liyanage
3766ba0349
Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991
2017-06-07 16:29:05 +05:30
WSO2 Builder
e3dfbdfdbd
[WSO2 Release] [Jenkins #2342 ] [Release 2.0.73] prepare for next development iteration
2017-06-07 13:44:29 +05:30
WSO2 Builder
598332b640
[WSO2 Release] [Jenkins #2342 ] [Release 2.0.73] prepare release v2.0.73
2017-06-07 13:44:15 +05:30
inoshperera
9f9208cebc
adding default values for timestamp
2017-06-07 09:25:16 +05:30
Rasika Perera
05b11a5099
Adding Exit Alerts feature
2017-06-06 14:55:04 +05:30
WSO2 Builder
73fa026eeb
[WSO2 Release] [Jenkins #2340 ] [Release 2.0.72] prepare for next development iteration
2017-06-06 12:33:06 +05:30
WSO2 Builder
2415762ccb
[WSO2 Release] [Jenkins #2340 ] [Release 2.0.72] prepare release v2.0.72
2017-06-06 12:32:53 +05:30
ayyoob
f3393080ba
fixed few issues after testing
2017-06-06 11:00:59 +05:30
Rasika Perera
ec343cef1a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-06-05 10:26:10 +05:30
Rasika Perera
886eaec271
Geo service alerts history method added
2017-06-05 10:11:14 +05:30
ayyoob
194e4d99b5
added policy compliance support
2017-06-05 00:12:59 +05:30
ayyoob
5b46dc03a5
few fixes on event reciever definition
2017-06-04 18:18:06 +05:30
ayyoob
7cba43ccbb
few changes after testing HTTP and MQTT flow
2017-06-04 06:52:29 +05:30
ayyoob
a7ebc96cb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-03 18:06:32 +05:30
ayyoob
a1b20f1663
changed response payload definition for pull notification
2017-06-03 13:27:08 +05:30
WSO2 Builder
39a7037821
[WSO2 Release] [Jenkins #2334 ] [Release 2.0.71] prepare for next development iteration
2017-06-02 16:44:55 +05:30
WSO2 Builder
22782ec125
[WSO2 Release] [Jenkins #2334 ] [Release 2.0.71] prepare release v2.0.71
2017-06-02 16:44:41 +05:30
ayyoob
04b8b74e4f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-01 17:22:33 +05:30
ayyoob
a0d7518cbe
Implemented Pull Notification Support
2017-06-01 17:19:25 +05:30
WSO2 Builder
c7fd70145d
[WSO2 Release] [Jenkins #2331 ] [Release 2.0.70] prepare for next development iteration
2017-06-01 08:58:27 +05:30
WSO2 Builder
0c9d104401
[WSO2 Release] [Jenkins #2331 ] [Release 2.0.70] prepare release v2.0.70
2017-06-01 08:58:13 +05:30
Rasika Perera
0a8929c7ee
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-05-30 16:35:36 +05:30
WSO2 Builder
69a63baa43
[WSO2 Release] [Jenkins #2328 ] [Release 2.0.69] prepare for next development iteration
2017-05-30 11:24:51 +05:30
WSO2 Builder
713b948ea9
[WSO2 Release] [Jenkins #2328 ] [Release 2.0.69] prepare release v2.0.69
2017-05-30 11:24:37 +05:30
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
2017-05-29 20:13:51 +05:30
Rasika Perera
ea3ed9c444
Added Geo Service into Device Mgt Core
2017-05-29 11:51:41 +05:30
ayyoob
c3f23fa564
fixed multi tenant issues after testing custom device type impl
2017-05-29 01:00:16 +05:30
ayyoob
56faa75861
fixed analytics issues
2017-05-25 03:07:19 +05:30
ayyoob
75d6813d8a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-05-24 00:43:02 +05:30
ayyoob
5acf5912e4
added comment
2017-05-24 00:41:21 +05:30
ayyoob
a037f91f56
removed task Config from template
2017-05-24 00:27:13 +05:30
ayyoob
4d22bc7064
fixed UI Issues
2017-05-24 00:26:02 +05:30
WSO2 Builder
7e83b53bb4
[WSO2 Release] [Jenkins #2314 ] [Release 2.0.68] prepare for next development iteration
2017-05-22 15:33:56 +05:30
WSO2 Builder
768073ea51
[WSO2 Release] [Jenkins #2314 ] [Release 2.0.68] prepare release v2.0.68
2017-05-22 15:33:42 +05:30
ayyoob
dd1c2e4338
Added few fixes after testing and added default UI for device type management
2017-05-22 02:51:35 +05:30
ayyoob
f945da194d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-05-19 01:56:40 +05:30
ayyoob
abc9315f95
Added Pluggable Device Type
2017-05-19 01:49:10 +05:30
WSO2 Builder
88bab85750
[WSO2 Release] [Jenkins #2308 ] [Release 2.0.67] prepare for next development iteration
2017-05-18 17:33:39 +05:30
WSO2 Builder
4e506a547e
[WSO2 Release] [Jenkins #2308 ] [Release 2.0.67] prepare release v2.0.67
2017-05-18 17:33:25 +05:30
WSO2 Builder
3092423d4d
[WSO2 Release] [Jenkins #2305 ] [Release 2.0.66] prepare for next development iteration
2017-05-17 19:11:50 +05:30
WSO2 Builder
e21520392c
[WSO2 Release] [Jenkins #2305 ] [Release 2.0.66] prepare release v2.0.66
2017-05-17 19:11:36 +05:30
Megala Uthayakumar
8830d627e9
Merge pull request #747 from sinthuja/master
...
Fixing some issues reported for product-iots.
2017-05-17 16:18:32 +05:30
WSO2 Builder
d4baa72328
[WSO2 Release] [Jenkins #2300 ] [Release 2.0.65] prepare for next development iteration
2017-05-16 18:34:27 +05:30
WSO2 Builder
7b549f623d
[WSO2 Release] [Jenkins #2300 ] [Release 2.0.65] prepare release v2.0.65
2017-05-16 18:34:13 +05:30
sinthuja
4df590caa1
Fixing https://github.com/wso2/product-iots/issues/447 .
2017-05-16 18:17:45 +05:30
ayyoob
fbb5f5ae88
merged with origin
2017-05-15 18:15:24 +05:30
WSO2 Builder
84d305dcd4
[WSO2 Release] [Jenkins #2293 ] [Release 2.0.64] prepare for next development iteration
2017-05-11 09:15:49 +05:30
WSO2 Builder
3bf945fe95
[WSO2 Release] [Jenkins #2293 ] [Release 2.0.64] prepare release v2.0.64
2017-05-11 09:15:33 +05:30
ayyoob
d2d7be6fd6
fixed tenant related issue for mqtt push notification and stream artifact publishing
2017-05-10 13:50:06 +05:30
ayyoob
035403495c
made default stat permission as constant
2017-05-09 16:45:47 +05:30
ayyoob
483d09ebf1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into new-master
2017-05-09 16:13:35 +05:30
WSO2 Builder
f7300645a5
[WSO2 Release] [Jenkins #2289 ] [Release 2.0.63] prepare for next development iteration
2017-05-09 15:05:26 +05:30
WSO2 Builder
ca83609703
[WSO2 Release] [Jenkins #2289 ] [Release 2.0.63] prepare release v2.0.63
2017-05-09 15:05:11 +05:30
ayyoob
b36ff4b874
added a authorisation resource for stat
2017-05-09 00:54:49 +05:30
ayyoob
77ceed5368
renamed device type publisher service to DeviceAnalyticsArtifactUploaderAdminService
2017-05-09 00:54:01 +05:30
WSO2 Builder
964eae6f92
[WSO2 Release] [Jenkins #2285 ] [Release 2.0.62] prepare for next development iteration
2017-05-08 17:42:41 +05:30
WSO2 Builder
31f91f80b9
[WSO2 Release] [Jenkins #2285 ] [Release 2.0.62] prepare release v2.0.62
2017-05-08 17:42:28 +05:30
WSO2 Builder
639eeb225a
[WSO2 Release] [Jenkins #2280 ] [Release 2.0.61] prepare for next development iteration
2017-05-05 11:41:19 +05:30
WSO2 Builder
7d3025a25b
[WSO2 Release] [Jenkins #2280 ] [Release 2.0.61] prepare release v2.0.61
2017-05-05 11:41:03 +05:30
ayyoob
cedb6cb798
fixed device stats loading page issue
2017-05-05 03:02:35 +05:30
WSO2 Builder
a546355cf3
[WSO2 Release] [Jenkins #2277 ] [Release 2.0.60] prepare for next development iteration
2017-05-04 15:42:27 +05:30
WSO2 Builder
eb6b1db3fe
[WSO2 Release] [Jenkins #2277 ] [Release 2.0.60] prepare release v2.0.60
2017-05-04 15:42:14 +05:30
Madawa Soysa
c4d0ca7134
Merge pull request #734 from madhawap/master
...
Removed commented lines
2017-05-04 15:36:00 +05:30
madhawap
c4ba14376e
Removed commented lines
2017-05-04 15:32:25 +05:30
WSO2 Builder
4797fc9600
[WSO2 Release] [Jenkins #2274 ] [Release 2.0.59] prepare for next development iteration
2017-05-03 20:29:05 +05:30
WSO2 Builder
896bc24f21
[WSO2 Release] [Jenkins #2274 ] [Release 2.0.59] prepare release v2.0.59
2017-05-03 20:28:51 +05:30
WSO2 Builder
98991fe89b
[WSO2 Release] [Jenkins #2272 ] [Release 2.0.58] prepare for next development iteration
2017-05-03 15:28:16 +05:30
WSO2 Builder
8b31b93181
[WSO2 Release] [Jenkins #2272 ] [Release 2.0.58] prepare release v2.0.58
2017-05-03 15:28:02 +05:30
WSO2 Builder
6fddf9c8d0
[WSO2 Release] [Jenkins #2268 ] [Release 2.0.57] prepare for next development iteration
2017-05-03 08:28:19 +05:30
WSO2 Builder
2f4051019c
[WSO2 Release] [Jenkins #2268 ] [Release 2.0.57] prepare release v2.0.57
2017-05-03 08:28:05 +05:30
WSO2 Builder
80bf3c8fbd
[WSO2 Release] [Jenkins #2266 ] [Release 2.0.56] prepare for next development iteration
2017-05-02 18:01:00 +05:30
WSO2 Builder
2a7173c66d
[WSO2 Release] [Jenkins #2266 ] [Release 2.0.56] prepare release v2.0.56
2017-05-02 18:00:46 +05:30
WSO2 Builder
95a80301e9
[WSO2 Release] [Jenkins #2265 ] [Release 2.0.55] prepare for next development iteration
2017-05-02 17:15:09 +05:30
WSO2 Builder
236db75700
[WSO2 Release] [Jenkins #2265 ] [Release 2.0.55] prepare release v2.0.55
2017-05-02 17:14:54 +05:30
WSO2 Builder
43e76e4678
[WSO2 Release] [Jenkins #2263 ] [Release 2.0.54] prepare for next development iteration
2017-05-02 09:37:33 +05:30
WSO2 Builder
34865f0d25
[WSO2 Release] [Jenkins #2263 ] [Release 2.0.54] prepare release v2.0.54
2017-05-02 09:37:16 +05:30
WSO2 Builder
3a9986d054
[WSO2 Release] [Jenkins #2257 ] [Release 2.0.53] prepare for next development iteration
2017-04-28 10:29:44 +05:30
WSO2 Builder
b53610ff8b
[WSO2 Release] [Jenkins #2257 ] [Release 2.0.53] prepare release v2.0.53
2017-04-28 10:29:35 +05:30
WSO2 Builder
726422dc81
[WSO2 Release] [Jenkins #2250 ] [Release 2.0.52] prepare for next development iteration
2017-04-26 21:31:21 +05:30
WSO2 Builder
4bf6bf73cc
[WSO2 Release] [Jenkins #2250 ] [Release 2.0.52] prepare release v2.0.52
2017-04-26 21:31:08 +05:30
WSO2 Builder
4429482a29
[WSO2 Release] [Jenkins #2248 ] [Release 2.0.51] prepare for next development iteration
2017-04-26 15:26:48 +05:30
WSO2 Builder
1bbd982e1f
[WSO2 Release] [Jenkins #2248 ] [Release 2.0.51] prepare release v2.0.51
2017-04-26 15:26:35 +05:30
ayyoob
a3910908f8
fixed an issue in the logging
2017-04-26 14:48:20 +05:30
ayyoob
018d875a84
removed temporary logs
...
(cherry picked from commit 615e44e)
2017-04-26 14:26:23 +05:30
WSO2 Builder
52b0165275
[WSO2 Release] [Jenkins #2245 ] [Release 2.0.50] prepare for next development iteration
2017-04-26 11:16:14 +05:30
WSO2 Builder
ada2669ecf
[WSO2 Release] [Jenkins #2245 ] [Release 2.0.50] prepare release v2.0.50
2017-04-26 11:15:58 +05:30
ayyoob
1e2ca17275
fixed few issues after testing
...
(cherry picked from commit 5b6d8d3)
2017-04-26 10:19:55 +05:30
WSO2 Builder
543e603298
[WSO2 Release] [Jenkins #2242 ] [Release 2.0.49] prepare for next development iteration
2017-04-25 10:14:34 +05:30
WSO2 Builder
5010a3eebf
[WSO2 Release] [Jenkins #2242 ] [Release 2.0.49] prepare release v2.0.49
2017-04-25 10:14:21 +05:30
WSO2 Builder
eb8ba53092
[WSO2 Release] [Jenkins #2240 ] [Release 2.0.48] prepare for next development iteration
2017-04-25 08:58:47 +05:30
WSO2 Builder
4764bff47e
[WSO2 Release] [Jenkins #2240 ] [Release 2.0.48] prepare release v2.0.48
2017-04-25 08:58:32 +05:30
ayyoob
3df2912a6a
added default UI for realtime,batch, device view and type view
2017-04-24 02:51:03 +05:30
ayyoob
2a89a2fb23
resolved issues in event management service
2017-04-22 18:31:13 +05:30
ayyoob
f834001d22
merged with origin
2017-04-22 01:24:24 +05:30
ayyoob
4ce8352690
added device event api
2017-04-22 00:15:58 +05:30
WSO2 Builder
c1b5a649f6
[WSO2 Release] [Jenkins #2234 ] [Release 2.0.47] prepare for next development iteration
2017-04-21 16:06:53 +05:30
WSO2 Builder
6ccccb67b4
[WSO2 Release] [Jenkins #2234 ] [Release 2.0.47] prepare release v2.0.47
2017-04-21 16:06:39 +05:30
Harshan Liyanage
0dc15324ad
Merge pull request #701 from amalhub/master
...
Merging Cloud updates to master
2017-04-21 15:59:00 +05:30
Jasintha
e6b38fbdb4
Implemeting dynamic recivers and streams deployment into DAS
2017-04-21 15:51:24 +05:30
WSO2 Builder
1ecb4edbd7
[WSO2 Release] [Jenkins #2232 ] [Release 2.0.46] prepare for next development iteration
2017-04-21 15:31:09 +05:30
WSO2 Builder
48a8f43cb3
[WSO2 Release] [Jenkins #2232 ] [Release 2.0.46] prepare release v2.0.46
2017-04-21 15:30:57 +05:30
megala21
32ea2e52c4
Fixes https://github.com/wso2/product-iots/issues/373 and https://github.com/wso2/product-iots/issues/370
2017-04-21 15:18:20 +05:30
WSO2 Builder
16d97d62be
[WSO2 Release] [Jenkins #2229 ] [Release 2.0.45] prepare for next development iteration
2017-04-20 14:41:55 +05:30
WSO2 Builder
8891784b99
[WSO2 Release] [Jenkins #2229 ] [Release 2.0.45] prepare release v2.0.45
2017-04-20 14:41:41 +05:30
ayyoob
0e9bb7caf6
corrected operation definition
2017-04-19 16:34:18 +05:30
ayyoob
c28f820455
added missing apis - operation and device management
2017-04-19 16:32:06 +05:30
WSO2 Builder
f7d1a7cf99
[WSO2 Release] [Jenkins #2225 ] [Release 2.0.44] prepare for next development iteration
2017-04-18 10:40:31 +05:30
WSO2 Builder
4b85af950c
[WSO2 Release] [Jenkins #2225 ] [Release 2.0.44] prepare release v2.0.44
2017-04-18 10:40:22 +05:30
WSO2 Builder
b9e614e383
[WSO2 Release] [Jenkins #2222 ] [Release 2.0.43] prepare for next development iteration
2017-04-17 16:39:50 +05:30
WSO2 Builder
d37951ef3f
[WSO2 Release] [Jenkins #2222 ] [Release 2.0.43] prepare release v2.0.43
2017-04-17 16:39:37 +05:30
megala21
2360b338d8
Fixing the role creation problem
2017-04-17 13:14:14 +05:30
WSO2 Builder
fc15f43b31
[WSO2 Release] [Jenkins #2210 ] [Release 2.0.42] prepare for next development iteration
2017-04-07 14:07:15 +05:30
WSO2 Builder
27b84bfc22
[WSO2 Release] [Jenkins #2210 ] [Release 2.0.42] prepare release v2.0.42
2017-04-07 14:07:01 +05:30
WSO2 Builder
5496159f9d
[WSO2 Release] [Jenkins #2206 ] [Release 2.0.41] prepare for next development iteration
2017-04-05 11:58:36 +05:30
WSO2 Builder
ef94e90366
[WSO2 Release] [Jenkins #2206 ] [Release 2.0.41] prepare release v2.0.41
2017-04-05 11:58:23 +05:30
megala21
2b92676191
Fixes https://github.com/wso2/product-iots/issues/346
2017-04-05 11:02:58 +05:30
WSO2 Builder
a826370019
[WSO2 Release] [Jenkins #2204 ] [Release 2.0.40] prepare for next development iteration
2017-04-05 09:37:06 +05:30
WSO2 Builder
4654a4db45
[WSO2 Release] [Jenkins #2204 ] [Release 2.0.40] prepare release v2.0.40
2017-04-05 09:36:53 +05:30
WSO2 Builder
8b7e458592
[WSO2 Release] [Jenkins #2201 ] [Release 2.0.39] prepare for next development iteration
2017-04-04 18:08:44 +05:30
WSO2 Builder
6297993560
[WSO2 Release] [Jenkins #2201 ] [Release 2.0.39] prepare release v2.0.39
2017-04-04 18:08:31 +05:30
WSO2 Builder
802c83de39
[WSO2 Release] [Jenkins #2193 ] [Release 2.0.38] prepare for next development iteration
2017-03-29 23:16:15 +05:30
WSO2 Builder
98dda03784
[WSO2 Release] [Jenkins #2193 ] [Release 2.0.38] prepare release v2.0.38
2017-03-29 23:16:04 +05:30
WSO2 Builder
f3e119cd78
[WSO2 Release] [Jenkins #2190 ] [Release 2.0.37] prepare for next development iteration
2017-03-28 12:48:31 +05:30
WSO2 Builder
a8f8a49a80
[WSO2 Release] [Jenkins #2190 ] [Release 2.0.37] prepare release v2.0.37
2017-03-28 12:48:20 +05:30
WSO2 Builder
0e5895ec78
[WSO2 Release] [Jenkins #2183 ] [Release 2.0.36] prepare for next development iteration
2017-03-24 12:06:23 +05:30
WSO2 Builder
d6080159cb
[WSO2 Release] [Jenkins #2183 ] [Release 2.0.36] prepare release v2.0.36
2017-03-24 12:06:12 +05:30
Amal Gunatilake
e9c2f3e72d
Merge branch 'master' into cloud-3.1.0
2017-03-24 11:55:35 +05:30
WSO2 Builder
3f8f8b3ab9
[WSO2 Release] [Jenkins #2180 ] [Release 2.0.35] prepare for next development iteration
2017-03-23 18:59:18 +05:30
WSO2 Builder
6a9a5ba9c8
[WSO2 Release] [Jenkins #2180 ] [Release 2.0.35] prepare release v2.0.35
2017-03-23 18:59:07 +05:30
kamidu
cda0dd417f
fixing the role filtering api issues
2017-03-23 12:21:41 +05:30
kamidu
73ab0a38bf
adding get location api witch was missing from previous emm versions
2017-03-22 20:13:08 +05:30
kamidu
a6f5c002a9
adding get location api witch was missing from previous emm versions
2017-03-22 20:12:50 +05:30
kamidu
a77794f81a
adding role filtering for device cloud via api
2017-03-22 20:12:30 +05:30
kamidu
fc6c8e0290
adding get location api witch was missing from previous emm versions
2017-03-22 20:11:41 +05:30
WSO2 Builder
e8ee33e7a4
[WSO2 Release] [Jenkins #2177 ] [Release 2.0.34] prepare for next development iteration
2017-03-22 15:24:27 +05:30
WSO2 Builder
6cc898d2ab
[WSO2 Release] [Jenkins #2177 ] [Release 2.0.34] prepare release v2.0.34
2017-03-22 15:24:16 +05:30
WSO2 Builder
a26a4bb539
[WSO2 Release] [Jenkins #2175 ] [Release 2.0.33] prepare for next development iteration
2017-03-22 14:25:54 +05:30
WSO2 Builder
000601911f
[WSO2 Release] [Jenkins #2175 ] [Release 2.0.33] prepare release v2.0.33
2017-03-22 14:25:43 +05:30
WSO2 Builder
50c9eb9ba4
[WSO2 Release] [Jenkins #2172 ] [Release 2.0.32] prepare for next development iteration
2017-03-21 20:02:26 +05:30
WSO2 Builder
ca79804c5c
[WSO2 Release] [Jenkins #2172 ] [Release 2.0.32] prepare release v2.0.32
2017-03-21 20:02:14 +05:30
WSO2 Builder
a35205c480
[WSO2 Release] [Jenkins #2169 ] [Release 2.0.31] prepare for next development iteration
2017-03-20 16:49:31 +05:30
WSO2 Builder
ac379c9bf9
[WSO2 Release] [Jenkins #2169 ] [Release 2.0.31] prepare release v2.0.31
2017-03-20 16:49:20 +05:30
WSO2 Builder
de25f3afe3
[WSO2 Release] [Jenkins #2163 ] [Release 2.0.30] prepare for next development iteration
2017-03-16 16:59:42 +05:30
WSO2 Builder
55ecafe7f4
[WSO2 Release] [Jenkins #2163 ] [Release 2.0.30] prepare release v2.0.30
2017-03-16 16:59:28 +05:30
WSO2 Builder
15d57f71ad
[WSO2 Release] [Jenkins #2161 ] [Release 2.0.29] prepare for next development iteration
2017-03-16 11:10:29 +05:30
WSO2 Builder
3af9e1729a
[WSO2 Release] [Jenkins #2161 ] [Release 2.0.29] prepare release v2.0.29
2017-03-16 11:10:11 +05:30
WSO2 Builder
322f39596e
[WSO2 Release] [Jenkins #2158 ] [Release 2.0.28] prepare for next development iteration
2017-03-15 18:46:16 +05:30
WSO2 Builder
18244d6c96
[WSO2 Release] [Jenkins #2158 ] [Release 2.0.28] prepare release v2.0.28
2017-03-15 18:46:03 +05:30
WSO2 Builder
12f21868dc
[WSO2 Release] [Jenkins #2157 ] [Release 2.0.27] prepare for next development iteration
2017-03-15 18:04:26 +05:30
WSO2 Builder
4328c3c39d
[WSO2 Release] [Jenkins #2157 ] [Release 2.0.27] prepare release v2.0.27
2017-03-15 18:04:12 +05:30
WSO2 Builder
c6bb8e0128
[WSO2 Release] [Jenkins #2154 ] [Release 2.0.26] prepare for next development iteration
2017-03-14 17:47:54 +05:30
WSO2 Builder
da9002ba9f
[WSO2 Release] [Jenkins #2154 ] [Release 2.0.26] prepare release v2.0.26
2017-03-14 17:47:43 +05:30
WSO2 Builder
6114f4b2d5
[WSO2 Release] [Jenkins #2152 ] [Release 2.0.25] prepare for next development iteration
2017-03-14 15:27:06 +05:30
WSO2 Builder
ea8f19f26d
[WSO2 Release] [Jenkins #2152 ] [Release 2.0.25] prepare release v2.0.25
2017-03-14 15:26:55 +05:30
WSO2 Builder
d433525145
[WSO2 Release] [Jenkins #2150 ] [Release 2.0.24] prepare for next development iteration
2017-03-14 14:09:19 +05:30
WSO2 Builder
35ee3eca3a
[WSO2 Release] [Jenkins #2150 ] [Release 2.0.24] prepare release v2.0.24
2017-03-14 14:09:08 +05:30
WSO2 Builder
4e0afb7d39
[WSO2 Release] [Jenkins #2146 ] [Release 2.0.23] prepare for next development iteration
2017-03-13 18:09:06 +05:30
WSO2 Builder
33f1448c82
[WSO2 Release] [Jenkins #2146 ] [Release 2.0.23] prepare release v2.0.23
2017-03-13 18:08:55 +05:30
WSO2 Builder
e95e96f06c
[WSO2 Release] [Jenkins #2141 ] [Release 2.0.22] prepare for next development iteration
2017-03-10 13:09:08 +05:30
WSO2 Builder
5d55413e02
[WSO2 Release] [Jenkins #2141 ] [Release 2.0.22] prepare release v2.0.22
2017-03-10 13:08:55 +05:30
WSO2 Builder
ae3300afde
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare for next development iteration
2017-03-09 13:14:50 +05:30
WSO2 Builder
6646c0c56f
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare release v2.0.21
2017-03-09 13:14:38 +05:30
WSO2 Builder
21cdcdd21a
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare for next development iteration
2017-03-09 12:38:02 +05:30
WSO2 Builder
23be60ebd0
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare release v2.0.20
2017-03-09 12:37:49 +05:30
WSO2 Builder
7f98d37835
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare for next development iteration
2017-02-28 21:22:53 +05:30
WSO2 Builder
b03936ca49
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare release v2.0.19
2017-02-28 21:19:50 +05:30
WSO2 Builder
82888e1d20
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare for next development iteration
2017-02-28 21:15:10 +05:30
WSO2 Builder
b11c2e451b
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare release v2.0.18
2017-02-28 21:14:44 +05:30
WSO2 Builder
67a091ff5a
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare for next development iteration
2017-02-28 21:12:47 +05:30
WSO2 Builder
dcc2088455
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare release v2.0.17
2017-02-28 21:12:14 +05:30
lakshani
eb12e5b9f1
Adding commit 'added java doc comments'
2017-02-28 21:11:15 +05:30
lakshani
3f90b403c0
Adding lakshani's commit 'updated device status button'
2017-02-28 21:03:53 +05:30
WSO2 Builder
927b2d451d
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare for next development iteration
2017-02-28 21:00:32 +05:30
WSO2 Builder
dfe9b1ff9c
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare release v2.0.16
2017-02-28 21:00:08 +05:30
charitha
d2991585aa
Applying charithas commit on IOTS-436
2017-02-28 20:56:25 +05:30
ayyoob
87910bc92b
transferred mutual authenticator to jwt authenticator
2017-02-08 13:10:36 +05:30
ayyoob
b7566f4e4a
added artifact deployment support through UI
2017-02-05 17:51:48 +05:30
ayyoob
0999bb70a0
exposed artefact deployment through api
...
Merged Jasintha’s code
2017-02-05 17:51:15 +05:30
Kamidu Sachith Punchihewa
559fe98cc9
Merge pull request #585 from wso2/master
...
Cloud ui fixes and the new master fixes
2017-02-03 17:24:49 +05:30
WSO2 Builder
54a278a1bc
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare for next development iteration
2017-02-03 16:08:26 +05:30
WSO2 Builder
3bc46c4d2d
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare release v2.0.15
2017-02-03 16:08:12 +05:30
WSO2 Builder
1bc8f5c28d
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare for next development iteration
2017-02-02 15:56:43 +05:30
WSO2 Builder
1483503790
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare release v2.0.14
2017-02-02 15:56:36 +05:30
Hasunie
54d0d7a5ee
Merge pull request #582 from charithag/master-update-swagger-docs
...
Update swagger docs
2017-02-02 14:59:06 +05:30
Milan Perera
a5f41ef734
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
2017-02-01 12:14:59 +05:30
charitha
8e01a98ded
Removed unused Dashboard API
2017-01-30 20:41:31 +05:30
charitha
423879bee7
Updated swagger docs
2017-01-30 20:41:05 +05:30
charitha
3cf797fba6
Removed hardcoded device types in swagger docs
2017-01-30 17:25:27 +05:30
WSO2 Builder
5dc55bb5b5
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare for next development iteration
2017-01-30 16:05:41 +05:30
WSO2 Builder
c7fe9c3a20
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare release v2.0.13
2017-01-30 16:05:29 +05:30
lakshani
26f2e2d2ae
added role query param to getdevices restapis
2017-01-30 07:50:10 +05:30
WSO2 Builder
c17bead1fc
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare for next development iteration
2017-01-29 19:46:03 +05:30
WSO2 Builder
14100d3cc8
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare release v2.0.12
2017-01-29 19:45:51 +05:30
GPrathap
47e6f6d292
adding username as parameter
2017-01-29 16:51:37 +05:30
ayyoob
b42505c1fe
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
2017-01-25 14:01:03 +05:30
WSO2 Builder
cd7e0feaa6
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare for next development iteration
2017-01-24 23:22:44 +05:30
WSO2 Builder
abb150d9bd
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare release v2.0.11
2017-01-24 23:22:33 +05:30
ayyoob
3423ef025d
merged with upstream
2017-01-24 19:39:49 +05:30
ayyoob
e74b4e23c4
removed apim dependency from cdmf
2017-01-24 19:32:59 +05:30
WSO2 Builder
002fb8719b
[maven-release-plugin] prepare for next development iteration
2017-01-23 20:24:47 +00:00
WSO2 Builder
04f32902fd
[maven-release-plugin] prepare release v2.0.10
2017-01-23 20:21:44 +00:00
Rasika Perera
704680d68d
Fixing null pointer when roles are not specified on creating new user
2017-01-24 01:54:37 +05:30
Rasika Perera
d723e22a8c
Fixed roleUpdate issue
2017-01-23 14:35:03 +05:30
WSO2 Builder
5c207897ad
[maven-release-plugin] prepare for next development iteration
2017-01-20 12:44:14 +00:00
WSO2 Builder
233d14edbd
[maven-release-plugin] prepare release v2.0.9
2017-01-20 12:41:33 +00:00
Rasika Perera
8e6855a203
Adding DEFAULT_DEVICE_USER on adding user
2017-01-20 18:01:56 +05:30
WSO2 Builder
eedecf00ed
[maven-release-plugin] prepare for next development iteration
2017-01-19 23:23:04 +00:00
WSO2 Builder
ef57fc463b
[maven-release-plugin] prepare release v2.0.8
2017-01-19 23:20:20 +00:00
sameera910409
1bec5e5186
fixed user password reset failure issue in iot console
2017-01-18 14:53:44 +05:30
Maninda
1f5448c2a0
Corrected the caching filter pattern
2017-01-18 12:36:11 +05:30
Maninda
8aed7c67a9
Added devicemgt web app configs to secure web app
2017-01-16 15:00:03 +05:30
WSO2 Builder
585b9bde4d
[maven-release-plugin] prepare for next development iteration
2017-01-14 01:50:45 +00:00
WSO2 Builder
d206148841
[maven-release-plugin] prepare release v2.0.7
2017-01-14 01:46:41 +00:00
ayyoob
671d931d3e
merged with origin after resolving conflicts
2017-01-12 23:24:35 +05:30
Rasika Perera
f57de670ea
Adding devices:update into /devices scopes list
2017-01-12 22:42:44 +05:30
Rasika Perera
e11d2244f5
Fixing scope annotation /enrollment-invite
2017-01-12 22:42:44 +05:30
Rasika Perera
63cb0e1fde
Adding swagger annotations and scope for /effective-policy
2017-01-12 22:42:44 +05:30
ayyoob
cdd144237f
removed unused parameter
2017-01-12 19:09:01 +05:30
ayyoob
2fbaf31b93
fixed permission and assigned environment variables for url context
2017-01-12 18:13:43 +05:30
Rasika Perera
8311828c5d
Merge pull request #537 from ayyoob/release-2.0.x
...
updated ui config
2017-01-11 13:18:04 +05:30
Rasika Perera
ef2a1b84a2
IOTS-376 : Fixing cannot delete a device
2017-01-11 09:12:46 +05:30
kamidu
4588cfbed4
Fixing the permission management issue in EMM console
2017-01-10 17:22:42 +05:30
Ace
643acd7827
Adding api for renaming devices
2017-01-10 16:16:31 +05:30
Rasika Perera
83aea1fd01
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-master
...
# Conflicts:
# components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/ExtendedFileProtocolIteratorFactory.java
# components/apimgt-extensions/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
# components/certificate-mgt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
# components/device-mgt-extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PasswordResetWrapper.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PolicyList.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/ProfileFeature.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Policy.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/SearchDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/impl/SearchDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/ProcessorImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/QueryBuilderImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/AnnotationProcessor.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedFileProtocolIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/pages/uuf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
# components/device-mgt/pom.xml
# components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
# components/email-sender/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/OAuthExtUtils.java
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
# components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
# components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
# components/identity-extensions/pom.xml
# components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
# components/policy-mgt/pom.xml
# components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
# components/webapp-authenticator-framework/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
# features/apimgt-extensions/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
# features/certificate-mgt/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
# features/device-mgt-extensions/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
# features/device-mgt/pom.xml
# features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml
# features/dynamic-client-registration/pom.xml
# features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
# features/email-sender/pom.xml
# features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
# features/jwt-client/pom.xml
# features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
# features/oauth-extensions/pom.xml
# features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
# features/policy-mgt/pom.xml
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
# features/webapp-authenticator-framework/pom.xml
# pom.xml
2017-01-08 11:45:46 +05:30
WSO2 Builder
5411d93103
[maven-release-plugin] prepare for next development iteration
2017-01-07 07:48:36 +00:00
WSO2 Builder
3ea83b925a
[maven-release-plugin] prepare release v2.0.6
2017-01-07 07:33:45 +00:00
Milan Perera
228848075c
Fixed conflicts and merged
2017-01-06 16:46:42 +05:30
Milan Perera
637c014866
Refactored scope strings
2017-01-06 10:15:21 +05:30
Milan Perera
157ef998a6
Resolved conflicts and merged
2017-01-06 09:22:49 +05:30
Milan Perera
e0ee2fc1e5
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-06 09:19:12 +05:30
ayyoob
b20a2e0997
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-05 17:51:34 +05:30
GPrathap
5d1435c7bc
renamed permission string
2017-01-05 16:47:53 +05:30
Milan Perera
2a4a636eb4
Resolved conflicts and merged
2017-01-05 12:41:08 +05:30
Milan Perera
d13dadff08
Renamed prefix of scopes
2017-01-05 12:35:02 +05:30
GPrathap
0bd7b90e9a
added scope annotation
2017-01-05 12:26:07 +05:30
ayyoob
db2ddc7bed
policy manager refactored to support tenancy
2017-01-05 12:24:41 +05:30
Maninda
0fb5a577b8
Fixed some issues found in FindBugs security analysis.
2017-01-05 11:47:09 +05:30
Milan Perera
b860be0150
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-04 10:34:57 +05:30
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
2017-01-03 11:35:08 +05:30
Milan Perera
02d75b757c
Fixed conflicts and merged
2017-01-03 10:37:46 +05:30
WSO2 Builder
6aea6195e9
[maven-release-plugin] prepare for next development iteration
2016-12-23 19:20:14 +00:00
WSO2 Builder
3db5b289ac
[maven-release-plugin] prepare release v2.0.5
2016-12-23 19:18:26 +00:00
Rasika Perera
acb2c38799
Fixing user is not authorized to view devices
2016-12-24 00:42:04 +05:30
WSO2 Builder
ed47094964
[maven-release-plugin] prepare for next development iteration
2016-12-23 07:05:25 +00:00
WSO2 Builder
8d409a7248
[maven-release-plugin] prepare release v2.0.4
2016-12-23 07:00:40 +00:00
charitha
1a93868424
Fixed https://wso2.org/jira/browse/IOTS-335
2016-12-23 12:19:57 +05:30
Ace
674048ab27
Coorecting version import ranges
2016-12-23 09:57:47 +05:30
Ruwan
46c3b015fa
Merge pull request #498 from charithag/release-2.0.x-email-invites
...
Release 2.0.x email invites
2016-12-22 18:41:22 +05:30
Charitha Goonetilleke
5318601df0
Add license header
2016-12-22 18:37:31 +05:30
charitha
2b1d46f45f
Finalized enrollment invitations
2016-12-22 18:30:07 +05:30
Ace
64da9479a1
Bumping identity dependencies
2016-12-22 12:32:24 +05:30
Ace
1d2a5dc9ef
Updating identity/auth-saml dependencies to latest
2016-12-22 10:58:59 +05:30
charitha
795ccb740c
Add backend support for enrollment invitations
2016-12-20 23:46:55 +05:30
Supun94
09572a9977
Removed redundant classes
2016-12-19 16:19:36 +05:30
Supun94
eb1575126f
Minor refactoring on policy merging
2016-12-19 16:19:36 +05:30
Supun94
33b79dcbba
Adding effective policy service
2016-12-19 16:19:36 +05:30
Rasika Perera
1465c56822
Revert "[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit f9b6939cb7
2016-12-19 12:39:56 +05:30
Ace
47d8baccf7
upgrading to latest version of identity
2016-12-19 11:38:03 +05:30
WSO2 Builder
f9b6939cb7
[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4
2016-12-19 09:06:04 +05:30
Rasika Perera
42930fe8c4
Revert "[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit 78b9052c37
2016-12-19 08:45:19 +05:30
Harshan Liyanage
a2a03a523e
Refactored RoleMgtServiceImpl.
2016-12-16 19:46:14 +05:30
Harshan Liyanage
de2f85de2e
IOTS-337:Fixed permission remove issue when updating role permissions.
2016-12-16 19:30:41 +05:30
WSO2 Builder
78b9052c37
[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4
2016-12-16 17:03:06 +05:30
Milan Perera
bcbf61a886
Fixed conflicts
2016-12-14 08:50:17 +05:30
Milan Perera
36ee55f493
Implemented permission-scope mapping for IoTs
2016-12-14 08:45:42 +05:30
Milan Perera
dd353e1bfb
Commiting permission-scope mapping improvements
2016-12-08 20:30:49 +05:30
WSO2 Builder
a59edee410
[maven-release-plugin] prepare for next development iteration
2016-12-08 14:39:00 +00:00
WSO2 Builder
8f9b21b41b
[maven-release-plugin] prepare release v2.0.3
2016-12-08 14:37:11 +00:00
geethkokila
d911281ad1
Merging master branch with release-2.0.x
2016-12-08 12:34:50 +05:30
WSO2 Builder
228b24ca79
[maven-release-plugin] prepare for next development iteration
2016-12-01 12:14:01 +00:00
WSO2 Builder
5dbb258f55
[maven-release-plugin] prepare release v2.0.2
2016-12-01 12:10:10 +00:00
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.
2016-11-29 18:34:25 +05:30
WSO2 Builder
8431b30ddc
[maven-release-plugin] prepare for next development iteration
2016-11-25 08:06:30 +00:00
WSO2 Builder
ae2e283f14
[maven-release-plugin] prepare release v2.0.1
2016-11-25 07:43:34 +00:00
Rasika Perera
aaade2363c
Adding new api to create combined roles
2016-11-25 08:18:10 +05:30
charitha
a2db592d69
Updated group management APIs and service
2016-11-23 14:06:24 +05:30
charitha
726bbcd35d
Merged with upstream
2016-11-23 13:51:50 +05:30
charitha
c07d77b85d
Updated group sharing model
2016-11-22 21:13:18 +05:30
ayyoob
ec3dbd37dd
fixed commit comments
2016-11-22 15:03:23 +05:30
ayyoob
e3849ef21e
removed feature lifecycle implementation
2016-11-21 20:49:27 +05:30
ayyoob
3fb42ef32e
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
2016-11-21 19:16:32 +05:30
ayyoob
fede8ec409
few changes after testing with authoriser
2016-11-21 19:13:59 +05:30
GPrathap
6efc5bc1ed
removed @API and @Permission annotations
2016-11-20 19:10:45 +05:30
ayyoob
fe263efe60
changed device access verification approach
2016-11-20 02:37:37 +05:30
ayyoob
28faf53802
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
2016-11-19 11:07:00 +05:30
ayyoob
59e2a33e4a
exposed device access authorisation as a service
2016-11-19 11:02:48 +05:30
WSO2 Builder
19c1b3566d
[maven-release-plugin] prepare for next development iteration
2016-11-16 12:18:48 +00:00
WSO2 Builder
cff6e242c8
[maven-release-plugin] prepare release v2.0.0
2016-11-16 12:16:25 +00:00
charitha
a6064d2561
Update component versions for IoTS-1.0.0 release
2016-11-16 13:32:13 +05:30
sameera910409
02eec1033e
add group sharing role create functionality
2016-11-15 12:20:58 +05:30
charitha
4a115e5d3f
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
2016-11-01 15:01:53 +05:30
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
2016-11-01 14:47:21 +05:30
WSO2 Builder
9517a3d30f
[maven-release-plugin] prepare for next development iteration
2016-10-31 10:34:22 +00:00
WSO2 Builder
a8568299b9
[maven-release-plugin] prepare release v1.2.6
2016-10-31 10:32:11 +00:00
sameera910409
f8f7dd08cd
fixed share groups and group analytics in device grouping
2016-10-28 14:07:50 +05:30
Kamidu Sachith Punchihewa
33874f95b6
Merge pull request #399 from saadsahibjan/master
...
Fix incorrect spacing
2016-10-26 17:28:59 +05:30
sameera910409
204a0ed943
fixes for the comments of the PR#404
2016-10-26 15:14:53 +05:30
sameera910409
41f367abfa
add group listing and group device listing fixes
2016-10-25 17:48:16 +05:30
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
2016-10-25 14:22:44 +05:30
Harshan Liyanage
f961b57f9f
EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.
2016-10-25 11:50:38 +05:30
Saad Sahibjan
1cb969eb6d
Fix incorrect spacing
2016-10-21 13:52:33 +05:30
WSO2 Builder
27a2c9b979
[maven-release-plugin] prepare for next development iteration
2016-10-18 12:17:27 +00:00
WSO2 Builder
eae935f91c
[maven-release-plugin] prepare release v1.2.5
2016-10-18 12:09:16 +00:00
Kamidu Sachith Punchihewa
7666bbfd05
Merge pull request #395 from Megala21/master
...
Fixing EMM-1752 and EMM-1755
2016-10-18 16:58:24 +05:30
WSO2 Builder
6a55e1be83
[maven-release-plugin] prepare for next development iteration
2016-10-17 14:15:22 +00:00
WSO2 Builder
11c2e59f61
[maven-release-plugin] prepare release v1.2.4
2016-10-17 14:13:25 +00:00
Megala
3416ae78c4
Fixing the problems in displaying user list when the user names has special chracters
2016-10-17 16:35:58 +05:30
Megala
1ff86289fd
Fixing the problems that happend when we have special chracters in roles
2016-10-17 15:47:32 +05:30
Megala
4ec6883ec8
Merge remote-tracking branch 'upstream/master'
2016-10-17 14:51:20 +05:30
Megala
4a71be850c
Refactoring code
2016-10-17 14:23:55 +05:30
Shavindri
28cb653b06
Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.
2016-10-17 14:21:30 +05:30
Megala
a04f91cddb
Fixing issues related to mapping users and roles from different user stores
2016-10-14 10:59:56 +05:30
Megala
87150f5074
Fixing secondary role deletion
2016-10-14 00:01:15 +05:30
Megala
0756294724
Merge remote-tracking branch 'upstream/master'
2016-10-13 17:01:32 +05:30
Megala
d8555c34ab
Fixing issues related with roles of secondary user store
2016-10-13 16:58:22 +05:30
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
2016-10-13 14:01:49 +05:30
Shavindri
c64581dc59
Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex
2016-10-13 13:45:02 +05:30
susinda
eb20d1fc1c
Device delete implemented (only in api level) for iot
2016-10-13 12:02:00 +05:30
charitha
528687bde3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-12 12:59:41 +05:30
charitha
0498c68ca5
Add validation to maximum limit value
...
(cherry picked from commit 4ed757f)
2016-10-12 12:57:57 +05:30
Megala
4999b84169
Reformatting code
2016-10-12 09:41:43 +05:30
Megala
5b96e1b849
Fixing EMM-1333
2016-10-12 09:38:11 +05:30
Kamidu Sachith Punchihewa
af4989e56d
Merge pull request #384 from shavidissa/master
...
swagger annotations and definition update continued for device type, …
2016-10-11 11:12:16 +05:30
Shavindri
1e32d5f89f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-11 11:05:25 +05:30
Shavindri
0842dcb2bb
swagger annotations and definition update continued for device type, device, policy, role, user, group and user management.
2016-10-11 10:33:05 +05:30
ayyoob
93c1725e32
fixed api name for device type
2016-10-10 20:47:31 +05:30
charitha
e53b0c3860
Fix group count listing in dashboard
2016-10-10 20:00:39 +05:30
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
2016-10-10 15:29:10 +05:30
ayyoob
5727886ea1
few changes after apimgt integration
2016-10-09 03:16:02 +05:30
charitha
94a50584f4
Improve group listing with pagination
2016-10-06 16:01:41 +05:30
madhawap
16b334b0b3
changes to swagger SecurityDefinitionConfigurator and annotations
2016-10-06 12:13:27 +05:30
madhawap
7b8518a9db
changes to swagger SecurityDefinitionConfigurator and annotations
2016-10-06 11:59:20 +05:30
charitha
ce5d63925a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-06 11:58:12 +05:30
charitha
e89b4015b6
Introduced pagination
2016-10-06 11:51:54 +05:30
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)
2016-10-06 11:33:31 +05:30
Shavindri
f0164b5a01
swagger annotations and definitions changes for role management, configuration management and application management(admin)
2016-10-06 10:12:25 +05:30
charitha
06176898d0
Exposed group id to API level
2016-10-05 12:20:35 +05:30
Megala
e77d8b8b29
Adding isEmpty check
2016-10-05 11:34:05 +05:30
Megala
0642cc10d7
Reformatting code
2016-10-05 10:52:40 +05:30
Megala
f9204add08
Merge remote-tracking branch 'upstream/master'
2016-10-05 10:10:12 +05:30
charitha
f22d392978
Upgrade to comply with latest CDMF changes
2016-10-04 19:03:07 +05:30
Megala
b7990b9146
Fixing problems in retriveing data from secondary user store
2016-10-04 17:22:45 +05:30
dilanua
dff32af832
Adding initial swagger annotations and permissions to Dashboard APIs
2016-10-04 16:25:17 +05:30
dilanua
1ca5762c44
Uncommenting Dashboard APIs
2016-10-04 15:49:29 +05:30
charitha
a0050d8f4d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-04 12:26:29 +05:30
charitha
d1d6eefd17
Upgrading grouping backend
2016-10-04 12:24:40 +05:30
harshanl
a4538a6d6c
Removed unnecessary params from paginated queries
2016-10-03 18:27:20 +05:30
harshanl
befb5b0ad8
EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password.
2016-10-03 14:13:06 +05:30
Chatura Dilan Perera
c16cc4cae1
[maven-release-plugin] prepare for next development iteration
2016-09-29 20:33:07 +05:30
Chatura Dilan Perera
ed4bca7032
[maven-release-plugin] prepare release v1.2.2
2016-09-29 20:32:59 +05:30
Rasika Perera
b2eb715fb7
REsolving conflicts
2016-09-29 13:01:01 +05:30
Rasika Perera
5c8c28d28c
Merge pull request #1 from warunalakshitha/master
...
upgrade product iot to carbon 4.4.9
2016-09-29 11:24:05 +05:30
Rasika Perera
237b9a7078
Creating api endpoint to retrieve features of a device-type
2016-09-28 23:42:44 +05:30
amalhub
428ce25b6f
Fixing issue: https://wso2.org/jira/browse/EMM-1646
2016-09-27 20:46:00 +05:30
Rasika Perera
a61be7a7ec
Enable group management api
2016-09-26 14:56:34 +05:30
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
2016-09-22 19:08:21 +05:30
Chatura Dilan Perera
7395c76408
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2016-09-20 17:45:24 +05:30
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
2016-09-20 17:02:28 +05:30
dilanua
d8e057abdd
Fix for JIRA: https://wso2.org/jira/browse/EMM-1582
2016-09-20 15:28:45 +05:30
Ace
87ad1e0e71
Fixing intermittent jackson bind issue
2016-09-20 12:07:14 +05:30
Chatura Dilan Perera
50d8885f8b
[maven-release-plugin] prepare for next development iteration
2016-09-19 18:54:48 +05:30
Chatura Dilan Perera
a00d6aafd4
[maven-release-plugin] prepare release v1.2.1
2016-09-19 18:54:38 +05:30
harshanl
75df243a33
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-09-19 12:22:08 +05:30
Ace
6a8a5cbd5a
Merging with master
2016-09-19 12:21:41 +05:30
harshanl
4169d3b2bd
Fixed EMM-1554
2016-09-19 12:08:06 +05:30
dilanua
713c8ac4d8
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
2016-09-18 07:34:14 +05:30
dilanua
58f8656e94
Changing permissions - /devices/owning to /devices/owning-device
2016-09-17 17:22:47 +05:30
harshanl
78cab76101
Fixed EMM-1531
2016-09-15 12:36:55 +05:30
Ace
1dfb8e22e1
Updating to latest appm/apim/identity dependencies
2016-09-14 17:23:09 +05:30
Chatura Dilan Perera
de23a8cf27
[maven-release-plugin] prepare for next development iteration
2016-09-09 20:18:25 +05:30
Chatura Dilan Perera
8905fae0d9
[maven-release-plugin] prepare release v1.2.0
2016-09-09 20:18:12 +05:30
harshanl
0eaf33aa5c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-09-09 19:16:27 +05:30
harshanl
87a5b09266
Added users/count API
2016-09-09 19:16:00 +05:30
thusithakalugamage
0d02e88955
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
2016-09-09 18:42:46 +05:30
kamidu
0fdcbae817
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-09-09 17:47:49 +05:30
kamidu
878daae5c5
Permission modifications
2016-09-09 17:47:42 +05:30
Chatura Dilan Perera
2d5262e21e
[maven-release-plugin] prepare for next development iteration
2016-09-09 17:10:19 +05:30
Chatura Dilan Perera
5ccd752404
[maven-release-plugin] prepare release v1.2.0
2016-09-09 17:10:04 +05:30
harshanl
7dc93ff010
MSSQL script fixes and added the /users/count REST API
2016-09-09 15:06:30 +05:30
mharindu
115099c8fe
Implemented permission based authorization
2016-09-09 02:56:21 +05:30
dilanua
d24ba98643
Updating activate and deactivate policy endpoints from PUT to POST
2016-09-07 16:15:26 +05:30
charitha
3575c9a33d
Fix issue in get devices with since parameter.
2016-08-31 17:43:13 +05:30
Chatura Dilan Perera
f29b9e84f2
Fixed 200 returns when activities are empty and since is a future date
2016-08-31 13:56:59 +05:30
Chatura Dilan Perera
9aa5f2793f
return date format as UTC in APIs
2016-08-30 14:17:06 +05:30
Chatura Dilan Perera
475b832c59
Changed return date format to UTC date
2016-08-29 18:50:23 +05:30
charitha
0fe827ca9f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-25 13:10:48 +05:30
charitha
9246cdcf30
Return empty array when results not found with since parameter
2016-08-25 12:28:55 +05:30
Saad Sahibjan
a72b47f6f7
Fixing incorrect response for remove policy
2016-08-24 19:18:35 +05:30
harshanl
f3aefcca77
Fixed EMM-1450
2016-08-23 17:57:08 +05:30
Chatura Dilan Perera
8b17cbb339
Fix conflicts
2016-08-19 15:00:57 +05:30
Chatura Dilan Perera
654e1d9938
[maven-release-plugin] prepare for next development iteration
2016-08-18 22:09:42 +05:30
Chatura Dilan Perera
aa24821667
[maven-release-plugin] prepare release v1.1.2
2016-08-18 22:09:33 +05:30
harshanl
67942d5c1d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-18 19:45:47 +05:30
dilanua
6b4ab635af
Fixing jiras: EMM-1472, EMM-1505
2016-08-18 14:30:53 +05:30
harshanl
2cb8f0b313
Fixed EMM-1392
2016-08-16 18:02:30 +05:30
Ruwan
6134f94e3c
Merge pull request #332 from ayyoob/com
...
fixing commit issues
2016-08-16 08:27:17 +05:30
hasuniea
282f53bf09
Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3
2016-08-15 21:00:23 +05:30
hasuniea
c269f35ef2
fixing getAllActivity H2 issue
2016-08-15 21:00:15 +05:30
mharindu
7346313d27
Modified scope management service
2016-08-15 20:30:45 +05:30
ayyoob
442c2b86da
fixed formatting issues
2016-08-15 15:19:18 +05:30
harshanl
a7d7c689e8
Removed unsupported roleName parameter from device API
2016-08-15 13:59:30 +05:30
ayyoob
3b56668af0
merged with upstream
2016-08-13 10:47:18 +05:30
madhawap
ecfe94235f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-12 12:46:27 +05:30
madhawap
c6cc5e8df3
fixes to role updating endpoint
2016-08-12 12:45:58 +05:30
ayyoob
3edc68d204
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com
2016-08-12 12:27:35 +05:30
ayyoob
058f9e4cfa
merged with origin
2016-08-12 10:52:56 +05:30
harshanl
e80c2f4050
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-11 17:27:10 +05:30
dilanua
352643a421
Changing deactivate-policy api method to PUT
2016-08-11 15:31:28 +05:30
harshanl
34e97aeeae
Removed device search using roleName parameter.
2016-08-11 14:03:09 +05:30
mharindu
5bdb4630af
Fixed conflicts and merged
2016-08-08 19:38:49 +05:30
mharindu
886e2e08f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-08-08 18:49:40 +05:30
mharindu
2e79dd290e
Modified scopes
2016-08-08 18:24:44 +05:30
hasuniea
1b07b18678
adding security fixes
2016-08-08 18:05:12 +05:30
harshanl
657e4864fb
Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
2016-08-04 20:40:40 +05:30
mharindu
ed4c762bfd
Refactored scopes
2016-08-04 17:46:46 +05:30
ayyoob
a7074e2e4e
refactored general configuration
2016-08-03 17:23:16 +05:30
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
2016-08-03 14:12:24 +05:30
mharindu
eb5216091e
Fixed conflicts and merged
2016-08-03 12:36:56 +05:30
harshanl
6cc1bb088c
Fixed EMM-1447, EMM-1424
2016-08-01 20:29:21 +05:30
mharindu
6e742ee6ac
Added scope beans
2016-07-26 16:40:04 +05:30
mharindu
564c2b280e
Fixed conflicts and merged
2016-07-26 16:38:51 +05:30
Chatura Dilan
7af8ecc686
Added userstore for role listing
2016-07-26 11:59:10 +05:30
mharindu
b3d309583d
Fixed issues in scope service
2016-07-21 20:13:38 +05:30
mharindu
7f1e2fdf0b
Implemented scope management service
2016-07-21 12:43:21 +05:30
mharindu
bdec8880bb
Fixed conflicts and merged
2016-07-18 20:22:27 +05:30
mharindu
186432e1df
Fixed webapp name resolving issue
2016-07-18 20:08:51 +05:30
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.
2016-07-15 16:25:31 +02:00
Timo Briddigkeit
90910518d6
Fixed null pointer dereferences
2016-07-15 09:26:27 +02:00
Timo Briddigkeit
09020ccb9f
Fixed predictable pseudorandom number generator
2016-07-13 14:35:55 +02:00
mharindu
99664b23c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-13 11:05:35 +05:30
Dilan U. Ariyaratne
ab5aa3e31c
Merge pull request #315 from madhawap/master
...
Added missing end-point to the permissions.xml
2016-07-12 10:28:38 +05:30
madhawap
0b338a1d25
Added missing end-point to the permissions.xml
2016-07-12 10:24:05 +05:30
mharindu
789086a667
Changed context paths
2016-07-12 01:31:35 +05:30
mharindu
0f904e21d8
Fixed conflicts and merged
2016-07-11 22:12:15 +05:30
Chatura Dilan
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
2016-07-08 19:11:40 +05:30
Chatura Dilan
ffedcac543
[maven-release-plugin] prepare release v1.1.1
2016-07-08 19:09:55 +05:30
mharindu
79a6da82f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-08 18:39:10 +05:30
mharindu
c7eef634ac
Added send-invitation endpoint
2016-07-08 18:38:00 +05:30
dilanua
c61ef1c98e
Fixing issues of GET /compliance-data API
2016-07-08 18:01:10 +05:30
Ace
58666bc4b0
Adding device name url param for device search
2016-07-08 14:57:43 +05:30
madhawap
c3cbc5b4fb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-08 14:29:53 +05:30
madhawap
0b1e4ad86b
Updated permissions.xml according to new end-points
2016-07-08 14:29:29 +05:30
Ace
d58fb57f4e
Enabling device search for multiple params
2016-07-08 10:09:46 +05:30
madhawap
e52fed0b2d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-07 19:51:57 +05:30
madhawap
34354c032e
Added end-point to get devices enrolled under a specific user
2016-07-07 19:46:22 +05:30
prabathabey
6edfad5fb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-07 13:10:30 +05:30
prabathabey
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
2016-07-07 13:10:19 +05:30
Dilan U. Ariyaratne
73551590b9
Merge pull request #313 from madhawap/master
...
Added end point to get Compliance Data Of a Device
2016-07-07 11:16:09 +05:30
madhawap
09e2d2ecaf
Removing the internal status code added to the compliance data wrapper
2016-07-07 11:14:43 +05:30
madhawap
68b7d304a0
Added end point to get Compliance Data Of a Device
2016-07-06 18:40:49 +05:30
prabathabey
0125310440
Prepending the url template configured for updating notifications with a '/'
2016-07-05 15:39:50 +05:30
prabathabey
78057b2992
Adding an API to return the list of device types registered in the underlying device management platform
2016-07-05 15:09:11 +05:30
mharindu
aa6085ac8c
Added scopes to APIs
2016-07-04 18:01:42 +05:30
mharindu
ff82accb48
added scopes to notification API
2016-07-04 14:11:51 +05:30
mharindu
60659ce15b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-04 14:09:44 +05:30
mharindu
fe28bc25f1
Refactored scopes
2016-07-04 14:06:30 +05:30
madhawap
2136ebbeee
changes to 'updateNotificationStatus' swagger annotations
2016-07-04 13:38:32 +05:30
mharindu
ac75ff1d71
Fixed conflict and merged
2016-07-03 15:09:05 +05:30
mharindu
49623a4693
Implemented scope based authorization
2016-07-03 15:03:47 +05:30
madhawap
b55a164457
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
2016-06-30 20:38:04 +05:30
madhawap
dbf938416b
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
2016-06-30 20:24:01 +05:30
prabathabey
be7e63c390
merging rest-api-improvements branch to master
2016-06-30 16:40:15 +05:30
prabathabey
ed5d611c35
Code cleanup
2016-06-29 18:05:09 +05:30
prabathabey
37852051ff
Improving Device and Policy Management APIs and cleaning up code of Role and User Management APIs
2016-06-29 17:49:34 +05:30
Chatura Dilan
f100853031
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2016-06-28 16:59:14 +05:30
dilanua
d34f29ab46
Fixing device types not retrieving issue
2016-06-28 16:50:53 +05:30
Chatura Dilan
bb6d2f2012
Fixed user search
2016-06-28 16:47:16 +05:30
madhawap
d9b35c29cd
swagger annotation fix to policy 'apply-changes' end point
2016-06-28 15:04:04 +05:30
madhawap
88feb5a852
Add Pagination to Notification end points
2016-06-28 13:15:06 +05:30
