Commit Graph

7560 Commits

Author SHA1 Message Date
Mohamed Rashd
1d84adbb4f Add java doc comment
Fix adding default white label on tenant create
Add whitelabel logo and favicon apis as non secured endpoints
Fix License
2022-05-21 10:44:06 +05:30
Mohamed Rashd
7907a1c5ff Add tenant whitelabeling api
Make whitelabel favion and logo api public
Refactor whitelabeling feature in separate classes
2022-05-21 10:41:56 +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
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
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