Commit Graph

9963 Commits

Author SHA1 Message Date
shamalka
5ff9ef7782 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar 2022-08-23 16:00:16 +05:30
amith10
ccf8e108c0 Add remove account scope 2022-08-22 12:24:07 +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
Pahansith Gunathilake
2a5630cfb7 Merge branch 'fix/cross-tenant-api-subscription' into 'master'
Fix cross-tenant api subscription issue

See merge request entgra/carbon-device-mgt!905
2022-07-26 08:43:23 +00:00
Vigneshan
638c6b12c9 Fix cross-tenant api subscription issue 2022-07-23 17:13:11 +05:30
Pahansith Gunathilake
426dcf16bf Merge branch 'ui-config' into 'master'
Add Windows permission scopes to ui config

See merge request entgra/carbon-device-mgt!895
2022-07-18 20:55:11 +00:00
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
Pahansith Gunathilake
cd6a4e3c0c Merge branch 'master' into 'master'
Implement multi-tenant api publishing

See merge request entgra/carbon-device-mgt!900
2022-07-18 12:00:58 +00:00
Vigneshan
ebc5f5de31 Implement multi-tenant api publishing 2022-07-15 11:10: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
Inosh Perara
68956f0c92 Merge branch 'fix/admin-user-role-assignment-issue' into 'master'
Fix admin role not assigned issue during admin user creation

See merge request entgra/carbon-device-mgt!901
2022-07-11 09:30:02 +00:00
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
Mohamed Rashd
af25528a8b Delete custom whitelabel favicon and logo on whitelabel reset 2022-06-10 14:48:16 +05:30
Rushdi
6f79180920 removed unwanted codes 2022-06-09 17:40:09 +05:30
Mohamed Rashd
c63168be62 Fix passing favicon image bean when retrieving existing logo 2022-06-09 17:00:52 +05:30
Rushdi
e88d5e9c3b Add traccar configuration on p2.inf and updated mysql.sql 2022-06-09 01:28:17 +05:30
Mohamed Rashd
be15bf9185 Fix log message 2022-06-08 13:45:08 +05:30
Mohamed Rashd
eb061f9450 Refator page tite to app title 2022-06-08 13:40:33 +05:30
Mohamed Rashd
78546125bc Add page title to whitelable 2022-06-08 00:03:37 +05:30
Rushdi
f61ab0ae69 update p2.inf for traccar 2022-06-07 18:56:28 +05:30
Mohamed Rashd
7df4aff569 Fix retrieving favicon as logo when retrieving existing images for rollback 2022-06-07 13:32:42 +05:30
Mohamed Rashd
743a12083b Refactor whitelabel update api method name to update from create 2022-06-07 09:34:16 +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
1a7442ba3d Update h2.sql script 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
9d9ff9f391 Update h2.sql with traccar group/device mapping tables 2022-05-30 15:43:58 +05:30
Rushdi
c3dd560878 Update group add/update/delete and device enroll/disenroll with traccar 2022-05-30 15:43:58 +05:30