Commit Graph

7509 Commits

Author SHA1 Message Date
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
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
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
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
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
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
builder
a765f780f0 [maven-release-plugin] prepare release v5.0.1 2022-01-24 04:04:17 +00:00
Amalka Subasinghe
4ed28820c8 operation timeout feature 2022-01-24 03:56:25 +00:00
builder
ef558458a0 [maven-release-plugin] prepare for next development iteration 2022-01-18 03:25:27 +00:00
builder
8e191e75a6 [maven-release-plugin] prepare release v5.0.0 2022-01-18 03:25:22 +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