Commit Graph

10184 Commits

Author SHA1 Message Date
Pahansith Gunathilake
765351be2f Merge branch 'fix/duplicate/entries/subscription' into 'master'
Fix duplicate devices in subscription log

See merge request entgra/carbon-device-mgt!870
2022-03-16 05:00:50 +00:00
Mohamed Rashd
59b2aa42b4 Fix duplicate devices in subscription log 2022-03-14 17:41:01 +05:30
Dharmakeerthi Lasantha
c4091696b8 Merge branch 'feature/favourites/app' into 'master'
Add APIs to get favourite apps

See merge request entgra/carbon-device-mgt!866
2022-03-14 06:09:01 +00:00
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
Pahansith Gunathilake
a718201501 Merge branch 'fix/reporting/config/defautl/db/name' into 'master'
Fix reporting config default db name

See merge request entgra/carbon-device-mgt!862
2022-03-04 18:22:53 +00:00
Mohamed Rashd
b512ff0548 Fix grafana translation not working properly 2022-03-04 16:45:48 +05:30
Pahansith Gunathilake
2e4d17c140 Merge branch 'geofence-error' into 'master'
Fix invalid DAO factory handling & invalid event revoke payload

See merge request entgra/carbon-device-mgt!863
2022-03-04 10:54:53 +00:00
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
Mohamed Rashd
6a150b579c Fix reporting config default db name 2022-03-03 11:39:19 +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
c9b5998ce9 Merge branch 'fix-operation-buttons' into 'master'
Add missing scopes to enable operation buttons

See merge request entgra/carbon-device-mgt!857
2022-03-03 04:34:52 +00:00
Pahansith Gunathilake
1e1629e244 Merge branch 'refresh-token-fix' into 'master'
Remove production scope when token is refreshed

See merge request entgra/carbon-device-mgt!860
2022-03-03 04:34:43 +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
Charitha Goonetilleke
12acd443e6 Merge branch 'fix-test-failure' into 'master'
Fix test failure

See merge request entgra/carbon-device-mgt!859
2022-03-02 03:58:55 +00:00
Pahansith Gunathilake
cb2e5e9c66 Fix test failure 2022-03-02 09:15:36 +05:30
Charitha Goonetilleke
e11abeed99 Merge branch 'fix-enrollment-issue' into 'master'
Add separate DAO factory for event management

See merge request entgra/carbon-device-mgt!858
2022-03-02 00:54:33 +00:00
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
0cf45cdecf Fix android operation buttons not enabling 2022-03-01 11:27:28 +05:30
Charitha Goonetilleke
777392e36c Merge branch 'fix-enrollment-issue' into 'master'
Fix device enrollment failure

See merge request entgra/carbon-device-mgt!856
2022-03-01 05:53:01 +00:00
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