community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,541 Commits 31 Branches 461 Tags 183 MiB
b90f188e9b
Commit Graph

6541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
 2018-08-13 12:20:51 +05:30
abhishekdesilva
870ff031bb Checking for pending operations before adding an operation 2018-08-13 11:15:06 +05:30
WSO2 Builder
02282967ab [WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare for next development iteration 2018-08-13 04:48:34 +00:00
WSO2 Builder
7daeb6efb9 [WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare release v3.1.32 2018-08-13 04:48:24 +00:00
Geeth
3d63f38301
Merge pull request #1251 from charithag/iots-3.3.1 
Bug fixes and improvements for Geo fencing
 2018-08-13 10:03:46 +05:30
charitha
d2940bf7a1 Refactoring 2018-08-13 09:44:40 +05:30
charitha
47f619a136 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-08-11 08:29:45 +05:30
charitha
8c0869649a Update alert messages to convey proper meaning 2018-08-10 19:37:05 +05:30
charitha
055d422e23 Publish geo alerts to cdm notifications 2018-08-10 15:26:04 +05:30
Geeth
a553e9aada
Merge pull request #1250 from abhishekdesilva/master 
Add archive pending operations configuration
 2018-08-08 11:33:17 +05:30
abhishekdesilva
fa9a52048e Add archive pending operations configuration 2018-08-08 11:10:56 +05:30
charitha
2a995deeb4 Prevent duplicate alerts & added owner field 2018-08-03 22:31:24 +05:30
charitha
919fedee20 Improved geo-fencing performance 2018-07-31 16:00:12 +05:30
charitha
ead01f837d Fixed issue in Geo fencing 2018-07-26 12:23:47 +05:30
WSO2 Builder
8da1bcb741 [WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare for next development iteration 2018-07-26 06:48:42 +00:00
WSO2 Builder
9c0cbdc983 [WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare release v3.1.31 2018-07-26 06:48:31 +00:00
Geeth
d67e9a806b
Merge pull request #1249 from abhishekdesilva/master 
Archival and Purging Task Improvement
 2018-07-26 12:03:23 +05:30
abhishekdesilva
4c067f0f28 Archival/Purging Task Improvement 2018-07-25 21:15:49 +05:30
charitha
2bfd598c67 Add location extraction from device properties and deice type specific location retrieval 2018-07-23 11:35:17 +05:30
charitha
bccb88ab22 Fixed build issue due to okio 2018-07-23 11:35:06 +05:30
charitha
9623fb294a Fixed build issue due to okhttp 2018-07-23 11:34:47 +05:30
Charitha Wijesinghe
d971c62009 Add device event filter API 
See merge request entgra/carbon-device-mgt!2
 2018-07-23 06:02:23 +00:00
lashanfaliq95
d843b71e1f remove stack trace 2018-07-20 16:15:07 +05:30
lashanfaliq95
1fedf9650c remove wildcard imports and log the error msg in filter api 2018-07-20 10:05:18 +05:30
lashanfaliq95
c8d0b10a38 update the device filter api 2018-07-16 18:08:52 +05:30
lashanfaliq95
3a7136abf9 complete the event filter 2018-07-15 10:58:09 +05:30
lashanfaliq95
e1ffd6341d filter implementation which gets all records and based on the timestamp 2018-07-13 17:50:39 +05:30
lashanfaliq95
431342fd0f filter implementation which gets all records 2018-07-11 19:51:12 +05:30
charitha
796acbda16 Add location extraction from device properties and deice type specific location retrieval 2018-07-11 10:28:14 +05:30
charitha
ed75a9a7b2 Update Entgra nexus url 2018-07-11 10:27:11 +05:30
lashanfaliq95
c6a1508ee7 add the filter api 2018-07-11 09:26:01 +05:30
charitha
598632fc36 Fixed build issue due to okio 2018-07-07 09:23:44 +05:30
charitha
636e71883c Fixed build issue due to okhttp 2018-07-06 22:40:07 +05:30
charitha
1cbf501661 Update configs for entgra 2018-07-06 22:39:47 +05:30
charitha
5552b382ad Add maven snapshot deployment to nexus 2018-07-06 12:53:44 +05:30
Charitha Wijesinghe
18922b7738 Add .gitlab-ci.yml 2018-06-05 04:10:02 +00:00
WSO2 Builder
0aec365dce [WSO2 Release] [Jenkins #3009] [Release 3.1.30] prepare for next development iteration 2018-05-15 08:24:46 +00:00
WSO2 Builder
ca890ac346 [WSO2 Release] [Jenkins #3009] [Release 3.1.30] prepare release v3.1.30 2018-05-15 08:24:36 +00:00
Rasika Perera
88496d2ba5
Merge pull request #1246 from madhawap/master 
Make proxy configuration optional
 2018-05-15 13:41:14 +05:30
madhawap
b2a12f09e4 Make proxy configuration optional 
As per the current configurations it is mandatory to set a value for http.nonProxyHosts property in order to server to run on 'change-ip' mode. With this modification it is made optional where even without this property IoT server can be run on 'change-ip' mode. 'Change-ip' mode is where server is configured to run on a different IP other than localhost
 2018-05-15 13:23:41 +05:30
WSO2 Builder
2e5db59398 [WSO2 Release] [Jenkins #3007] [Release 3.1.29] prepare for next development iteration 2018-04-18 10:06:19 +00:00
WSO2 Builder
964d92eb7f [WSO2 Release] [Jenkins #3007] [Release 3.1.29] prepare release v3.1.29 2018-04-18 10:06:04 +00:00
Madhawa Perera
b87763dba1
Add capability to WSO2 IOT server to route HTTP/HTTPS calls through Proxy server (#1244) 
* Fix IoT Server HTTP/HTTPS calls bypassing a Proxy server

Since the Feign client is not supporting proxy routing this fix has included okhttp client and pass it to the feigns okkhttp client wrapper in order to pass HTTP/HTTPS call through proxy server if the system proxy properties are set. Further this modifies the apache http client also to pick system properties.

fixes wso2/product-iots#1806

* Remove unwanted comments and commented lines

* Remove the localhost host check

* Add default non proxy hosts

Added localhost as a default non proxy host

* use the version property from parent pom

Use the version property, "github.openfeign.version" from parent pom instead of hard-coding the version range
 2018-04-18 15:18:59 +05:30
WSO2 Builder
79d48bb1a8 [WSO2 Release] [Jenkins #3005] [Release 3.1.28] prepare for next development iteration 2018-03-28 08:36:21 +00:00
WSO2 Builder
f05750b794 [WSO2 Release] [Jenkins #3005] [Release 3.1.28] prepare release v3.1.28 2018-03-28 08:36:10 +00:00
Rasika Perera
ceb2ff5d9c
Merge pull request #1243 from rasika/master 
Hide 'Select All' option when there're only single mandatory claim.
 2018-03-28 13:51:55 +05:30
Rasika Perera
a22b2b324d Hide 'Select All' option when there're only single mandatory claim. 2018-03-28 12:46:26 +05:30
WSO2 Builder
2fcb647957 [WSO2 Release] [Jenkins #3003] [Release 3.1.27] prepare for next development iteration 2018-03-28 05:13:35 +00:00
WSO2 Builder
2f519baf67 [WSO2 Release] [Jenkins #3003] [Release 3.1.27] prepare release v3.1.27 2018-03-28 05:13:25 +00:00
Megala Uthayakumar
9ef622da4d
Merge pull request #1242 from GDLMadushanka/testCaseFixes 
Fix issues in test-cases
 2018-03-28 10:29:18 +05:30