Commit Graph

9733 Commits

Author SHA1 Message Date
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
Pahansith Gunathilake
a78249528c Merge branch 'fix/applicationmgttest/is-integration' into 'master'
Fix application managment test

See merge request entgra/carbon-device-mgt!886
2022-04-26 06:03:12 +00:00
Muhammad Rashad
695f4c4a18 Add identity server connect scope to ui conf template 2022-04-26 05:54:00 +00:00
Mohamed Rashd
ab053807b3 Fix application managment test 2022-04-26 11:10:42 +05:30
Mohamed Rashd
6b91c89ad0 Add identity server create permission to ui configuration 2022-04-26 11:05:53 +05:30
Pahansith Gunathilake
d67cd9b07a Merge branch 'fix/dbscript/is-integration' into 'master'
Fix dbscript in service provider application integration feature

See merge request entgra/carbon-device-mgt!885
2022-04-25 15:56:47 +00:00
Mohamed Rashd
75f825a713 Fix dbscript syntax 2022-04-25 16:01:44 +05:30
Pahansith Gunathilake
fb331e0089 Merge branch 'fix/sp-app/dbscripts' into 'master'
Fix service provider app integration dbscripts

See merge request entgra/carbon-device-mgt!883
2022-04-25 08:04:37 +00:00
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
2f1228d845 Merge branch 'windows-scopes' into 'master'
Add missing permission scopes for windows device operations

See merge request entgra/carbon-device-mgt!878
2022-04-25 08:03:56 +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
2721588635 Merge branch 'fix-change-supadmin' into 'master'
Fix invalid config entries

See merge request entgra/carbon-device-mgt!880
2022-04-25 03:54:16 +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
cc15df69cc Fix AP_IDENTITY_SERVER table script 2022-04-20 14:40:45 +05:30
Mohamed Rashd
cadc9c9c87 Fix service provider app integration dbscripts 2022-04-19 23:44:40 +05:30
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
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