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