Commit Graph

9712 Commits

Author SHA1 Message Date
navodzoysa
340be6ed65 Add new API to fetch UI policy list 2022-04-18 22:46:06 +05:30
Pahansith Gunathilake
270904102d Merge branch 'pr/revert/feature/no/sync/ui/sp-apps' into 'master'
Add identity server service provider app integration

See merge request entgra/carbon-device-mgt!849
2022-04-18 16:41:32 +00:00
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
Pahansith Gunathilake
ba53197ab7 Fix invalid config entries 2022-04-16 01:03:25 +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
b11f4d08f7 Add missing permission scopes for windows device operations 2022-04-12 08:32:04 +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
Pahansith Gunathilake
d265655e88 Merge branch 'fix/subscription/status/change/h2/query' into 'master'
Fix sql query that gets subscribed devices

See merge request entgra/carbon-device-mgt!873
2022-03-22 11:26:08 +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
Dharmakeerthi Lasantha
9292b3b6dd Merge branch 'add/sql/scripts/favourites' into 'master'
Add sql scripts to add app favouties table

See merge request entgra/carbon-device-mgt!872
2022-03-17 18:34:53 +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
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