charitha
|
3a319ebcc3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1
|
6 years ago |
WSO2 Builder
|
3401a8c845
|
[WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare for next development iteration
|
6 years ago |
WSO2 Builder
|
ecadadef94
|
[WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare release v3.1.37
|
6 years ago |
Geeth
|
b6c835d2ee
|
Merge pull request #1256 from geethkokila/master
Fix https://github.com/wso2/product-iots/issues/1857
|
6 years ago |
geethkokila
|
2f428c8a58
|
Fix https://github.com/wso2/product-iots/issues/1857
Filtering the activities based on the user who added the operation
|
6 years ago |
WSO2 Builder
|
2b6de6834b
|
[maven-release-plugin] prepare for next development iteration
|
6 years ago |
WSO2 Builder
|
16c6a27f81
|
[maven-release-plugin] prepare release v3.1.36
|
6 years ago |
Geeth
|
a421c12d5e
|
Merge pull request #1255 from charithag/iots-3.3.1
Update manager urls and product version
|
6 years ago |
charitha
|
3443af1ae2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1
|
6 years ago |
charitha
|
22f02c4062
|
Update manager urls and product version
|
6 years ago |
WSO2 Builder
|
252b260237
|
[WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare for next development iteration
|
6 years ago |
WSO2 Builder
|
a2422cb02a
|
[WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare release v3.1.35
|
6 years ago |
Geeth
|
f5515bfa5f
|
Merge pull request #1252 from abhishekdesilva/master
Checking for pending operations before adding an operation
|
6 years ago |
abhishekdesilva
|
85040f0c68
|
Log debug process completion
|
6 years ago |
abhishekdesilva
|
4aad82437b
|
Log info has changed into debug
|
6 years ago |
abhishekdesilva
|
a0bc1cdd20
|
Reformatted the code block as necessary
|
6 years ago |
WSO2 Builder
|
af7aa73886
|
[WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare for next development iteration
|
6 years ago |
WSO2 Builder
|
47ed74c156
|
[WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare release v3.1.34
|
6 years ago |
Charitha Goonetilleke
|
1885afbd77
|
Merge pull request #1254 from charithag/iots-3.3.1
Add secure web socket proxy to route ws connections in IoTS cluster
|
6 years ago |
charitha
|
d54d78a02b
|
Refactoring
|
6 years ago |
charitha
|
98dfced2b6
|
Remove unnecessary dependency
|
6 years ago |
charitha
|
82778f06c6
|
Add secure web socket proxy to route ws connections in IoTS cluster
|
6 years ago |
lasanthaDLPDS
|
9379c2ae47
|
Fix build failure
|
6 years ago |
lasanthaDLPDS
|
d293b5b1b8
|
Fix merge conflixts
|
6 years ago |
lasanthaDLPDS
|
797652b741
|
Merge branch 'application-mgt-new' of https://github.com/wso2/carbon-device-mgt into application-mgt-new
|
6 years ago |
WSO2 Builder
|
4848e271af
|
[WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare for next development iteration
|
6 years ago |
WSO2 Builder
|
c79baf3392
|
[WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare release v3.1.33
|
6 years ago |
Geeth
|
5d70a252ef
|
Merge pull request #1253 from geethkokila/master
Adding a audit trail for operation
|
6 years ago |
geethkokila
|
7d34928ac5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
6 years ago |
geethkokila
|
1d427aef73
|
Fix https://github.com/wso2/product-iots/issues/1852
|
6 years ago |
charitha
|
e858f5b627
|
Merge remote-tracking branch 'entgra/master' into entgra-master
|
6 years ago |
charitha
|
2cac0053ab
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master
# 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.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImplTest.java
|
6 years ago |
abhishekdesilva
|
870ff031bb
|
Checking for pending operations before adding an operation
|
6 years ago |
WSO2 Builder
|
02282967ab
|
[WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare for next development iteration
|
6 years ago |
WSO2 Builder
|
7daeb6efb9
|
[WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare release v3.1.32
|
6 years ago |
Geeth
|
3d63f38301
|
Merge pull request #1251 from charithag/iots-3.3.1
Bug fixes and improvements for Geo fencing
|
6 years ago |
charitha
|
d2940bf7a1
|
Refactoring
|
6 years ago |
charitha
|
47f619a136
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1
|
6 years ago |
charitha
|
8c0869649a
|
Update alert messages to convey proper meaning
|
6 years ago |
charitha
|
055d422e23
|
Publish geo alerts to cdm notifications
|
6 years ago |
Geeth
|
a553e9aada
|
Merge pull request #1250 from abhishekdesilva/master
Add archive pending operations configuration
|
6 years ago |
abhishekdesilva
|
fa9a52048e
|
Add archive pending operations configuration
|
6 years ago |
charitha
|
2a995deeb4
|
Prevent duplicate alerts & added owner field
|
6 years ago |
charitha
|
919fedee20
|
Improved geo-fencing performance
|
6 years ago |
charitha
|
ead01f837d
|
Fixed issue in Geo fencing
|
6 years ago |
WSO2 Builder
|
8da1bcb741
|
[WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare for next development iteration
|
6 years ago |
WSO2 Builder
|
9c0cbdc983
|
[WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare release v3.1.31
|
6 years ago |
Geeth
|
d67e9a806b
|
Merge pull request #1249 from abhishekdesilva/master
Archival and Purging Task Improvement
|
6 years ago |
abhishekdesilva
|
4c067f0f28
|
Archival/Purging Task Improvement
|
6 years ago |
charitha
|
2bfd598c67
|
Add location extraction from device properties and deice type specific location retrieval
|
6 years ago |