Commit Graph

5251 Commits

Author SHA1 Message Date
abhishekdesilva
a0bc1cdd20 Reformatted the code block as necessary 2018-08-21 09:53:23 +05:30
WSO2 Builder
af7aa73886 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare for next development iteration 2018-08-20 15:59:37 +00:00
WSO2 Builder
47ed74c156 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare release v3.1.34 2018-08-20 15:59:26 +00:00
charitha
d54d78a02b Refactoring 2018-08-20 21:16:08 +05:30
charitha
82778f06c6 Add secure web socket proxy to route ws connections in IoTS cluster 2018-08-20 15:44:55 +05:30
WSO2 Builder
4848e271af [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare for next development iteration 2018-08-13 10:09:29 +00:00
WSO2 Builder
c79baf3392 [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare release v3.1.33 2018-08-13 10:09:18 +00:00
geethkokila
7d34928ac5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-08-13 14:56:13 +05:30
geethkokila
1d427aef73 Fix https://github.com/wso2/product-iots/issues/1852 2018-08-13 14:55:00 +05:30
charitha
e858f5b627 Merge remote-tracking branch 'entgra/master' into entgra-master 2018-08-13 12:21:24 +05:30
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
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
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
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
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
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
GDLMadushanka
1ecb9b0495 Merge branch 'testCaseFixes' of https://github.com/GDLMadushanka/carbon-device-mgt into testCaseFixes 2018-03-28 10:09:09 +05:30
GDLMadushanka
05cffeb1e7 fix 2018-03-28 10:07:40 +05:30
GDLMadushanka
0fba2f1b24 Fix issues in test-cases 2018-03-28 10:00:09 +05:30
GDLMadushanka
4f591bd41d Fix issues in test-cases 2018-03-28 09:49:21 +05:30
WSO2 Builder
7431cde12a [WSO2 Release] [Jenkins #3001] [Release 3.1.26] prepare for next development iteration 2018-03-23 05:51:48 +00:00
WSO2 Builder
aa429e230c [WSO2 Release] [Jenkins #3001] [Release 3.1.26] prepare release v3.1.26 2018-03-23 05:51:38 +00:00
Madawa Soysa
6b579d760e Remove example part of the comment 2018-03-23 11:03:49 +05:30
Madawa Soysa
6b8d555314 Add a delay for data tables server side paging
DataTables library instantiates an ajax request for each key release when searching/filtering. in a system with a larger dataset, many requests are made to the back end for a longer keyword search which is a huge overload.

Also, sometimes since the request initialized for the first character returns the largest subset of data (if available) this request may take a longer time to process. Since DataTables update the table in the order that the response comes, the final result shown would be the last response received which can be incorrect.

This commit resolves the above issue by enabling a delay before the requests made using DataTables fnSetFilteringDelay plugin.
2018-03-22 18:33:21 +05:30
WSO2 Builder
7620d7ea5d [WSO2 Release] [Jenkins #2999] [Release 3.1.25] prepare for next development iteration 2018-03-20 06:51:22 +00:00
WSO2 Builder
5fd8aeef89 [WSO2 Release] [Jenkins #2999] [Release 3.1.25] prepare release v3.1.25 2018-03-20 06:51:13 +00:00
Rasika Perera
49584eb8f2
Merge pull request #1240 from rasika/master
Fix advanced operationsbar overlapping when multiple tables exists.
2018-03-20 11:51:31 +05:30
Rasika Perera
5f37af8fd1 Fixes for multiple datatables overlapping function call points 2018-03-20 11:50:44 +05:30
Rasika Perera
9e3b17c65d Fix advanced operationsbar overlapping when multiple tables exists. 2018-03-20 10:17:46 +05:30
WSO2 Builder
3201dfcfa9 [WSO2 Release] [Jenkins #2996] [Release 3.1.24] prepare for next development iteration 2018-03-20 02:16:46 +00:00
WSO2 Builder
86000e93b2 [WSO2 Release] [Jenkins #2996] [Release 3.1.24] prepare release v3.1.24 2018-03-20 02:16:36 +00:00
Rasika Perera
272d64b0b2 Fix PaginationRequest.getProperty() method doesn't return anything 2018-03-20 07:31:11 +05:30
WSO2 Builder
ac7e71282e [WSO2 Release] [Jenkins #2994] [Release 3.1.23] prepare for next development iteration 2018-03-16 12:27:13 +00:00
WSO2 Builder
1c135b9e18 [WSO2 Release] [Jenkins #2994] [Release 3.1.23] prepare release v3.1.23 2018-03-16 12:26:59 +00:00
geethkokila
54fc0be69f Fix the device information delete issue 2018-03-16 17:23:45 +05:30
WSO2 Builder
7dd3f29ff7 [WSO2 Release] [Jenkins #2992] [Release 3.1.22] prepare for next development iteration 2018-03-16 11:15:13 +00:00
WSO2 Builder
03dd153f6f [WSO2 Release] [Jenkins #2992] [Release 3.1.22] prepare release v3.1.22 2018-03-16 11:14:57 +00:00
Rasika Perera
4be47123b3
Merge pull request #1235 from rasika/master
Update carbon-device-mgt dependencies
2018-03-16 16:21:58 +05:30
WSO2 Builder
db8a5afdf8 [WSO2 Release] [Jenkins #2990] [Release 3.1.21] prepare for next development iteration 2018-03-16 10:36:01 +00:00
WSO2 Builder
bb0c498b3a [WSO2 Release] [Jenkins #2990] [Release 3.1.21] prepare release v3.1.21 2018-03-16 10:35:50 +00:00
Rasika Perera
f14564339a Fix formatting issues 2018-03-16 15:39:57 +05:30
Rasika Perera
703a4cbb12 Add further fixes for the jwt-grant dependency issue 2018-03-16 15:37:04 +05:30
Arcane94
f6de4bb424 minor change in a function 2018-03-16 15:17:58 +05:30
WSO2 Builder
10cf201da7 [WSO2 Release] [Jenkins #2988] [Release 3.1.20] prepare for next development iteration 2018-03-16 08:50:22 +00:00
WSO2 Builder
2c73d73860 [WSO2 Release] [Jenkins #2988] [Release 3.1.20] prepare release v3.1.20 2018-03-16 08:50:11 +00:00
WSO2 Builder
7a6e33ca49 Merge commit '790641a2aa9bba74f3dedb0f9a3c3fb9491cfd80' into 6975a622-1dc6-4b54-86ab-b5021d7e0e74 2018-03-16 08:38:14 +00:00
WSO2 Builder
790641a2aa [WSO2 Release] [Jenkins #2987] [Release 3.1.19] prepare for next development iteration 2018-03-16 08:23:46 +00:00
WSO2 Builder
efb54864c6 [WSO2 Release] [Jenkins #2987] [Release 3.1.19] prepare release v3.1.19 2018-03-16 08:23:35 +00:00
Rasika Perera
4c8fb7b5c2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-16 13:50:12 +05:30
Rasika Perera
df6e43eac5 Adding privacy policy and cookie policy 2018-03-16 13:49:53 +05:30
Madawa Soysa
e5eeb78d09 Generate nav menu icons based on correct permissions
This commit fixes the mismatching permissions which are checked while generating navigation menu icons.
- Correct the wrong permission string used for configuration management.
- Introduce a new UI permission for certificate management.
- Move device type link under "owning device permission" which is the permission declared in the JAX-RS implementation.

Resolves wso2/product-iots#1782
2018-03-16 13:36:38 +05:30
WSO2 Builder
7fe945f1bf [WSO2 Release] [Jenkins #2985] [Release 3.1.18] prepare for next development iteration 2018-03-15 22:28:55 +00:00
WSO2 Builder
555a349fd6 [WSO2 Release] [Jenkins #2985] [Release 3.1.18] prepare release v3.1.18 2018-03-15 22:28:45 +00:00
charitha
f62cb4febd Add missing media type 2018-03-16 01:46:41 +05:30
WSO2 Builder
f7f13f2052 [WSO2 Release] [Jenkins #2983] [Release 3.1.17] prepare for next development iteration 2018-03-15 17:52:55 +00:00
WSO2 Builder
d44ac973cb [WSO2 Release] [Jenkins #2983] [Release 3.1.17] prepare release v3.1.17 2018-03-15 17:52:45 +00:00
Rasika Perera
6316daa13a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-15 23:07:06 +05:30
Rasika Perera
b865dc7823 Update license header 2018-03-15 23:04:38 +05:30
Rasika Perera
583b17d405 Add login.do, retry.do and consent.do
This implements following fixes/improvements;
* Adding an intermediate for user to accept consents.
* Fixing issue of not redirected to the consent.do
* Authentication failure page
2018-03-15 23:02:16 +05:30
WSO2 Builder
a51a3cd6a4 [WSO2 Release] [Jenkins #2981] [Release 3.1.16] prepare for next development iteration 2018-03-15 16:58:58 +00:00
WSO2 Builder
f416cecb9e [WSO2 Release] [Jenkins #2981] [Release 3.1.16] prepare release v3.1.16 2018-03-15 16:58:48 +00:00
charitha
481d381ca7 Fixed exception in subscribing APIs 2018-03-15 20:21:18 +05:30
WSO2 Builder
41358a41a5 [WSO2 Release] [Jenkins #2979] [Release 3.1.15] prepare for next development iteration 2018-03-15 11:37:04 +00:00
WSO2 Builder
d679faecca [WSO2 Release] [Jenkins #2979] [Release 3.1.15] prepare release v3.1.15 2018-03-15 11:36:53 +00:00
geethkokila
7aab14c07d Fix the path parameter 2018-03-15 16:50:04 +05:30
WSO2 Builder
5a1b4b154e [WSO2 Release] [Jenkins #2977] [Release 3.1.14] prepare for next development iteration 2018-03-15 09:37:25 +00:00
WSO2 Builder
50232e10a5 [WSO2 Release] [Jenkins #2977] [Release 3.1.14] prepare release v3.1.14 2018-03-15 09:37:14 +00:00
Ruwan Yatawara
88924ac8d6 Correcting issue with events resource path 2018-03-15 14:31:44 +05:30
WSO2 Builder
f265ddc736 [WSO2 Release] [Jenkins #2975] [Release 3.1.13] prepare for next development iteration 2018-03-14 20:15:12 +00:00
WSO2 Builder
221fb27c6c [WSO2 Release] [Jenkins #2975] [Release 3.1.13] prepare release v3.1.13 2018-03-14 20:14:58 +00:00
geethkokila
dbf4ff0132 Add a temporary fix for api subscription issue 2018-03-15 01:28:05 +05:30
WSO2 Builder
7d1183274d [WSO2 Release] [Jenkins #2973] [Release 3.1.12] prepare for next development iteration 2018-03-14 17:51:27 +00:00
WSO2 Builder
1e875dc00b [WSO2 Release] [Jenkins #2973] [Release 3.1.12] prepare release v3.1.12 2018-03-14 17:51:16 +00:00
Dharmakeerhi Lasantha
e9e7368b55
Merge pull request #1226 from geethkokila/master
Fix the api publishing issue
2018-03-14 23:07:42 +05:30
geethkokila
9dcc9d9ddc Fix the api publishing issue 2018-03-14 23:05:50 +05:30
WSO2 Builder
1c3bca244a [WSO2 Release] [Jenkins #2971] [Release 3.1.11] prepare for next development iteration 2018-03-14 17:01:33 +00:00
WSO2 Builder
4140ba7e76 [WSO2 Release] [Jenkins #2971] [Release 3.1.11] prepare release v3.1.11 2018-03-14 17:01:23 +00:00
Rasika Perera
5d1e4ed99e
Merge pull request #1225 from rasika/master
Adding filter value options for data-dep-status and data-boolean
2018-03-14 22:16:26 +05:30
Rasika Perera
b04af49594 Fix minor formatting issue 2018-03-14 22:15:16 +05:30
Rasika Perera
f3da8d4a57 Adding filter value options for data-dep-status and data-boolean 2018-03-14 22:07:20 +05:30
WSO2 Builder
d2163025f2 [WSO2 Release] [Jenkins #2969] [Release 3.1.10] prepare for next development iteration 2018-03-14 15:15:04 +00:00
WSO2 Builder
494b4db66b [WSO2 Release] [Jenkins #2969] [Release 3.1.10] prepare release v3.1.10 2018-03-14 15:14:53 +00:00
charitha
47de05c2e1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 17:50:32 +05:30
charitha
f6d5498240 Add privacy policy consent 2018-03-14 17:50:17 +05:30
WSO2 Builder
31f11433bb [WSO2 Release] [Jenkins #2967] [Release 3.1.9] prepare for next development iteration 2018-03-14 11:23:00 +00:00
WSO2 Builder
a3773032ce [WSO2 Release] [Jenkins #2967] [Release 3.1.9] prepare release v3.1.9 2018-03-14 11:22:50 +00:00
Geeth
d69ce0b9a1
Merge pull request #1223 from charithag/master
Updated API Publisher & Store extensions after bumping versions
2018-03-14 16:38:37 +05:30
WSO2 Builder
fa014fb838 [WSO2 Release] [Jenkins #2965] [Release 3.1.8] prepare for next development iteration 2018-03-14 10:29:02 +00:00
WSO2 Builder
e2218ed497 [WSO2 Release] [Jenkins #2965] [Release 3.1.8] prepare release v3.1.8 2018-03-14 10:28:52 +00:00
WSO2 Builder
eac2de37b2 Merge commit 'a73300b693013ab64bdf11dab9f626e4837eec04' into 34580e6a-6593-4c6a-8b11-5da48c102194 2018-03-14 10:16:37 +00:00
WSO2 Builder
a73300b693 [WSO2 Release] [Jenkins #2964] [Release 3.1.7] prepare for next development iteration 2018-03-14 09:53:11 +00:00
WSO2 Builder
fa5300cec1 [WSO2 Release] [Jenkins #2964] [Release 3.1.7] prepare release v3.1.7 2018-03-14 09:52:58 +00:00
charitha
3fda0a1459 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 15:14:25 +05:30
Rasika Perera
108675261f
Merge pull request #1193 from lashanfaliq95/master
Updated the last-known api to be able to return a number of records.
2018-03-14 15:14:07 +05:30
charitha
6f19ca3e20 Fixed test failures 2018-03-14 15:13:27 +05:30
WSO2 Builder
8282e69e12 Merge commit '46c4111b1dbaf85b9c413254f376c651488a5f57' into e61b2ead-a0d6-41af-8fb3-d2c404e569e2 2018-03-14 09:33:55 +00:00
lashanfaliq95
d60b885045 changed the parameters "type" and "deviceId" as required for the last-know api. 2018-03-14 14:44:47 +05:30
WSO2 Builder
46c4111b1d [WSO2 Release] [Jenkins #2963] [Release 3.1.6] prepare for next development iteration 2018-03-14 09:08:39 +00:00
WSO2 Builder
28ec21a4f3 [WSO2 Release] [Jenkins #2963] [Release 3.1.6] prepare release v3.1.6 2018-03-14 09:08:27 +00:00
Rasika Perera
5ea66b2125
Merge pull request #1214 from n-jay/dep-ui2
UI implementation for DEP management of iOS devices
2018-03-14 14:22:12 +05:30
Rasika Perera
815cea8ab1
Merge pull request #1215 from Arcane94/geoFencing
Adding geofencing feature to geo devices dashboard
2018-03-14 14:20:39 +05:30
geethkokila
7cb9685bc6 Fix the api publisher and store update 2018-03-14 14:13:04 +05:30
Ruwan
af4f3302ad
Merge pull request #1222 from rasika/master
Adding an extension point into the PaginationRequest class
2018-03-14 13:59:10 +05:30
lashanfaliq95
b4f78337fa last-known api
updated the comment of the api and handled the error when a negative
value is passed as the limit.
2018-03-14 13:49:11 +05:30
Rasika Perera
e996f1f9f0 Adding an extension point into the PaginationRequest class
This allows other APIs which has additional parameters to be passed into
the backend DAOs
2018-03-14 13:20:11 +05:30
Arcane94
50a14e4321 Requested changes 2018-03-14 12:05:21 +05:30
Arcane94
e778700a5e Some more license year changes 2018-03-14 12:05:21 +05:30
Arcane94
0aff4193d3 License year changes and comment changes 2018-03-14 12:05:21 +05:30
Arcane94
8c303911b0 Final frontend and backend changes 2018-03-14 12:05:21 +05:30
Arcane94
1ffaad6fb7 rolling back some imports 2018-03-14 11:59:54 +05:30
Arcane94
27ae7cfed8 Fix for adding alerts twice with same name bug 2018-03-14 11:57:01 +05:30
Arcane94
9e64c8971d Minor changes in execution plans 2018-03-14 11:46:38 +05:30
Arcane94
7c88dfa0b3 Minor changes in backend APIs 2018-03-14 11:46:38 +05:30
Arcane94
7583957e16 Execution Plans and other updates 2018-03-14 11:46:38 +05:30