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
Vigneshan
638c6b12c9
Fix cross-tenant api subscription issue
2022-07-23 17:13:11 +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
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
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
7a250b9d11
Fix issue in parsing pom.xml in APIM keymgt module
2022-05-09 23:45:42 +05:30
Pahansith Gunathilake
d1754b465e
Merge branch 'fix/permissions' into 'master'
...
Fix identity server connect permission
See merge request entgra/carbon-device-mgt!887
2022-05-09 04:36:44 +00:00
Pahansith Gunathilake
075b9be096
Merge branch 'fix/application/by/uuid/isFavourite' into 'master'
...
Fix favorite application bean issue
See merge request entgra/carbon-device-mgt!888
2022-05-09 04:36:30 +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
b894d371fb
Merge branch 'master' into 'master'
...
Implement api keymgt extension
See merge request entgra/carbon-device-mgt!890
2022-05-02 06:26:31 +00:00
Vigneshan
2e8d1fabf0
Implement api keymgt extension
2022-05-02 11:34:45 +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
Mohamed Rashd
a98e1e4b24
Improve logging message
2022-04-29 17:53:42 +05:30
Mohamed Rashd
3b3c89849e
Fix favourite flag being always false when getting application by uuid
2022-04-28 16:18:09 +05:30
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
Mohamed Rashd
75f825a713
Fix dbscript syntax
2022-04-25 16:01:44 +05:30
Pahansith Gunathilake
331ccf4710
Merge branch 'fix/wrong/method/name' into 'master'
...
Fix using wrong method name
See merge request entgra/carbon-device-mgt!882
2022-04-25 08:04:24 +00:00
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
Pahansith Gunathilake
19872ea3b5
Merge branch 'windows-fixes' into 'master'
...
Temp fix for windows enrollment permission url mismatch
See merge request entgra/carbon-device-mgt!877
2022-04-25 08:03:46 +00:00
Pahansith Gunathilake
1f641966fe
Merge branch 'fix-1290' into 'master'
...
Fix API access issues under child tenant
See merge request entgra/carbon-device-mgt!879
2022-04-25 03:54:00 +00:00
Mohamed Rashd
631851f7e1
Fix using wrong method name
2022-04-19 17:19:10 +05:30
navodzoysa
340be6ed65
Add new API to fetch UI policy list
2022-04-18 22:46:06 +05:30
Mohamed Rashd
c66fa5bd60
Fix application conf error message
2022-04-18 19:06:26 +05:30
Mohamed Rashd
9df320dd3b
Resolve merge conflict
2022-04-18 14:30:12 +05:30
Mohamed Rashd
aa2fa45a5f
Tempory merge conflict resolution
2022-04-16 00:28:05 +05:30
inoshperera
f233f3d916
Fix API access issues under child tenant
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1290
2022-04-14 13:24:04 +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
navodzoysa
cf0be2ad93
Temp fix for windows enrollment permission url mismatch
2022-04-12 08:28:06 +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
Mohamed Rashd
db1aab1f3a
Add identity service provider config
2022-04-06 01:01:22 +05:30
Mohamed Rashd
c58f837585
Complete Identity Server create/delete/update APIs
2022-04-06 00:55:18 +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
Gimhan-minion
aed8d6f277
Fix validation of appname when a webclip is created
2022-03-23 19:43:53 +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
Pahansith Gunathilake
15b5aaa340
Merge branch 'feature1277' into 'master'
...
Generate QR with access token for given user
See merge request entgra/carbon-device-mgt!867
2022-03-18 03:39:05 +00:00
Mohamed Rashd
c0e5edded2
Add sql scripts to favourites table
...
Fix error logging in DAO layer
2022-03-17 23:39:31 +05:30
Pahansith Gunathilake
788eea4e26
Merge branch 'fix-group-search' into 'master'
...
Fix syntax error in group search while uninstalling apps
See merge request entgra/carbon-device-mgt!869
2022-03-16 08:17:33 +00:00
Pahansith Gunathilake
236d356a26
Merge branch 'pr/temp/feature/subscription/status/change' into 'master'
...
API to change application subscription status
See merge request entgra/carbon-device-mgt!868
2022-03-16 06:30:07 +00:00
Mohamed Rashd
59b2aa42b4
Fix duplicate devices in subscription log
2022-03-14 17:41:01 +05:30
Muhammad Rashad
65f5efb638
Add APIs to get favourite apps
2022-03-14 06:09:01 +00:00
Pahansith Gunathilake
c1cb8905fc
Fix syntax error in group search while uninstalling apps
2022-03-12 01:06:30 +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
Mohamed Rashd
0dd9bb2937
Add operation status update wrapper api to store
2022-03-11 00:31:37 +05:30
inoshperera
51cd59f436
Generate QR with access token for given user
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1277
2022-03-10 16:33:09 +05:30
Mohamed Rashd
3f60a0cdda
Fix sql query columns
...
Add createIdentityServer method to all DAOs
2022-03-08 08:27:00 +05:30
Mohamed Rashd
3dd0690552
Add identity server config
...
Add api to create identity server
Return List of identity servers withtout extra bean for response
2022-03-07 21:58:43 +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
4ab20f3205
Merge branch 'dev' into 'master'
...
Add query param to publish an app directly
See merge request entgra/carbon-device-mgt!847
2022-03-05 04:31:25 +00:00
Pahansith Gunathilake
ac5e8547c0
Merge branch 'fix/grafana/translation' into 'master'
...
Fix grafana translation not working properly
See merge request entgra/carbon-device-mgt!854
2022-03-05 04:31:18 +00:00
Mohamed Rashd
b512ff0548
Fix grafana translation not working properly
2022-03-04 16:45:48 +05:30
Pahansith Gunathilake
27303cf12b
Fix invalid DAO factory handling & invalid event revoke payload
2022-03-04 16:11:10 +05:30
Mohamed Rashd
6d7f082a6b
Fix grafana translation not working properly
2022-03-03 12:05:16 +05:30
Pahansith Gunathilake
02e0129d25
Merge branch 'fix/grafana/api/context/path/constant' into 'master'
...
Fix grafana api context path
See merge request entgra/carbon-device-mgt!844
2022-03-03 05:33:16 +00:00
Pahansith Gunathilake
713757c3bd
Merge branch 'fix/grafana/orgId/queryParam/constant' into 'master'
...
Fix grafana orgId query param name Constant
See merge request entgra/carbon-device-mgt!846
2022-03-03 05:32:59 +00:00
Pahansith Gunathilake
f0cd2d91a2
Merge branch 'feature/add-installed-version-to-subscription-details' into 'master'
...
Add installed version for installation details view
See merge request entgra/carbon-device-mgt!842
2022-03-03 05:30:29 +00:00
Pahansith Gunathilake
7ef698058a
Merge branch 'fix-timestamp' into 'master'
...
Fix invalid time showing in device list
See merge request entgra/carbon-device-mgt!861
2022-03-03 04:49:46 +00:00
Pahansith Gunathilake
778bb3e987
Fix invalid time immediate after device enrollment
2022-03-03 01:01:08 +05:30
Gimhan-minion
1186c9e292
Add query param to publish an enterprise release directly
2022-03-02 20:49:02 +05:30
Gimhan-minion
8bdffc90c6
Add query param to publish an app directly
2022-03-02 20:49:02 +05:30
Mohamed Rashd
986828bc16
Fix application count query not containing AP_APP_RELEASE columns when filtering
...
Fix inaccurate application count when an appliction has more than 1 release
2022-03-02 19:22:47 +05:30
navodzoysa
b402d14910
Remove production scope when token is refreshed
2022-03-02 15:52:29 +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
87808ec9df
Merge branch 'certificate-removal-issue-fix' into 'master'
...
Fix remove certificate API
See merge request entgra/carbon-device-mgt!855
2022-03-02 06:14:03 +00:00
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
Mohamed Rashd
097423b2b0
Improve api
2022-03-01 19:33:07 +05:30
Pahansith Gunathilake
12c48540d8
Fix device enrollment failure
2022-03-01 10:46:36 +05:30
Inosh Perara
294bf8ae90
Merge branch 'fix/post/api/not/non/repeatable/entity' into 'master'
...
Fix post api failing when trying the with refresh token due to non repeatable http entity
See merge request entgra/carbon-device-mgt!850
2022-03-01 05:03:07 +00:00
Chamindu Senanayake
5b5257301a
Fix remove certificate API
2022-03-01 10:27:59 +05:30
osh
3658e8fad2
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
2022-02-27 08:50:22 +05:30
Mohamed Rashd
fb2ab0963d
Remove unwanted new lines
2022-02-26 22:34:26 +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
charitha
507a21a047
Fix incorrect response handling logic
2022-02-23 11:03:58 +05:30
Mohamed Rashd
866686c6ea
Fix post api failing when trying the with refresh token due to non repeatable http entity
2022-02-22 16:50:51 +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
Mohamed Rashd
2c518aa2ac
Fix grafana orgId query param name Constant
2022-02-07 13:21:47 +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
Mohamed Rashd
65ae8dd774
Fix grafana api context path
2022-01-31 23:48:24 +05:30
Chandima
c89db6787d
Add installed version for installation details view
2022-01-26 16:53:49 +05:30
Mohamed Rashd
bb3f86defa
Fix typo in grafana api permission
2022-01-26 12:09:12 +05:30
builder
06560d24d4
[maven-release-plugin] prepare for next development iteration
2022-01-24 08:29:39 +00:00
builder
2784633dd6
[maven-release-plugin] prepare release v5.0.2
2022-01-24 08:29:35 +00:00
Pahansith Gunathilake
9085e45e21
Update pom.xml
2022-01-24 07:57:47 +00:00
Pahansith Gunathilake
dcdff9827d
Update pom.xml
2022-01-24 07:57:25 +00:00
Pahansith Gunathilake
c475a3d035
Update pom.xml
2022-01-24 07:57:06 +00:00
Pahansith Gunathilake
27b5283ff7
Update pom.xml
2022-01-24 07:56:23 +00:00
Pahansith Gunathilake
e17ca8a914
Update pom.xml
2022-01-24 07:56:02 +00:00
Muhammad Rashad
4e73b778e2
Move grafana to separate module
2022-01-24 07:19:31 +00:00
builder
1896199698
[maven-release-plugin] prepare for next development iteration
2022-01-24 04:04:22 +00:00
