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
5,964 Commits 31 Branches 461 Tags 183 MiB
8a09e44c3e
Commit Graph

4802 Commits

Author SHA1 Message Date
Madawa Soysa
6fed9f7823 Changing the order by parameter when getNextPendingOperation called 
Changing the order by parameter to UPDATED_TIMESTAMP.

Resolves wso2/product-iots#1539
 2017-12-16 09:49:20 +05:30
WSO2 Builder
2a01c77ef9 [WSO2 Release] [Jenkins #2827] [Release 3.0.189] prepare for next development iteration 2017-12-15 12:11:35 +00:00
WSO2 Builder
ce604ed214 [WSO2 Release] [Jenkins #2827] [Release 3.0.189] prepare release v3.0.189 2017-12-15 12:11:21 +00:00
lasantha
1a8816f531 fixed build failure 2017-12-15 16:25:12 +05:30
Madawa Soysa
8df3999cbc
Merge pull request #1135 from Kamidu/master 
Enable roles containing the filter to be listed in role listing
 2017-12-15 14:55:04 +05:30
Madawa Soysa
30da164121
Merge pull request #1136 from lasanthaDLPDS/vf-dev-api 
Adding v0.9 API version for device management and certificate management
 2017-12-15 14:38:34 +05:30
lasantha
11310a9145 default API set to newly added API and fixed it by using context parameters 2017-12-15 10:21:15 +05:30
kamidu
e10cf66813 Enable roles containing the filter to be listed in role listing 2017-12-14 19:18:44 +05:30
WSO2 Builder
5262f516f4 [WSO2 Release] [Jenkins #2822] [Release 3.0.188] prepare for next development iteration 2017-12-14 12:11:12 +00:00
WSO2 Builder
2bfe4bbfe7 [WSO2 Release] [Jenkins #2822] [Release 3.0.188] prepare release v3.0.188 2017-12-14 12:10:58 +00:00
madhawap
16f70454ad Added an API to filter activities by operation code 2017-12-14 14:44:53 +05:30
kamidu
1413ff5268 Fixing https://github.com/wso2/product-iots/issues/1526 2017-12-14 14:43:28 +05:30
WSO2 Builder
3ce2d1c3b2 [WSO2 Release] [Jenkins #2820] [Release 3.0.187] prepare for next development iteration 2017-12-13 09:02:53 +00:00
WSO2 Builder
ae71fafc10 [WSO2 Release] [Jenkins #2820] [Release 3.0.187] prepare release v3.0.187 2017-12-13 09:02:38 +00:00
Rasika Perera
0a9ecd3100
Merge pull request #1132 from ruwany/master 
Fix for https://github.com/wso2/product-iots/issues/1525
 2017-12-13 14:06:34 +05:30
Ace
1472cf6e27 Merging with upstream 2017-12-13 14:06:20 +05:30
Ace
aa654ea5bf Fix for https://github.com/wso2/product-iots/issues/1525 2017-12-13 14:02:34 +05:30
charitha
7ab31ae7d8 Fixed https://github.com/wso2/product-iots/issues/1523 2017-12-13 13:56:29 +05:30
WSO2 Builder
6fe5b6909f [WSO2 Release] [Jenkins #2818] [Release 3.0.186] prepare for next development iteration 2017-12-13 04:14:53 +00:00
WSO2 Builder
ff97ffbfcc [WSO2 Release] [Jenkins #2818] [Release 3.0.186] prepare release v3.0.186 2017-12-13 04:14:39 +00:00
Ace
e06d8f9e13 merging with upstream 2017-12-13 00:25:22 +05:30
Ace
62c6882fa2 Fixing server startup issue when configured with PostgreSQL DB 2017-12-13 00:23:08 +05:30
lasantha
9a7745d915 Adding new API version for backward compatibility 2017-12-12 18:20:37 +05:30
WSO2 Builder
689373a58f [WSO2 Release] [Jenkins #2816] [Release 3.0.185] prepare for next development iteration 2017-12-12 08:11:10 +00:00
WSO2 Builder
babc4a9e9a [WSO2 Release] [Jenkins #2816] [Release 3.0.185] prepare release v3.0.185 2017-12-12 08:10:56 +00:00
charitha
2bb12deb9c Fixed https://github.com/wso2/product-iots/issues/1511 2017-12-12 13:09:04 +05:30
WSO2 Builder
5e70f5f469 [WSO2 Release] [Jenkins #2814] [Release 3.0.184] prepare for next development iteration 2017-11-30 04:41:07 +00:00
WSO2 Builder
304e942c31 [WSO2 Release] [Jenkins #2814] [Release 3.0.184] prepare release v3.0.184 2017-11-30 04:40:52 +00:00
Ruwan
88ac37b767
Merge pull request #1126 from lasanthaDLPDS/master 
Adding new API endpoints
 2017-11-30 09:43:09 +05:30
Ruwan
33c58ac518
Merge pull request #1125 from Gathika94/add-emm-analytics 
Unit Tests for getGeoDevicesLocations API
 2017-11-30 09:41:26 +05:30
WSO2 Builder
ce4b03eed4 [WSO2 Release] [Jenkins #2812] [Release 3.0.183] prepare for next development iteration 2017-11-29 15:52:09 +00:00
WSO2 Builder
28195c7f77 [WSO2 Release] [Jenkins #2812] [Release 3.0.183] prepare release v3.0.183 2017-11-29 15:51:55 +00:00
sameera910409
c8d56f66ea added update device properties functionality for device types 2017-11-29 19:33:51 +05:30
lasantha
aa4f7c13c5 Fixing issue in get device API 2017-11-29 10:05:50 +05:30
Gathika94
d67877cfb1 unit tests for geo device locations api- minor changes 2017-11-28 20:26:03 +05:30
Gathika94
5308108899 unit tests- minor changes 2017-11-28 20:22:40 +05:30
Gathika94
fd5ada61af unit tests for geo device locations api 2017-11-28 20:18:05 +05:30
lasantha
fe576c0aac Adding required API endpoints to mograte from prior verisons of IoTS 3.1.0 to IoTS 3.1.0 2017-11-28 10:51:52 +05:30
WSO2 Builder
6603015614 [WSO2 Release] [Jenkins #2808] [Release 3.0.182] prepare for next development iteration 2017-11-23 11:38:00 +00:00
WSO2 Builder
bb731cb264 [WSO2 Release] [Jenkins #2808] [Release 3.0.182] prepare release v3.0.182 2017-11-23 11:37:44 +00:00
charitha
6cb3ffa3ca Fixed build failure due to incorrect class name 2017-11-23 16:40:53 +05:30
charitha
3c23a3cf5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-11-23 16:33:28 +05:30
charitha
1449698a3c OSGi improvement to #977 2017-11-23 16:33:14 +05:30
Gathika94
7a2fc90a15 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into add-emm-analytics 2017-11-23 15:58:17 +05:30
Gathika94
c22a7f1882 minor ui changes 2017-11-23 15:57:54 +05:30
Gathika94
356063a247 removed warnings created in geo deivice locations dashboard 2017-11-23 10:51:22 +05:30
WSO2 Builder
b2fc6b4cad [WSO2 Release] [Jenkins #2805] [Release 3.0.181] prepare for next development iteration 2017-11-23 05:14:07 +00:00
WSO2 Builder
a55619b333 [WSO2 Release] [Jenkins #2805] [Release 3.0.181] prepare release v3.0.181 2017-11-23 05:13:51 +00:00
Gathika94
89eff7b7bd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into add-emm-analytics 2017-11-23 10:25:19 +05:30
Gathika94
81b036678a minor changes in device locations UI 2017-11-23 10:22:31 +05:30
WSO2 Builder
3d522e7c62 [WSO2 Release] [Jenkins #2804] [Release 3.0.180] prepare for next development iteration 2017-11-23 04:38:38 +00:00
WSO2 Builder
08382cc965 [WSO2 Release] [Jenkins #2804] [Release 3.0.180] prepare release v3.0.180 2017-11-23 04:38:24 +00:00
Charitha Goonetilleke
61f88b54ff
Merge pull request #1122 from warunalakshitha/remote-control 
Add remote control configurations as remove unused methods
 2017-11-23 09:40:11 +05:30
Gathika94
cec1e1393e removed unnecessary files 2017-11-22 23:34:08 +05:30
Gathika94
dcac19480f removed unnecessary files 2017-11-22 23:26:09 +05:30
warunalakshitha
2313928741 Add remote control configurations as remove unused methods 2017-11-22 22:52:11 +05:30
Gathika94
f4af47fae4 added unit and page 2017-11-22 21:42:54 +05:30
Gathika94
2e082fbbb7 removed unnecessary classes 2017-11-22 16:32:14 +05:30
WSO2 Builder
4c68ddd752 [WSO2 Release] [Jenkins #2802] [Release 3.0.179] prepare for next development iteration 2017-11-22 10:42:23 +00:00
WSO2 Builder
f28b740e9c [WSO2 Release] [Jenkins #2802] [Release 3.0.179] prepare release v3.0.179 2017-11-22 10:42:08 +00:00
Gathika94
ad061d09a6 device details can be get through the api 2017-11-22 16:06:31 +05:30
Gathika94
f5d1ab7403 backend api working properly 2017-11-22 16:06:31 +05:30
Gathika94
c74a56cb45 geo hash algorithm 2017-11-22 16:06:31 +05:30
Gathika94
d3eb32b5cc working on ui features 2017-11-22 16:06:31 +05:30
Gathika94
4eb66f4e6b api for getting devices in geo grid working fine 2017-11-22 16:06:31 +05:30
charitha
f2fbf97b91 Reverting to column name based return of the generated keys as Statement.RETURN_GENERATED_KEYS are not handled consistently by H2 engine 2017-11-22 15:41:23 +05:30
charitha
a966dc2655 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-11-22 15:40:34 +05:30
WSO2 Builder
16750a6f96 [WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare for next development iteration 2017-11-22 09:19:46 +00:00
WSO2 Builder
46c732a2a9 [WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare release v3.0.178 2017-11-22 09:19:31 +00:00
charitha
0f7e8b6435 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-11-22 14:43:50 +05:30
charitha
713c6a6755 Merge branch 'patch-1' of https://github.com/thomsonimjd/carbon-device-mgt 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
 2017-11-22 14:43:29 +05:30
dunithd
7cdea248f7 Merge branch 'master' of git://github.com/wso2/carbon-device-mgt 
# Resolving Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
 2017-11-22 11:14:55 +05:30
Dunith Dhanushka
7f9cf0ffea Merge branch 'master' of git://github.com/wso2/carbon-device-mgt 
# Resolving Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
 2017-11-22 11:14:32 +05:30
WSO2 Builder
22fac48873 [WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare for next development iteration 2017-11-17 10:03:15 +00:00
WSO2 Builder
62678dd003 [WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare release v3.0.177 2017-11-17 10:03:02 +00:00
WSO2 Builder
41db467d7b [WSO2 Release] [Jenkins #2797] [Release 3.0.176] prepare for next development iteration 2017-11-17 09:27:07 +00:00
WSO2 Builder
af3f8a976f [WSO2 Release] [Jenkins #2797] [Release 3.0.176] prepare release v3.0.176 2017-11-17 09:26:43 +00:00
Ace
4b2955984f Resolving conflicts for Remote Control feature on behalf of Waruna 2017-11-17 14:27:30 +05:30
WSO2 Builder
3097d8394f [WSO2 Release] [Jenkins #2795] [Release 3.0.175] prepare for next development iteration 2017-11-17 06:58:17 +00:00
WSO2 Builder
85f895d4a8 [WSO2 Release] [Jenkins #2795] [Release 3.0.175] prepare release v3.0.175 2017-11-17 06:58:03 +00:00
Ruwan
70ab17acde
Merge pull request #1068 from Jasintha/devicePolicyServiceTestImprovement 
Device policy service test improvement
 2017-11-17 12:01:51 +05:30
Menaka Jayawardena
a9150da115 Added class level comments. 2017-11-17 11:58:30 +05:30
Menaka Jayawardena
46555cfe3a Fixing code formatting issues in SearchManagementTestCases. 2017-11-17 11:58:30 +05:30
Menaka Jayawardena
a9f2a0a228 Fixing code formatting issues in PermissionManagerServiceTests 2017-11-17 11:56:41 +05:30
Menaka Jayawardena
e342507349 Fixing code formatting issues in DeviceTypeManagementService 2017-11-17 11:56:41 +05:30
Menaka Jayawardena
af8ab1f59b Fixing code formatting issues in DeviceTypeManagementAdminService 2017-11-17 11:56:41 +05:30
Menaka Jayawardena
9e71b3d18e Fixing code formatting issues in DeviceAgentServiceTest 2017-11-17 11:56:41 +05:30
WSO2 Builder
477eb4d703 [WSO2 Release] [Jenkins #2793] [Release 3.0.174] prepare for next development iteration 2017-11-17 05:41:29 +00:00
WSO2 Builder
85904edfe9 [WSO2 Release] [Jenkins #2793] [Release 3.0.174] prepare release v3.0.174 2017-11-17 05:41:16 +00:00
WSO2 Builder
0c032443f9 Merge commit '4620ca4a6ec6fddd221a074eb2d6bbb81a62babf' into d250b2c0-4c43-40c8-af8b-ab3fdf3a7436 2017-11-17 05:18:27 +00:00
WSO2 Builder
4620ca4a6e [WSO2 Release] [Jenkins #2792] [Release 3.0.173] prepare for next development iteration 2017-11-17 05:08:44 +00:00
WSO2 Builder
aca017b9bd [WSO2 Release] [Jenkins #2792] [Release 3.0.173] prepare release v3.0.173 2017-11-17 05:08:25 +00:00
Ruwan
ee0195f740
Merge pull request #950 from dilee/master 
Minor refactorings and fixing formatting issues
 2017-11-17 10:16:27 +05:30
Ruwan
357a625b0b
Merge pull request #1089 from rasika/master 
Adding unit tests for monitoring manager
 2017-11-17 10:11:34 +05:30
Ruwan
0166f73410
Merge pull request #1092 from madawas/api-unit-tests 
Test Cases for DeviceManagementServiceImpl
 2017-11-17 10:10:06 +05:30
WSO2 Builder
1b8ecafce5 [WSO2 Release] [Jenkins #2790] [Release 3.0.172] prepare for next development iteration 2017-11-13 04:18:35 +00:00
WSO2 Builder
7ee80afc09 [WSO2 Release] [Jenkins #2790] [Release 3.0.172] prepare release v3.0.172 2017-11-13 04:18:21 +00:00
Madawa Soysa
72a09bf90b This commit fixes the unable to parse the DN issue 
Currently when a DN cannot be parsed if the DN is not in RFC2253 format. This commit fixeds this issue.
 2017-11-12 18:31:21 +05:30
WSO2 Builder
9cbc4a5da3 [WSO2 Release] [Jenkins #2788] [Release 3.0.171] prepare for next development iteration 2017-11-02 09:46:46 +00:00
WSO2 Builder
86eb38569b [WSO2 Release] [Jenkins #2788] [Release 3.0.171] prepare release v3.0.171 2017-11-02 09:46:31 +00:00
Madawa Soysa
33345f5b52 Adding missing import 2017-11-02 14:42:08 +05:30
Madawa Soysa
33e39415de
Revert "Fix for EMM-1298" 2017-11-02 14:18:45 +05:30
Madawa Soysa
8ad597342e Test Cases for DeviceManagementServiceImpl 2017-11-01 11:52:57 +05:30
Rasika Perera
fc83d02ce8 Adding unit tests for monitoring manager 2017-10-30 14:43:06 +05:30
WSO2 Builder
b929ba11d3 [WSO2 Release] [Jenkins #2786] [Release 3.0.170] prepare for next development iteration 2017-10-30 07:06:11 +00:00
WSO2 Builder
ccba297aca [WSO2 Release] [Jenkins #2786] [Release 3.0.170] prepare release v3.0.170 2017-10-30 07:05:57 +00:00
Charitha Goonetilleke
448ff20baa
Update response message 2017-10-30 12:09:12 +05:30
charitha
1eb2e54ae8 Resolve test failures and issues after merging with upstream 2017-10-30 11:15:20 +05:30
charitha
6e62c3d64e Refactor after merging 2017-10-30 10:14:00 +05:30
charitha
b3094277fd Merge branch 'master' into add-emm-analytics 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/Utils.java
 2017-10-30 10:11:15 +05:30
WSO2 Builder
60b3060b4c [WSO2 Release] [Jenkins #2784] [Release 3.0.169] prepare for next development iteration 2017-10-23 09:40:36 +00:00
WSO2 Builder
0b72a71e6f [WSO2 Release] [Jenkins #2784] [Release 3.0.169] prepare release v3.0.169 2017-10-23 09:40:22 +00:00
kamidu
9fb13e38cf enable billing cache invalidation 2017-10-23 12:52:45 +05:30
WSO2 Builder
8f860e34a1 [WSO2 Release] [Jenkins #2782] [Release 3.0.168] prepare for next development iteration 2017-10-20 11:44:06 +00:00
WSO2 Builder
3d18b11c17 [WSO2 Release] [Jenkins #2782] [Release 3.0.168] prepare release v3.0.168 2017-10-20 11:43:52 +00:00
Harshan Liyanage
371de9419f Merge pull request #1080 from menakaj/master 
Test cases for DeviceAgentService.
 2017-10-20 16:52:44 +05:30
Menaka Jayawardena
88195a3f4b Code formatting. 2017-10-20 16:23:22 +05:30
Menaka Jayawardena
52f3b541bc Test cases for getOperation method and fixes. 2017-10-20 16:13:39 +05:30
Menaka Jayawardena
9af560f878 Test cases for updateOperation method. 2017-10-20 16:13:39 +05:30
Menaka Jayawardena
3d70110217 Test cases for getNextPendingOperation method. 2017-10-20 16:13:39 +05:30
Menaka Jayawardena
70417fa7b1 Test cases for getPendingOperations method. 2017-10-20 16:13:39 +05:30
Menaka Jayawardena
a80f0246ad Extended the test cases for the Publish event method. 2017-10-20 16:13:39 +05:30
WSO2 Builder
8c80836f72 [WSO2 Release] [Jenkins #2780] [Release 3.0.167] prepare for next development iteration 2017-10-20 10:35:17 +00:00
WSO2 Builder
fd86095fd2 [WSO2 Release] [Jenkins #2780] [Release 3.0.167] prepare release v3.0.167 2017-10-20 10:35:03 +00:00
sinthuja
bf3a701637 Merge pull request #1079 from Megala21/master 
Adding test cases for GroupManagementService
 2017-10-20 15:42:16 +05:30
megala21
7c92849a03 Adding test cases for GroupManagementService 2017-10-20 15:26:14 +05:30
WSO2 Builder
593090de40 [WSO2 Release] [Jenkins #2778] [Release 3.0.166] prepare for next development iteration 2017-10-20 07:29:23 +00:00
WSO2 Builder
9ee51eb816 [WSO2 Release] [Jenkins #2778] [Release 3.0.166] prepare release v3.0.166 2017-10-20 07:29:09 +00:00
Megala Uthayakumar
8aa3a9472c Merge pull request #1078 from GDLMadushanka/master 
Unit tests for MQTTPushNotificationProvider
 2017-10-20 12:37:47 +05:30
GDLMadushanka
cf90b6315a Adding unit test to pom 2017-10-20 12:35:37 +05:30
GDLMadushanka
2f18c199a6 required changes for pr 2017-10-20 12:23:10 +05:30
GDLMadushanka
122a045056 refactoring 2017-10-20 12:10:16 +05:30
GDLMadushanka
f561c5d5e2 Unit tests for mqtt push notification provider 2017-10-20 12:03:16 +05:30
WSO2 Builder
5f6fe29e52 [WSO2 Release] [Jenkins #2776] [Release 3.0.165] prepare for next development iteration 2017-10-20 06:12:10 +00:00
WSO2 Builder
a9bb2f8723 [WSO2 Release] [Jenkins #2776] [Release 3.0.165] prepare release v3.0.165 2017-10-20 06:11:56 +00:00
megala21
fc82bf3f95 Adding test cases for ConfigurationManagementService 2017-10-20 10:48:45 +05:30
megala21
5f0712dd38 Refactoring 2017-10-19 16:54:16 +05:30
megala21
37248de07f Adding test cases for notification managementservice 2017-10-19 16:47:35 +05:30
megala21
4228ddd416 Refactoring 2017-10-19 15:46:28 +05:30
megala21
68533808c5 Adding test cases for UserManagementServicee 2017-10-19 15:43:41 +05:30
WSO2 Builder
f724ff341f [WSO2 Release] [Jenkins #2774] [Release 3.0.164] prepare for next development iteration 2017-10-18 10:27:42 +00:00
WSO2 Builder
7026020140 [WSO2 Release] [Jenkins #2774] [Release 3.0.164] prepare release v3.0.164 2017-10-18 10:27:28 +00:00
Menaka Jayawardena
c0eb389ece Removed device info persisting in the time of device enrollment and fixed the test case. 2017-10-18 15:32:19 +05:30
WSO2 Builder
4b7cd32aca [WSO2 Release] [Jenkins #2772] [Release 3.0.163] prepare for next development iteration 2017-10-17 16:23:41 +00:00
WSO2 Builder
04f2bff9bb [WSO2 Release] [Jenkins #2772] [Release 3.0.163] prepare release v3.0.163 2017-10-17 16:23:27 +00:00
Megala Uthayakumar
76938fc44d Merge pull request #1075 from sinthuja/origin-wso2-master 
Adding mock datasources to cover the source from different databases.
 2017-10-17 20:55:24 +05:30
sinthuja
10365c108b Code cleanup. 2017-10-17 19:15:29 +05:30
WSO2 Builder
871bc2bb6e [WSO2 Release] [Jenkins #2770] [Release 3.0.162] prepare for next development iteration 2017-10-17 13:39:07 +00:00
WSO2 Builder
7652cf841f [WSO2 Release] [Jenkins #2770] [Release 3.0.162] prepare release v3.0.162 2017-10-17 13:38:53 +00:00
sinthuja
0252a5f2eb Covering more database specific method calls. 2017-10-17 19:02:57 +05:30