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
9,859 Commits 31 Branches 461 Tags 183 MiB
b51a608a41
Commit Graph

5360 Commits

Author SHA1 Message Date
Pahansith Gunathilake
3332d8e85e Merge branch 'swagger-fix' into 'master' 
Swagger fix

See merge request entgra/carbon-device-mgt!921
 2022-10-12 13:26:53 +00:00
Shamalka Navod
3384b597f9 Improve device name search 2022-10-05 18:10:49 +00:00
Kavindya Sathsarani
bb5f779c26 Add a searchable input for App Restriction Settings policy 2022-10-04 09:37:45 +00:00
kavindyaS007
92f2a6f50d improvements in policy ui 2022-09-28 13:08:31 +05:30
inoshperera
c14047f913 Fix issues in the swagger related to URLs 2022-09-28 11:13:00 +05:30
inoshperera
259795a274 fix swagger syntax issues 2022-09-20 22:09:41 +05:30
builder
223637c887 [maven-release-plugin] prepare for next development iteration 2022-09-14 20:25:10 +05:30
builder
b7311af447 [maven-release-plugin] prepare release v5.0.11 2022-09-14 20:25:02 +05:30
Amalka Subasinghe
5f1271db93 Fixes related to publishing ws api and routing requests 2022-09-12 06:03:21 +00:00
shamalka
eaad94b3e9 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar 2022-09-02 00:33:35 +05:30
shamalka
83be953583 Fix issues 2022-09-02 00:33:22 +05:30
Pahansith Gunathilake
fef1d41d39 Merge branch 'ldap-fixes' into 'master' 
Add optional user store domain query param to user APIs

See merge request entgra/carbon-device-mgt!892
 2022-09-01 18:15:58 +00:00
Oshani Silva
cc98f6a881 Update config files to fix billing UI isssues 2022-09-01 09:15:50 +00:00
shamalka
d61814329c Revert global exception msg 2022-09-01 11:03:45 +05:30
Rushdi
df60140f9c Remove unwanted codelines and handle exceptions 2022-08-31 20:38:33 +05:30
Rushdi
ce0d0a1903 revert changes 2022-08-31 16:07:34 +05:30
shamalka
c68478daca Fix formatting issues 2022-08-30 09:10:20 +05:30
shamalka
642067b146 Remove wildcard imports 2022-08-29 17:17:43 +05:30
shamalka
c312e69bf4 Revert unwanted change 2022-08-29 17:14:10 +05:30
shamalka
b311908d47 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar 2022-08-29 17:09:05 +05:30
shamalka
31bb87db41 Add missing error logs and fix formatting issues 2022-08-29 17:07:49 +05:30
Pahansith Gunathilake
6962e42ca8 Merge branch 'fix-groupnames' into 'master' 
Fix group names being able to be duplicated when renaming

See merge request entgra/carbon-device-mgt!907
 2022-08-25 13:40:55 +00:00
Pahansith Gunathilake
a50d37bbf2 Merge branch 'support-4.1.15' into 'master' 
Add Windows app uninstallation feature

See merge request entgra/carbon-device-mgt!904
 2022-08-25 10:41:14 +00:00
shamalka
5ff9ef7782 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar 2022-08-23 16:00:16 +05:30
Rushdi
29a2713af0 update the traccar-config.xml on test 2022-08-16 10:26:58 +05:30
navodzoysa
6b6e9ba640 Fix group names being able to be duplicated when renaming 2022-08-03 15:07:26 +05:30
navodzoysa
6a62546440 Add optional user domain query param to user APIs 2022-08-01 20:06:51 +05:30
builder
3c9fc68619 [maven-release-plugin] prepare for next development iteration 2022-07-18 23:07:51 +05:30
builder
0b4fe08847 [maven-release-plugin] prepare release v5.0.10 2022-07-18 23:07:47 +05:30
builder
0290758c25 [maven-release-plugin] prepare for next development iteration 2022-07-12 01:22:56 +05:30
builder
790ab62b34 [maven-release-plugin] prepare release v5.0.9 2022-07-12 01:22:51 +05:30
navodzoysa
c8527bd08b Add Windows app uninstallation feature 2022-07-04 12:15:43 +05:30
builder
7f96ce3c33 [maven-release-plugin] prepare for next development iteration 2022-06-27 19:20:21 +05:30
builder
e851e21bcd [maven-release-plugin] prepare release v5.0.8 2022-06-27 19:19:48 +05:30
Vigneshan
c974c4a0f0 Fix admin role not assigned issue during admin user creation 2022-06-16 13:53:07 +05:30
Rushdi
120c1150ce fix traccar speed measure on kmh 2022-06-13 12:14:22 +05:30
Rushdi
6f79180920 removed unwanted codes 2022-06-09 17:40:09 +05:30
Rushdi
e88d5e9c3b Add traccar configuration on p2.inf and updated mysql.sql 2022-06-09 01:28:17 +05:30
Rushdi
ab332e20ed Fix platform configuration for traccar 2022-06-03 16:11:18 +05:30
Rushdi
9f642701ea fix merge conflicts 2022-05-30 17:33:07 +05:30
Rushdi
f4d0050270 fix removing permission and organizing the code 2022-05-30 15:58:09 +05:30
Rushdi
83651efcb5 Remove unwanted codes 2022-05-30 15:52:21 +05:30
Rushdi
35a5230ef7 Fix admin login to tracker 2022-05-30 15:52:10 +05:30
Rushdi
a521985e98 Update tracker get token api 2022-05-30 15:52:09 +05:30
Rushdi
6b3294bd60 Update tracker get token api 2022-05-30 15:49:32 +05:30
Rushdi
11fa624b39 Add tracker API endpoint to return user token 2022-05-30 15:48:40 +05:30
Rushdi
6ccddf3f4b Update remove permission 2022-05-30 15:48:40 +05:30
Rushdi
6ce4168d75 Update permissions 2022-05-30 15:48:30 +05:30
Rushdi
515e826711 Update with callable thread and add set/remove user permission on enroll/disenroll device 2022-05-30 15:48:29 +05:30
Rushdi
74adeda997 Assign device to user when enrolling a device 2022-05-30 15:45:45 +05:30
Rushdi
2ebc24985a Create user when enrolling device 2022-05-30 15:45:45 +05:30
Rushdi
bd164ea78f fix NullPointerException 2022-05-30 15:45:44 +05:30
Rushdi
5c14315b4a Add JSONException 2022-05-30 15:45:23 +05:30
Rushdi
44ac5c8a8f Fixed the bugs 2022-05-30 15:45:13 +05:30
Rushdi
d1f2bdb296 update the threadpool apporoach/ add traccar devices/groups for existing UEM devices/groups 2022-05-30 15:44:09 +05:30
Rushdi
c3dd560878 Update group add/update/delete and device enroll/disenroll with traccar 2022-05-30 15:43:58 +05:30
Rushdi
9f6eaedbc3 check if location publishing to traccar enable or disabled 2022-05-30 15:39:15 +05:30
Rushdi
53f4fd7ebc Add add/delete a group from traccar 2022-05-30 15:39:03 +05:30
Rushdi
1dd2e35f89 Update traccar cofiguration 2022-05-30 15:38:48 +05:30
Rushdi
2e5a9002da Update traccar configuration 2022-05-30 15:37:24 +05:30
Rushdi
c18b3b1c1f Update the code structure 2022-05-30 15:36:59 +05:30
Rushdi
4e3567202d Update with okhttclient pool and threading 2022-05-30 15:36:59 +05:30
Rushdi
8d99123ec1 Update with Traccar Dis-Enrolling a Device via UEM 2022-05-30 15:36:58 +05:30
Rushdi
c4d75234b0 Initiate traccar to locate the geo locations in the map 2022-05-30 15:36:58 +05:30
builder
8636767cba [maven-release-plugin] prepare for next development iteration 2022-05-10 01:41:05 +05:30
builder
9af9bea2b6 [maven-release-plugin] prepare release v5.0.7 2022-05-10 01:41:01 +05:30
Pahansith Gunathilake
a7a567c971 Fix parse pom 2022-05-09 19:59:31 +00:00
Pahansith Gunathilake
4d76be36de Merge branch 'user-store' into 'master' 
Add new API to fetch userstores

See merge request entgra/carbon-device-mgt!884
 2022-05-08 19:04:45 +00:00
navodzoysa
b62b4aebc3 Add new API to fetch userstores 2022-05-08 22:09:08 +05:30
Pahansith Gunathilake
47fb2c77f5 Merge branch 'billing-api-1226' into 'master' 
Adding the new billing API

See merge request entgra/carbon-device-mgt!848
 2022-05-02 06:04:00 +00:00
builder
817dc57862 [maven-release-plugin] prepare for next development iteration 2022-04-26 06:12:00 +00:00
builder
7196d2daea [maven-release-plugin] prepare release v5.0.6 2022-04-26 06:11:55 +00:00
Mohamed Rashd
ab053807b3 Fix application managment test 2022-04-26 11:10:42 +05:30
Pahansith Gunathilake
da509f5c69 Merge branch 'policy-load' into 'master' 
Add new API to fetch UI policy list

See merge request entgra/carbon-device-mgt!881
 2022-04-25 08:04:13 +00:00
navodzoysa
340be6ed65 Add new API to fetch UI policy list 2022-04-18 22:46:06 +05:30
Mohamed Rashd
aa2fa45a5f Tempory merge conflict resolution 2022-04-16 00:28:05 +05:30
Mohamed Rashd
41a0c9118a Add java doc comments 
Use try-with resource when using CloseableHttpClient
Refactor few variable and method names
 2022-04-12 18:02:45 +05:30
osh
f86617a264 Add the sql files 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-04-07 09:42:35 +05:30
Mohamed Rashd
daaeed52e2 Add and Change licence from WSO2 to Entgra 2022-04-06 11:08:33 +05:30
osh
7ba8311c93 fix conflict 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-04-05 23:04:41 +05:30
osh
5ad9e3e6b4 Add billing data export api 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-04-05 22:59:23 +05:30
builder
946a12b84d [maven-release-plugin] prepare for next development iteration 2022-03-22 12:54:48 +00:00
builder
f55ffbb19a [maven-release-plugin] prepare release v5.0.5 2022-03-22 12:54:43 +00:00
Mohamed Rashd
38f9b60970 Fix sql query that gets subscribed devices 2022-03-21 18:21:40 +05:30
builder
39216aa651 [maven-release-plugin] prepare for next development iteration 2022-03-18 03:48:22 +00:00
builder
8deff13edd [maven-release-plugin] prepare release v5.0.4 2022-03-18 03:48:17 +00:00
Mohamed Rashd
59b2aa42b4 Fix duplicate devices in subscription log 2022-03-14 17:41:01 +05:30
osh
a4b2a325b1 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226 2022-03-11 01:38:59 +05:30
osh
053a57c4f5 Add getting billing cost by domain change 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-03-11 01:38:48 +05:30
Pahansith Gunathilake
aa2234dcdd Merge branch 'fix-geofence' into 'master' 
Fix invalid DAO factory handling & invalid event revoke payload

See merge request entgra/carbon-device-mgt!865
 2022-03-07 07:14:08 +00:00
Pahansith Gunathilake
7a4cef26e4 Fix invalid DAO factory handling & invalid event revoke payload 2022-03-07 12:00:09 +05:30
osh
c135105889 fixes https://gitlab.com/entgra/carbon-device-mgt/-/merge_requests/848/commits 
Add re-enrollment device cost calculation
 2022-03-07 01:21:02 +05:30
osh
8872d1baeb Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226 2022-03-06 10:03:12 +05:30
builder
96e4aa8436 [maven-release-plugin] prepare for next development iteration 2022-03-05 04:37:48 +00:00
builder
739266feca [maven-release-plugin] prepare release v5.0.3 2022-03-05 04:37:42 +00:00
Pahansith Gunathilake
27303cf12b Fix invalid DAO factory handling & invalid event revoke payload 2022-03-04 16:11:10 +05:30
Pahansith Gunathilake
778bb3e987 Fix invalid time immediate after device enrollment 2022-03-03 01:01:08 +05:30
osh
f611c45d3b Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226 2022-03-02 15:44:55 +05:30
osh
7b1b8ecffd Add last billed date 2022-03-02 15:44:41 +05:30
Pahansith Gunathilake
cb2e5e9c66 Fix test failure 2022-03-02 09:15:36 +05:30