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,932 Commits 31 Branches 461 Tags 183 MiB
67a12dc57b
Commit Graph

4772 Commits

Author SHA1 Message Date
kamidu
2505d4907a Fixing https://github.com/wso2/product-iots/issues/1565 2017-12-29 10:37:57 +05:30
WSO2 Builder
5783a74110 [WSO2 Release] [Jenkins #2838] [Release 3.0.191] prepare for next development iteration 2017-12-22 06:19:13 +00:00
WSO2 Builder
7a7613a0cb [WSO2 Release] [Jenkins #2838] [Release 3.0.191] prepare release v3.0.191 2017-12-22 06:18:57 +00:00
Ace
42f36e5a9a Fixing test failure 2017-12-22 11:12:48 +05:30
Rasika Perera
7b8ba259e4
Merge pull request #1134 from madhawap/vf-dev-3 
Added an API to filter activities by operation code
 2017-12-21 18:43:17 +05:30
Madawa Soysa
e786fa410b Checking if the user store manager class is a sub class of the default 
This commit is to modify the current logic which checks if the UserStoreManager class is equal to the JDBCUserStoreManager class to support subclasses of the JDBCUserStoreManager class to return correct total user count.

In this commit, instead of comparing the string name, tests the UserStoreManager instance is a type of JDBCUserStoreManager.

Resolves wso2/product-iots#1556
 2017-12-21 17:06:28 +05:30
Kamidu Sachith Punchihewa
d397d73777
Merge pull request #1139 from rasika/fix-1544 
Fixing devicemgt roles not created for newly created tenants
 2017-12-19 12:07:49 +05:30
Kamidu Sachith Punchihewa
48e67df534
Merge pull request #1141 from ruwany/master 
Notification center enhancements
 2017-12-19 11:47:43 +05:30
Ace
e2ce619166 Adding UI enhancements and including unit tests 2017-12-19 11:16:55 +05:30
WSO2 Builder
b8643213b6 [WSO2 Release] [Jenkins #2831] [Release 3.0.190] prepare for next development iteration 2017-12-18 16:17:54 +00:00
WSO2 Builder
34dc4038e6 [WSO2 Release] [Jenkins #2831] [Release 3.0.190] prepare release v3.0.190 2017-12-18 16:17:39 +00:00
kamidu
049c6bcdae Enaled policy description on effective policy view 2017-12-18 20:59:09 +05:30
Rasika Perera
08e40d3989 Fixing error log 2017-12-18 17:04:36 +05:30
Rasika Perera
2e7bd0626d Fixing https://github.com/wso2/product-iots/issues/1544 2017-12-18 16:57:03 +05:30
Ace
fb6c98b969 Restricting clear notifications to tenant domain only 2017-12-18 12:43:37 +05:30
Ace
15991f626d Adding clear notifications button to notification listing page 2017-12-18 11:14:02 +05:30
Ace
29c0692286 removing un-necessary logs 2017-12-16 11:29:10 +05:30
Ace
c506d90698 removing un-necessary logs 2017-12-16 11:27:28 +05:30
Ace
9ac89d1ebe merging with upstream 2017-12-16 10:03:28 +05:30
Ace
855f294ed2 improving notifications management 2017-12-16 10:03:02 +05:30
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