Commit Graph

926 Commits

Author SHA1 Message Date
navodzoysa
a367cd6b35 Fix duplicate group and role error handling responses 2022-12-12 13:44:27 +05:30
Shamalka Navod
df5cdb5240 Fix traccar issues (#5)
* Fix traccar client thredpool issue
* Refactor traccar implementation
* Fix traccar loading issue

Co-authored-by: shamalka <shamalkanavod95@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/5
Co-authored-by: Shamalka Navod <shamalka@entgra.io>
Co-committed-by: Shamalka Navod <shamalka@entgra.io>
2022-11-10 15:36:55 +00:00
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
Kavindya Sathsarani
bb5f779c26 Add a searchable input for App Restriction Settings policy 2022-10-04 09:37:45 +00:00
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
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
shamalka
d61814329c Revert global exception msg 2022-09-01 11:03:45 +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
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
shamalka
5ff9ef7782 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar 2022-08-23 16:00:16 +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
Vigneshan
c974c4a0f0 Fix admin role not assigned issue during admin user creation 2022-06-16 13:53: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
515e826711 Update with callable thread and add set/remove user permission on enroll/disenroll device 2022-05-30 15:48:29 +05:30
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
navodzoysa
340be6ed65 Add new API to fetch UI policy list 2022-04-18 22:46:06 +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
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
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
ed256ad346 fixes https://gitlab.com/entgra/product-iots/-/issues/1226
resole cofilict
2022-02-17 14:06:43 +05:30
osh
d01aa2026d fixes https://gitlab.com/entgra/product-iots/-/issues/1226
Adding the new billing API
2022-02-17 13:58:15 +05:30
Muhammad Rashad
4e73b778e2 Move grafana to separate module 2022-01-24 07:19:31 +00:00
Pahansith Gunathilake
8b6a3ef77c Merge branch 'master' into 'master'
adding device status history feature

See merge request entgra/carbon-device-mgt!836
2022-01-18 03:18:30 +00:00
Don Kushan Saminda Wijeratne
7e7fa53b8f adding device status history feature 2022-01-18 03:18:29 +00:00
Pahansith Gunathilake
21e014d6a6 Merge branch 'api/pr/grafana/device-mgt' into 'master'
Added grafana integration

See merge request entgra/carbon-device-mgt!829
2022-01-18 03:11:09 +00:00
Muhammad Rashad
1f536c40e4 Added grafana integration 2022-01-18 03:11:08 +00:00
Rushdi
e54765e992 Updated the operation status 2022-01-05 13:30:42 +05:30
Rushdi
fd82162909 Added new operation status 2022-01-05 13:04:42 +05:30
charitha
0284c955cf Allow retrieving activities for multiple device ids 2021-12-15 14:48:49 +05:30
Pahansith Gunathilake
69677b4982 Merge branch 'modify-activity-epnew' into 'master'
Add time duration filtering to activities endpoint

See merge request entgra/carbon-device-mgt!828
2021-12-04 17:08:27 +00:00
Pahansith Gunathilake
9f2cedd09c Change time filtering DB column 2021-12-01 17:10:45 +05:30
Pahansith Gunathilake
a0856f7069 Add time duration filtering to activities EP 2021-12-01 17:03:38 +05:30
Amalka Subasinghe
fbc255b7a8 removed unwanted todos 2021-11-30 11:58:42 +05:30
Pahansith Gunathilake
26ef9bcf01 Merge branch 'subs-operation-status-fix' into 'master'
Fix operation status issue in app subscription

See merge request entgra/carbon-device-mgt!818
2021-11-22 11:14:26 +00:00
Chamindu Senanayake
7776e19946 Fix operation status issue in app subscription
Fixes https://gitlab.com/entgra/product-iots/-/issues/999
2021-11-15 05:30:04 +05:30
navodzoysa
71e6ca3bd0 Add API to retrieve filters for analytics 2021-11-12 16:56:18 +05:30