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
35a5230ef7
Fix admin login to tracker
2022-05-30 15:52:10 +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
Pahansith Gunathilake
a7a567c971
Fix parse pom
2022-05-09 19:59:31 +00:00
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
Mohamed Rashd
ab053807b3
Fix application managment test
2022-04-26 11:10:42 +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
Mohamed Rashd
38f9b60970
Fix sql query that gets subscribed devices
2022-03-21 18:21:40 +05:30
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
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
Pahansith Gunathilake
35e0b9189e
Add separate DAO factory for event management
2022-03-02 00:54:33 +00:00
Pahansith Gunathilake
12c48540d8
Fix device enrollment failure
2022-03-01 10:46:36 +05:30
Mohamed Rashd
9cdc438970
Change to base64 string for file uploads instead of using multipart form data
...
Make release optional when creating new application
Fix screenshots not getting saved if duplicate screenshot file name found
Delete artifacts if errors while adding release to db
Improve service provider application related apis
Refactor code
2022-02-26 22:25:57 +05:30
Mohamed Rashd
5e247c6e6b
Add identity server service provider app integration
2022-02-21 13:47:48 +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
Don Kushan Saminda Wijeratne
1e0e54e818
Setting maintenance user when carbon context user is null + fixing the function which sets statuses of all devices belonging to a user
2022-02-02 09:04:29 +00:00
