Commit Graph

1580 Commits

Author SHA1 Message Date
WSO2 Builder
9c77054795 [WSO2 Release] [Jenkins #3046] [Release 3.1.47] prepare release v3.1.47 2018-10-22 19:13:23 +00:00
Madawa Soysa
9b5cb1ef6a Fix issue with search not updating
Related: entgra/product-iots#6
2018-10-22 17:47:32 +11:00
Madawa Soysa
6aca4650e2 Introduce new API for user search based on user attributes
This commit introduces a new API to search users based on user claims such as First Name, Last Name, Email, etc. This new API can be used to filter users through a search query. Also this commit includes the UI modifications to modify the exiting user listing page to allow filter users by attributes.

Fixes to entgra/product-iots#6
2018-10-22 13:41:30 +11:00
WSO2 Builder
8eaa7c6698 [WSO2 Release] [Jenkins #3044] [Release 3.1.46] prepare for next development iteration 2018-10-21 13:35:14 +00:00
WSO2 Builder
03b88248b8 [WSO2 Release] [Jenkins #3044] [Release 3.1.46] prepare release v3.1.46 2018-10-21 13:34:59 +00:00
WSO2 Builder
bfff9e7a7e [WSO2 Release] [Jenkins #3042] [Release 3.1.45] prepare for next development iteration 2018-10-18 06:51:09 +00:00
WSO2 Builder
af64244ab3 [WSO2 Release] [Jenkins #3042] [Release 3.1.45] prepare release v3.1.45 2018-10-18 06:50:57 +00:00
Ace
3f77a3b27c Adding correct tenant ID 2018-10-18 11:55:20 +05:30
Ace
92bf6f4140 Fixing formatting issues 2018-10-18 11:36:12 +05:30
Ace
b39be48919 Adding constants 2018-10-18 11:31:10 +05:30
Ace
8bc15e1f14 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-10-18 11:24:10 +05:30
Ace
4aee621039 Fixing tenanted username 2018-10-17 20:30:17 +05:30
Ace
1721824d53 Fixing issue where super tenant table space is querried instead of relavent tenant when retrieving geo location data 2018-10-17 16:49:29 +05:30
WSO2 Builder
e7a9406789 [WSO2 Release] [Jenkins #3040] [Release 3.1.44] prepare for next development iteration 2018-10-16 13:39:36 +00:00
WSO2 Builder
b87b073739 [WSO2 Release] [Jenkins #3040] [Release 3.1.44] prepare release v3.1.44 2018-10-16 13:39:24 +00:00
WSO2 Builder
806ac13c39 [WSO2 Release] [Jenkins #3038] [Release 3.1.43] prepare for next development iteration 2018-10-12 03:58:28 +00:00
WSO2 Builder
e3901043fc [WSO2 Release] [Jenkins #3038] [Release 3.1.43] prepare release v3.1.43 2018-10-12 03:58:17 +00:00
WSO2 Builder
3782e68f27 [WSO2 Release] [Jenkins #3036] [Release 3.1.42] prepare for next development iteration 2018-10-10 13:11:05 +00:00
WSO2 Builder
3111680b9f [WSO2 Release] [Jenkins #3036] [Release 3.1.42] prepare release v3.1.42 2018-10-10 13:10:53 +00:00
WSO2 Builder
7186ed2f62 [WSO2 Release] [Jenkins #3034] [Release 3.1.41] prepare for next development iteration 2018-10-08 18:01:00 +00:00
WSO2 Builder
60aee974ff [WSO2 Release] [Jenkins #3034] [Release 3.1.41] prepare release v3.1.41 2018-10-08 18:00:47 +00:00
lasanthaDLPDS
7388bcadce Merge master branch 2018-10-01 01:27:45 +05:30
charitha
e12e7a3876 Add validation to event retrial 2018-09-30 21:57:29 +05:30
Ubuntu
e5cc5284e3 [maven-release-plugin] prepare for next development iteration 2018-09-28 17:13:33 +00:00
Ubuntu
ae078fe390 [maven-release-plugin] prepare release v3.2.0 2018-09-28 17:12:41 +00:00
charitha
034a15aa59 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master 2018-09-26 14:23:04 +05:30
WSO2 Builder
353d6936db [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare for next development iteration 2018-09-19 15:36:32 +00:00
WSO2 Builder
8e2541b9ac [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare release v3.1.40 2018-09-19 15:36:20 +00:00
charitha
b5ce0fdd03 Merge branch 'iots-3.3.1' into entgra-master 2018-09-19 13:15:21 +05:30
lasanthaDLPDS
f9ec82e4dc Merge with upstream 2018-09-15 12:50:18 +05:30
WSO2 Builder
01991dcc4d [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare for next development iteration 2018-09-12 07:55:38 +00:00
WSO2 Builder
18b81223df [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare release v3.1.39 2018-09-12 07:55:26 +00:00
WSO2 Builder
cbbd327a02 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare for next development iteration 2018-09-11 06:43:08 +00:00
WSO2 Builder
de07597d53 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare release v3.1.38 2018-09-11 06:42:55 +00:00
WSO2 Builder
3401a8c845 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare for next development iteration 2018-08-30 14:38:47 +00:00
WSO2 Builder
ecadadef94 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare release v3.1.37 2018-08-30 14:38:36 +00:00
geethkokila
2f428c8a58 Fix https://github.com/wso2/product-iots/issues/1857
Filtering the activities based on the user who added the operation
2018-08-30 18:01:12 +05:30
WSO2 Builder
2b6de6834b [maven-release-plugin] prepare for next development iteration 2018-08-30 09:30:45 +00:00
WSO2 Builder
16c6a27f81 [maven-release-plugin] prepare release v3.1.36 2018-08-30 09:30:34 +00:00
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
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
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
charitha
e858f5b627 Merge remote-tracking branch 'entgra/master' into entgra-master 2018-08-13 12:21:24 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
815cea8ab1
Merge pull request #1215 from Arcane94/geoFencing
Adding geofencing feature to geo devices dashboard
2018-03-14 14:20:39 +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
Arcane94
50a14e4321 Requested 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
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
Lashan Faliq
51753ebbbf Merge branch 'master' into master 2018-03-13 14:48:50 +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
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
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