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
8,035 Commits 31 Branches 461 Tags 183 MiB
b127c3015e
Commit Graph

4532 Commits

Author SHA1 Message Date
WSO2 Builder
252b260237 [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare for next development iteration 2018-08-22 10:22:19 +00:00
WSO2 Builder
a2422cb02a [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare release v3.1.35 2018-08-22 10:22:09 +00:00
Geeth
f5515bfa5f
Merge pull request #1252 from abhishekdesilva/master 
Checking for pending operations before adding an operation
 2018-08-22 15:37:21 +05:30
abhishekdesilva
85040f0c68 Log debug process completion 2018-08-21 15:00:14 +05:30
abhishekdesilva
4aad82437b Log info has changed into debug 2018-08-21 14:46:18 +05:30
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
lasanthaDLPDS
d293b5b1b8 Fix merge conflixts 2018-08-19 15:06:25 +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 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
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
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
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
0fba2f1b24 Fix issues in test-cases 2018-03-28 10:00:09 +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
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
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
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
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
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
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
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
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
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
Arcane94
790f91b3b7 Add method overloads 2018-03-14 11:46:38 +05:30
WSO2 Builder
10f32aa150 [WSO2 Release] [Jenkins #2961] [Release 3.1.5] prepare for next development iteration 2018-03-14 06:01:28 +00:00
WSO2 Builder
b2c969ef85 [WSO2 Release] [Jenkins #2961] [Release 3.1.5] prepare release v3.1.5 2018-03-14 06:01:18 +00:00
Charitha Goonetilleke
6922a8693f
Merge pull request #1221 from geethkokila/master 
Add GDPR fixes
 2018-03-14 05:46:06 +00:00
n-jay
84c683a02b Edit nav-menu to include change DEP management page visibility logic 2018-03-14 11:03:37 +05:30
n-jay
43feaf7bc7 Add DEP management icon to navmenu 
The DEP management page is formed once the iOS plugin has been deployed
within the IoT Home. Till then, any functionality with regards to DEP
management is not present within the server.
An icon in the navmenu allows users to access the DEP management page.

This commit includes the feature where the navmenu detects if the iOS
plugin has been deployed and accordingly displays the icon to access
the DEP management page.
 2018-03-14 10:56:47 +05:30
WSO2 Builder
ffb28d018b [WSO2 Release] [Jenkins #2959] [Release 3.1.4] prepare for next development iteration 2018-03-14 04:57:03 +00:00
WSO2 Builder
66591d3680 [WSO2 Release] [Jenkins #2959] [Release 3.1.4] prepare release v3.1.4 2018-03-14 04:56:53 +00:00
geethkokila
ec3f814133 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 10:05:48 +05:30
Charitha Goonetilleke
329e41b04c
Merge pull request #1197 from Arcane94/master 
Fixed https://github.com/wso2/carbon-device-mgt/issues/1194
 2018-03-14 04:25:21 +00:00
n-jay
280a63bdbd Remove UI API scopes from config file 2018-03-13 15:13:22 +05:30
Lashan Faliq
51753ebbbf Merge branch 'master' into master 2018-03-13 14:48:50 +05:30
n-jay
a36a5aa279 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-13 12:23:41 +05:30
Kamidu Sachith Punchihewa
5bd42415b2
Merge pull request #1209 from lasanthaDLPDS/master 
Fix formatting issues
 2018-03-13 11:05:23 +05:30
n-jay
69ac1edc9b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-13 09:48:19 +05:30
WSO2 Builder
0f272ff4ed [WSO2 Release] [Jenkins #2954] [Release 3.1.3] prepare for next development iteration 2018-03-13 04:16:58 +00:00
WSO2 Builder
ac9d20af2f [WSO2 Release] [Jenkins #2954] [Release 3.1.3] prepare release v3.1.3 2018-03-13 04:16:48 +00:00
WSO2 Builder
bbe144e25f [WSO2 Release] [Jenkins #2952] [Release 3.1.2] prepare for next development iteration 2018-03-12 11:42:26 +00:00
WSO2 Builder
7ee1bdacb6 [WSO2 Release] [Jenkins #2952] [Release 3.1.2] prepare release v3.1.2 2018-03-12 11:42:16 +00:00
WSO2 Builder
b31c31b410 [WSO2 Release] [Jenkins #2951] [Release 3.1.1] prepare for next development iteration 2018-03-12 11:15:23 +00:00
WSO2 Builder
ab8cd3f8e3 [WSO2 Release] [Jenkins #2951] [Release 3.1.1] prepare release v3.1.1 2018-03-12 11:15:13 +00:00
lasantha
04527696eb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-12 16:36:33 +05:30
WSO2 Builder
748798df4c [WSO2 Release] [Jenkins #2949] [Release 3.1.0] prepare for next development iteration 2018-03-12 09:51:53 +00:00
WSO2 Builder
e0704671de [WSO2 Release] [Jenkins #2949] [Release 3.1.0] prepare release v3.1.0 2018-03-12 09:51:43 +00:00
geethkokila
71f1ff96e6 Update device-mgt component version (3.1.0) 2018-03-12 14:57:21 +05:30
n-jay
7eab9e914d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-12 14:29:08 +05:30
n-jay
fedd2a3257 Added iOS DEP management page to navbar 2018-03-12 14:28:24 +05:30
n-jay
1cfcc3a599 Added iOS DEP API scopes in UI config file 2018-03-12 14:27:12 +05:30
WSO2 Builder
9ba315217c [WSO2 Release] [Jenkins #2947] [Release 3.0.244] prepare for next development iteration 2018-03-12 08:42:09 +00:00
WSO2 Builder
96ee898b50 [WSO2 Release] [Jenkins #2947] [Release 3.0.244] prepare release v3.0.244 2018-03-12 08:41:56 +00:00
geethkokila
7a25109882 Changing the carbon commons versions and api-registration endpoint 2018-03-12 11:30:28 +05:30
lasantha
8efcfca877 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-11 01:10:33 +05:30
WSO2 Builder
93422ae12d [WSO2 Release] [Jenkins #2945] [Release 3.0.243] prepare for next development iteration 2018-03-09 12:28:00 +00:00
WSO2 Builder
e4bc050806 [WSO2 Release] [Jenkins #2945] [Release 3.0.243] prepare release v3.0.243 2018-03-09 12:27:50 +00:00
Madhawa Perera
3fa513cabd
Fix UI loading issue on Safari 11.0.3 (#1212) 
* Fix UI loading issue on Safari 11.0.3

Fix the issue of operation logs and location doesn't display on device detail page on safari browser 11.0.3

Fixes wso2/product-iots#1752

* Add comments describing code lines
 2018-03-09 17:43:33 +05:30
Arcane94
2fb5ec431a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-09 14:46:56 +05:30
WSO2 Builder
873bff0042 [WSO2 Release] [Jenkins #2943] [Release 3.0.242] prepare for next development iteration 2018-03-08 14:28:50 +00:00
WSO2 Builder
8b63813d84 [WSO2 Release] [Jenkins #2943] [Release 3.0.242] prepare release v3.0.242 2018-03-08 14:28:40 +00:00
shavidissa
b9cde9b936 Updated the swagger content - Groups (#1211) 
* Updated the swagger content for the APIs used to add devices to groups

* Formatting the swagger content
 2018-03-08 19:45:14 +05:30
lasantha
24a9a7f23d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-08 13:43:08 +05:30
geethkokila
9f9fd963a9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-08 10:22:36 +05:30
WSO2 Builder
997bf0d16b [WSO2 Release] [Jenkins #2941] [Release 3.0.241] prepare for next development iteration 2018-03-08 04:29:13 +00:00
WSO2 Builder
aabdc33dc1 [WSO2 Release] [Jenkins #2941] [Release 3.0.241] prepare release v3.0.241 2018-03-08 04:29:02 +00:00
Shavindri Dissanayake
ead0e202d6 updating the swagger content 2018-03-07 19:34:45 +05:30
Arcane94
1716fc4500 logic changes of the fix 2018-03-05 16:46:50 +05:30
Arcane94
c0024ce26f Exception name change and minor modifications 2018-03-05 10:42:26 +05:30
geethkokila
b50c657b6b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-05 10:09:22 +05:30
lasantha
831fdcb335 Fix the issue in device-mgt-v0.9 copyright text 2018-03-05 01:29:32 +05:30
lasantha
c86c976fe6 Format the source of geofence 2018-03-05 00:29:16 +05:30
WSO2 Builder
af430cba61 [WSO2 Release] [Jenkins #2939] [Release 3.0.240] prepare for next development iteration 2018-03-03 19:12:01 +00:00
WSO2 Builder
60190f36ef [WSO2 Release] [Jenkins #2939] [Release 3.0.240] prepare release v3.0.240 2018-03-03 19:11:50 +00:00
charitha
ab4f2b4833 Add response status to device property update API and improve db connection handling in device property update 2018-03-03 22:47:32 +05:30
charitha
dbc08da314 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-03 22:43:05 +05:30
WSO2 Builder
cafbfebfb1 [WSO2 Release] [Jenkins #2937] [Release 3.0.239] prepare for next development iteration 2018-03-03 16:24:17 +00:00
WSO2 Builder
08e9f918cf [WSO2 Release] [Jenkins #2937] [Release 3.0.239] prepare release v3.0.239 2018-03-03 16:24:06 +00:00
Rasika Perera
d3de6ea7f9
Merge pull request #1207 from rasika/rasika-geo 
Fixing minor UI issue in Geo Analytics
 2018-03-03 21:43:29 +05:30
Rasika Perera
97767fa6d4
Fixing minor UI issue in Geo Analytics 2018-03-03 21:27:23 +05:30
WSO2 Builder
ce73acb26e [WSO2 Release] [Jenkins #2935] [Release 3.0.238] prepare for next development iteration 2018-03-03 06:51:15 +00:00
WSO2 Builder
15de1dfd83 [WSO2 Release] [Jenkins #2935] [Release 3.0.238] prepare release v3.0.238 2018-03-03 06:51:05 +00:00
Madawa Soysa
e617273c3d Fix policy view interface loading issue (#1206) 
* Fix policy view interface loading issue

When the policy view page is loaded some of the variables of the policyPayloadObj becomes undefined or null.  This commit checks for the empty and undefined variables.

Relates wso2/product-iots#1681

* Fix formatting issues
 2018-03-03 12:09:54 +05:30
charitha
ad3f7928f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-02 17:46:21 +05:30
geethkokila
5fdf91d4ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-02 12:10:53 +05:30
WSO2 Builder
0bbdf7a65f [WSO2 Release] [Jenkins #2933] [Release 3.0.237] prepare for next development iteration 2018-03-01 17:52:06 +00:00
WSO2 Builder
13e63e41ac [WSO2 Release] [Jenkins #2933] [Release 3.0.237] prepare release v3.0.237 2018-03-01 17:51:55 +00:00
Arcane94
46dbbdbcb8 Year change in license details 2018-03-01 23:15:14 +05:30
lasantha
9c85c4afdd Fix operation log and device view displaying issue 
As a result of syntax issue, device view and operation logs viewing is broken. Therefore fixed the syntax issue.

This Resolves wso2/product-iots#1728
 2018-03-01 22:14:36 +05:30
WSO2 Builder
9a06578ac2 [WSO2 Release] [Jenkins #2931] [Release 3.0.236] prepare for next development iteration 2018-02-28 17:32:14 +00:00
WSO2 Builder
5d36bd5312 [WSO2 Release] [Jenkins #2931] [Release 3.0.236] prepare release v3.0.236 2018-02-28 17:32:02 +00:00
Rasika Perera
f8840547cf
Merge pull request #1204 from rasika/master 
Add search by device name filter
 2018-02-28 22:43:56 +05:30
Rasika Perera
170e6d5349 Add search by device name filter 2018-02-28 22:37:02 +05:30
WSO2 Builder
b7e85c213b [WSO2 Release] [Jenkins #2929] [Release 3.0.235] prepare for next development iteration 2018-02-28 16:54:14 +00:00
WSO2 Builder
b70e0252c4 [WSO2 Release] [Jenkins #2929] [Release 3.0.235] prepare release v3.0.235 2018-02-28 16:54:02 +00:00
Rasika Perera
88e1b925bb
Merge pull request #1202 from rasika/fix-1724 
Fix the issue of an error printed when shutting down the IoT Server
 2018-02-28 22:13:50 +05:30
Rasika Perera
f766e4c10e
Merge pull request #1203 from lasanthaDLPDS/master 
Adding debug logs and formatting the source
 2018-02-28 22:13:28 +05:30
WSO2 Builder
d2f18ddbc9 [WSO2 Release] [Jenkins #2927] [Release 3.0.234] prepare for next development iteration 2018-02-28 14:52:48 +00:00
WSO2 Builder
8f1f8eefe4 [WSO2 Release] [Jenkins #2927] [Release 3.0.234] prepare release v3.0.234 2018-02-28 14:52:38 +00:00
WSO2 Builder
62c9ed3e1e Merge commit '30bb2a866566422f83a21ac95ee661c28572e5ff' into 21083545-a8aa-47e3-8c3d-99350689e63e 2018-02-28 14:41:13 +00:00
WSO2 Builder
30bb2a8665 [WSO2 Release] [Jenkins #2926] [Release 3.0.233] prepare for next development iteration 2018-02-28 14:28:44 +00:00
lasantha
fc982eab67 remove unnecessary empty lines 2018-02-28 19:58:40 +05:30
WSO2 Builder
a325b3c6c0 [WSO2 Release] [Jenkins #2926] [Release 3.0.233] prepare release v3.0.233 2018-02-28 14:28:32 +00:00
lasantha
8df53899d6 remove unnecessary imports 2018-02-28 19:56:18 +05:30
lasantha
0ce103e1ad Format the source code 
In order to equivalent with WSO2 coding standards modified the source code
 2018-02-28 19:53:35 +05:30
Rasika Perera
6e6b9e963e
Merge pull request #1201 from rasika/master 
Update documentation anchor links
 2018-02-28 19:50:25 +05:30
Rasika Perera
7696319021
Merge pull request #1200 from milanperera/r-320 
Fix issues in data archival feature
 2018-02-28 19:47:17 +05:30
lasantha
18b1f7830d Add debug logs for Device Management Plugin Repository 
It is important to have debugged logs when finding the root causes for some issues.Hence added those to the Device Management Plugin Repository.
 2018-02-28 19:44:55 +05:30
Rasika Perera
7ad790be54 Fix error log printed when undeploying the devicemgt provider 
Resolves https://github.com/wso2/product-iots/issues/1724

(cherry picked from commit c72d4ea)
 2018-02-28 19:41:04 +05:30
Rasika Perera
028ae524c2 Updating v3.1.0 into v.3.2.0 2018-02-28 19:10:31 +05:30
WSO2 Builder
8a06a494c4 [WSO2 Release] [Jenkins #2924] [Release 3.0.232] prepare for next development iteration 2018-02-28 13:06:34 +00:00
WSO2 Builder
f7e3cd9c3c [WSO2 Release] [Jenkins #2924] [Release 3.0.232] prepare release v3.0.232 2018-02-28 13:06:24 +00:00
Rasika Perera
166b7b6891 Updating doc links 
Resolving https://github.com/wso2/product-iots/issues/1694
 2018-02-28 18:10:36 +05:30
Milan Perera
415aac1ce0 Fix issues in data archival feature 
There were few issues regarding the data retreiving SQL query and archived config operations
 2018-02-28 18:09:10 +05:30
geethkokila
3610d68fe6 Add alert ui view for the cookie policy and privacy policy 
This changes the styles and wording for the privacy and cookie policy
 2018-02-28 12:25:27 +05:30
geethkokila
b5dfe80e3d Add privacy and cookie policy url 
Adding the cookie and privacy policy url to the register page
 2018-02-28 10:33:10 +05:30
geethkokila
a277e7996a Add privacy and cookie policy url 
Adding the cookie and privacy policy url to the login page
 2018-02-28 10:27:10 +05:30
geethkokila
b78e6d6d01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-02-27 14:36:13 +05:30
kamidu
8bab4601f4 Removing unsupported js operations 
To enable IE support removed the => operation frommthe logic
 2018-02-26 23:17:29 +05:30
kamidu
967582d0c3 changing the java scrip to support IE 
The current or each funtion is not supported my IE and EGDE browsers so we replace that logic with JQuery each to suport IE and EDGE browsers
 2018-02-26 15:45:23 +05:30
Arcane94
832eb0c6a8 Adding license details to AlertAlreadyExist class 2018-02-24 15:29:09 +05:30
Arcane94
50503fc7c0 Fixing the issue when defining alerts with same name 2018-02-24 15:15:36 +05:30
lashanfaliq95
7a1c17081b fixed the issues 2018-02-23 18:15:15 +05:30
WSO2 Builder
6b99197b54 [WSO2 Release] [Jenkins #2922] [Release 3.0.231] prepare for next development iteration 2018-02-23 10:20:25 +00:00
WSO2 Builder
313918c656 [WSO2 Release] [Jenkins #2922] [Release 3.0.231] prepare release v3.0.231 2018-02-23 10:20:15 +00:00
WSO2 Builder
13a116c7e3 Merge commit 'f0cbe36ebee1f2dde088a9f70d9009350d998775' into c95329e5-bd9c-4d79-820a-d63940dc2c8c 2018-02-23 10:07:54 +00:00
Madawa Soysa
de9480e721
Merge pull request #1196 from lasanthaDLPDS/master 
Formatting device-location API
 2018-02-23 15:26:07 +05:30
WSO2 Builder
f0cbe36ebe [WSO2 Release] [Jenkins #2921] [Release 3.0.230] prepare for next development iteration 2018-02-23 09:56:02 +00:00
WSO2 Builder
a688f56892 [WSO2 Release] [Jenkins #2921] [Release 3.0.230] prepare release v3.0.230 2018-02-23 09:55:52 +00:00
Kamidu Sachith Punchihewa
22929c3886
Merge pull request #1192 from Kamidu/master 
Enable user's last name in the email template
 2018-02-23 15:13:06 +05:30
lasantha
175c987b8a formatting device-location API 2018-02-23 14:29:49 +05:30
lashanfaliq95
65cfca7024 Updated the last-known api to be able to return a number of records. 2018-02-23 09:00:18 +05:30
geethkokila
2c0ca5c210 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-02-23 08:49:22 +05:30
WSO2 Builder
12e8639907 [WSO2 Release] [Jenkins #2919] [Release 3.0.229] prepare for next development iteration 2018-02-22 16:42:34 +00:00
WSO2 Builder
4f364288c5 [WSO2 Release] [Jenkins #2919] [Release 3.0.229] prepare release v3.0.229 2018-02-22 16:42:24 +00:00
Madawa Soysa
cecb988a01
Merge pull request #1188 from rasika/fix-1689 
Fixing issue of the platform filter in devices listing page
 2018-02-22 21:53:15 +05:30
kamidu
66a4e60b16 Enable user's last name in the email template 
This is to enable the user's last name also to be included in the meta information list on email templates. When customizing the email template users can define to include both fist and last name to the content or title of the email
 2018-02-22 17:53:24 +05:30
geethkokila
8cf1bd996c Adding the privacy api 
This is has an api to delete device of users when they request
 2018-02-22 15:54:09 +05:30
geethkokila
1d605d0921 Fixing the issue where Enrollment ID is not inclueded in some tables. 
Fixing the issue where enrolment id is not included in the device-info, device-details, device-location, device-application-mapping tables. This fixes the https://github.com/wso2/product-iots/issues/1707
 2018-02-22 15:54:08 +05:30
Ace
8895d0f94d Adding debug logs 2018-02-22 15:54:08 +05:30
Ace
a7b37a160b Removing un-necessary checks when retrieving getAllDeviceInfo 2018-02-22 15:54:08 +05:30
WSO2 Builder
5851c43e3f [WSO2 Release] [Jenkins #2917] [Release 3.0.228] prepare for next development iteration 2018-02-22 10:20:59 +00:00
WSO2 Builder
9e5ecfe204 [WSO2 Release] [Jenkins #2917] [Release 3.0.228] prepare release v3.0.228 2018-02-22 10:20:49 +00:00
Charitha Goonetilleke
c0615fee83
Merge pull request #1190 from ruwany/master 
Removing code that leads to an exception when retrieved device count is 0
 2018-02-22 15:27:23 +05:30
Ace
90d38bf699 Adding debug logs 2018-02-22 13:07:48 +05:30
Ace
fc7f80c543 Removing un-necessary checks when retrieving getAllDeviceInfo 2018-02-22 13:03:16 +05:30
WSO2 Builder
a29736e09e [WSO2 Release] [Jenkins #2915] [Release 3.0.227] prepare for next development iteration 2018-02-21 04:15:10 +00:00
WSO2 Builder
59265f4add [WSO2 Release] [Jenkins #2915] [Release 3.0.227] prepare release v3.0.227 2018-02-21 04:14:57 +00:00
kamidu
f87a3a6b08 Fixing the issue when marking as read notification 
The issue occures when the notification id is larger than 45 due to the restiction on paramater size. I have removed the related validation in order to resolve the issue.
 2018-02-20 14:33:33 +05:30
Rasika Perera
bc18d60c55 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1689 2018-02-20 14:28:21 +05:30
Rasika Perera
49f97f02e8 Fixing platform filtering not working correctly 
Resolves https://github.com/wso2/product-iots/issues/1689
 2018-02-20 14:28:03 +05:30
Ruwan
40ae5a09a2
Merge pull request #1184 from ruwany/master 
Fixed https://github.com/wso2/carbon-device-mgt/issues/1175
 2018-02-20 12:17:32 +05:30
Rasika Perera
8e3a298bb0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1689 2018-02-19 19:50:05 +05:30
Rasika Perera
528837ce1f Fixing platform filtering not working correctly 
Resolves https://github.com/wso2/product-iots/issues/1689
 2018-02-19 19:49:45 +05:30
WSO2 Builder
00b2ded5ea [WSO2 Release] [Jenkins #2910] [Release 3.0.226] prepare for next development iteration 2018-02-19 12:56:51 +00:00
WSO2 Builder
1a107902fe [WSO2 Release] [Jenkins #2910] [Release 3.0.226] prepare release v3.0.226 2018-02-19 12:56:37 +00:00
Charitha Goonetilleke
2832644d4b
Merge pull request #1187 from rasika/fix-1689 
Fixing issue of devices listing page filters are not showing all the available filtering options
 2018-02-19 18:14:21 +05:30
Rasika Perera
b5f4bd757a Fixing devices listing page filters are not showing all the available filtering options 
Resolves https://github.com/wso2/product-iots/issues/1689
 2018-02-19 17:23:22 +05:30
Ace
2516967159 Fixing test failure 2018-02-15 13:31:34 +05:30
Ace
e604532b28 Fixing fomatting issues 2018-02-15 08:50:16 +05:30
Ace
bba4b09284 Adding comments 2018-02-15 08:30:34 +05:30
Ace
81cb39a4a6 Fixed https://github.com/wso2/carbon-device-mgt/issues/1175 2018-02-14 21:27:39 +05:30
WSO2 Builder
9c9a37b42b [WSO2 Release] [Jenkins #2908] [Release 3.0.225] prepare for next development iteration 2018-02-13 05:04:50 +00:00
WSO2 Builder
0d9364671a [WSO2 Release] [Jenkins #2908] [Release 3.0.225] prepare release v3.0.225 2018-02-13 05:04:36 +00:00
charitha
a876b65974 Fixed regression issues related to https://github.com/wso2/product-iots/issues/1671 2018-02-12 20:16:06 +05:30
Madawa Soysa
3a44421cea Fixing policy view interface not loading issue 
When a policy is created and viewed the policy using the policy view icon the page keeps loading sometimes due to undefined deviceGroups variable inside the policyPayloadObj. 

This commit fixes this issue by improving the code where the null check has been made to check if the  deviceGroup is null. Also made few improvements in the code where the checks have been made.

Resolves wso2/product-iots#1681
 2018-02-12 14:56:50 +05:30
WSO2 Builder
436fb63d93 [WSO2 Release] [Jenkins #2906] [Release 3.0.224] prepare for next development iteration 2018-02-10 17:15:41 +00:00
WSO2 Builder
3f095b4b6a [WSO2 Release] [Jenkins #2906] [Release 3.0.224] prepare release v3.0.224 2018-02-10 17:15:27 +00:00
charitha
c600719f3c Fixed https://github.com/wso2/product-iots/issues/1671 2018-02-10 21:48:30 +05:30
WSO2 Builder
ee53943d3e [WSO2 Release] [Jenkins #2904] [Release 3.0.223] prepare for next development iteration 2018-02-07 09:48:07 +00:00
WSO2 Builder
ac7126bc13 [WSO2 Release] [Jenkins #2904] [Release 3.0.223] prepare release v3.0.223 2018-02-07 09:47:53 +00:00
WSO2 Builder
01cd9eb3ef [WSO2 Release] [Jenkins #2902] [Release 3.0.222] prepare for next development iteration 2018-02-06 15:17:31 +00:00
WSO2 Builder
b5a10cc078 [WSO2 Release] [Jenkins #2902] [Release 3.0.222] prepare release v3.0.222 2018-02-06 15:17:16 +00:00
WSO2 Builder
65fe3ade2e [WSO2 Release] [Jenkins #2900] [Release 3.0.221] prepare for next development iteration 2018-02-06 10:02:17 +00:00
WSO2 Builder
2356b6114e [WSO2 Release] [Jenkins #2900] [Release 3.0.221] prepare release v3.0.221 2018-02-06 10:02:03 +00:00
Rasika Perera
afe66f237a Fix https://github.com/wso2/product-iots/issues/1659 (#1177) 2018-02-06 15:11:32 +05:30
WSO2 Builder
0b4882e667 [WSO2 Release] [Jenkins #2898] [Release 3.0.220] prepare for next development iteration 2018-02-01 06:22:08 +00:00
WSO2 Builder
647beefcab [WSO2 Release] [Jenkins #2898] [Release 3.0.220] prepare release v3.0.220 2018-02-01 06:21:54 +00:00
WSO2 Builder
82f2567255 [WSO2 Release] [Jenkins #2896] [Release 3.0.219] prepare for next development iteration 2018-01-29 12:03:48 +00:00
WSO2 Builder
14770bb7bd [WSO2 Release] [Jenkins #2896] [Release 3.0.219] prepare release v3.0.219 2018-01-29 12:03:34 +00:00
Rasika Perera
16b0615577
Merge pull request #1170 from rasika/fix-1629 
Fixing group operations bar not shown when "Select All" is clicked
 2018-01-29 17:11:00 +05:30
WSO2 Builder
83c74259cd [WSO2 Release] [Jenkins #2894] [Release 3.0.218] prepare for next development iteration 2018-01-29 11:23:51 +00:00
WSO2 Builder
5b4e6f1d4d [WSO2 Release] [Jenkins #2894] [Release 3.0.218] prepare release v3.0.218 2018-01-29 11:23:36 +00:00
Kamidu Sachith Punchihewa
952c1fe28d
Merge pull request #1173 from rasika/fix-1624 
Fixing regression issues for the validations
 2018-01-29 16:38:40 +05:30
Rasika Perera
7673dca496 Fixing regression issues 2018-01-29 16:24:36 +05:30
WSO2 Builder
9bbf7cc54a [WSO2 Release] [Jenkins #2892] [Release 3.0.217] prepare for next development iteration 2018-01-29 08:45:58 +00:00
WSO2 Builder
407ee4ed43 [WSO2 Release] [Jenkins #2892] [Release 3.0.217] prepare release v3.0.217 2018-01-29 08:45:43 +00:00
lasantha
ae1c99f665 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into application-mgt-new 2018-01-28 09:27:16 +05:30
lasantha
02415dfd92 merge with upstream master 2018-01-28 09:26:30 +05:30
WSO2 Builder
3014089807 [WSO2 Release] [Jenkins #2890] [Release 3.0.216] prepare for next development iteration 2018-01-26 14:21:01 +00:00
WSO2 Builder
3dd8c8bf2f [WSO2 Release] [Jenkins #2890] [Release 3.0.216] prepare release v3.0.216 2018-01-26 14:20:44 +00:00
Rasika Perera
7db642a9be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1629 2018-01-26 19:43:55 +05:30
kamidu
bb0920ef7f code reformatted to resolve the exsisted code formatting issues 2018-01-26 17:56:38 +05:30
kamidu
3bcb1b729c improve the java script code of changing the text and visibility 
Improved the logic in order to remove the unesssary text changes and visibility changes. and fix the code formatting issues found in the code.
 2018-01-26 17:56:38 +05:30
kamidu
9cc76da4c2 Fix git issue https://github.com/wso2/product-iots/issues/1629 
Fixes wso2/product-iots#1629
 2018-01-26 17:56:38 +05:30
WSO2 Builder
2cd3b81aaa [WSO2 Release] [Jenkins #2888] [Release 3.0.215] prepare for next development iteration 2018-01-26 08:57:24 +00:00
WSO2 Builder
8301dda57d [WSO2 Release] [Jenkins #2888] [Release 3.0.215] prepare release v3.0.215 2018-01-26 08:57:10 +00:00
Rasika Perera
6c2f4e3c8d
Merge pull request #1165 from rasika/fix-1624 
Adding additional validations to improve stability of the product
 2018-01-26 14:14:30 +05:30
WSO2 Builder
6f6c3e2051 [maven-release-plugin] prepare for next development iteration 2018-01-26 06:54:56 +00:00
WSO2 Builder
a47115d92d [maven-release-plugin] prepare release v3.0.214 2018-01-26 06:54:41 +00:00
Rasika Perera
003ae9883b Fixing https://github.com/wso2/product-iots/issues/1629 2018-01-25 16:12:04 +05:30
charitha
3cf0d12181 Updated license year 2018-01-25 14:59:35 +05:30
charitha
c542c3efe9 Implemented operation response publishing to analytics 2018-01-25 14:52:32 +05:30
WSO2 Builder
b5ed177338 [WSO2 Release] [Jenkins #2878] [Release 3.0.212] prepare for next development iteration 2018-01-25 02:54:38 +00:00
WSO2 Builder
8569092e00 [WSO2 Release] [Jenkins #2878] [Release 3.0.212] prepare release v3.0.212 2018-01-25 02:54:22 +00:00
charitha
439fae4f8d Fixed https://github.com/wso2/product-iots/issues/1630 2018-01-24 22:53:50 +05:30
WSO2 Builder
d4a2b807aa [WSO2 Release] [Jenkins #2876] [Release 3.0.211] prepare for next development iteration 2018-01-24 06:54:45 +00:00
WSO2 Builder
97324f8c19 [WSO2 Release] [Jenkins #2876] [Release 3.0.211] prepare release v3.0.211 2018-01-24 06:54:31 +00:00
Ruwan
16cd6056a9
Merge pull request #1167 from ruwany/master 
Fix for https://github.com/wso2/product-iots/issues/1399
 2018-01-24 12:07:46 +05:30
WSO2 Builder
b885931c26 [WSO2 Release] [Jenkins #2874] [Release 3.0.210] prepare for next development iteration 2018-01-24 05:53:23 +00:00
WSO2 Builder
e1a5b3ec43 [WSO2 Release] [Jenkins #2874] [Release 3.0.210] prepare release v3.0.210 2018-01-24 05:53:08 +00:00
Ace
bc9450b7ff merging with upstream 2018-01-24 10:53:00 +05:30
Ace
327f49cfd9 Fix for https://github.com/wso2/product-iots/issues/1399 2018-01-24 10:52:33 +05:30
Rasika Perera
ab352015b7 Fixes for the https://github.com/wso2/product-iots/issues/1624 2018-01-24 07:26:56 +05:30
Rasika Perera
8a09e44c3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1624 2018-01-23 18:48:26 +05:30
WSO2 Builder
b428ecb931 [WSO2 Release] [Jenkins #2872] [Release 3.0.209] prepare for next development iteration 2018-01-23 13:16:30 +00:00
WSO2 Builder
091da0326d [WSO2 Release] [Jenkins #2872] [Release 3.0.209] prepare release v3.0.209 2018-01-23 13:16:15 +00:00
Rasika Perera
c5622c7b0b Fixing https://github.com/wso2/product-iots/issues/1624 2018-01-23 18:35:10 +05:30
WSO2 Builder
45f778d2e4 Merge commit '774c20a09a0bb12b11dbec7c4ec9d5fb491575e2' into 1d9c0cda-191e-4c45-9fd9-32a2aa0808a4 2018-01-23 13:03:19 +00:00
WSO2 Builder
774c20a09a [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare for next development iteration 2018-01-23 12:48:12 +00:00
WSO2 Builder
4d35797a55 [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare release v3.0.208 2018-01-23 12:47:55 +00:00
Rasika Perera
f3860e42f7 Fixing https://github.com/wso2/product-iots/issues/1624 2018-01-23 18:08:20 +05:30
Rasika Perera
5347930d95
Merge branch 'master' into fix-1623 2018-01-23 18:00:54 +05:30
Rasika Perera
a406dd0540
Merge pull request #1163 from rasika/fix-1611 
Isolating Geo Location Enabling Configuration
 2018-01-23 17:59:57 +05:30
Rasika Perera
c46a2037fe Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-23 16:02:17 +05:30
Rasika Perera
68a5415e0b Fixing https://github.com/wso2/product-iots/issues/1623 2018-01-23 15:19:03 +05:30
Rasika Perera
3a9261536e Renamed isEnabled into Enabled for the consistency 2018-01-23 14:59:52 +05:30
Rasika Perera
08f4f04101 Fixing a typo 2018-01-23 14:39:33 +05:30
WSO2 Builder
8776317dfe [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare for next development iteration 2018-01-22 11:14:43 +00:00
WSO2 Builder
21c406fe01 [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare release v3.0.207 2018-01-22 11:14:29 +00:00
Rasika Perera
394f45f4bd Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-22 15:43:07 +05:30
geethkokila
ca92c5029f Changing the variable name 2018-01-22 15:25:40 +05:30
geethkokila
7c4ca89beb Removing extra lines 2018-01-22 15:13:43 +05:30
geethkokila
5c2c7dfc2a Removing commented lines 2018-01-22 15:11:29 +05:30
geethkokila
8f1d15c690 Removing commented lines 2018-01-22 15:10:47 +05:30
geethkokila
03570f3ad7 Improvements to policy monitoring framework 
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
 2018-01-22 14:39:29 +05:30
geethkokila
1a957666e3 Improvements to policy monitoring framework 
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
 2018-01-22 14:39:16 +05:30