Pahansith Gunathilake
|
47fb2c77f5
|
Merge branch 'billing-api-1226' into 'master'
Adding the new billing API
See merge request entgra/carbon-device-mgt!848
|
3 years ago |
builder
|
817dc57862
|
[maven-release-plugin] prepare for next development iteration
|
3 years ago |
builder
|
7196d2daea
|
[maven-release-plugin] prepare release v5.0.6
|
3 years ago |
Pahansith Gunathilake
|
a78249528c
|
Merge branch 'fix/applicationmgttest/is-integration' into 'master'
Fix application managment test
See merge request entgra/carbon-device-mgt!886
|
3 years ago |
Mohamed Rashd
|
ab053807b3
|
Fix application managment test
|
3 years ago |
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
|
3 years ago |
Mohamed Rashd
|
75f825a713
|
Fix dbscript syntax
|
3 years ago |
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
|
3 years ago |
Pahansith Gunathilake
|
331ccf4710
|
Merge branch 'fix/wrong/method/name' into 'master'
Fix using wrong method name
See merge request entgra/carbon-device-mgt!882
|
3 years ago |
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
|
3 years ago |
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
|
3 years ago |
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
|
3 years ago |
Pahansith Gunathilake
|
2721588635
|
Merge branch 'fix-change-supadmin' into 'master'
Fix invalid config entries
See merge request entgra/carbon-device-mgt!880
|
3 years ago |
Pahansith Gunathilake
|
1f641966fe
|
Merge branch 'fix-1290' into 'master'
Fix API access issues under child tenant
See merge request entgra/carbon-device-mgt!879
|
3 years ago |
Mohamed Rashd
|
cc15df69cc
|
Fix AP_IDENTITY_SERVER table script
|
3 years ago |
Mohamed Rashd
|
cadc9c9c87
|
Fix service provider app integration dbscripts
|
3 years ago |
Mohamed Rashd
|
631851f7e1
|
Fix using wrong method name
|
3 years ago |
navodzoysa
|
340be6ed65
|
Add new API to fetch UI policy list
|
3 years ago |
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
|
3 years ago |
Mohamed Rashd
|
c66fa5bd60
|
Fix application conf error message
|
3 years ago |
Mohamed Rashd
|
9df320dd3b
|
Resolve merge conflict
|
3 years ago |
Pahansith Gunathilake
|
ba53197ab7
|
Fix invalid config entries
|
3 years ago |
Mohamed Rashd
|
aa2fa45a5f
|
Tempory merge conflict resolution
|
3 years ago |
inoshperera
|
f233f3d916
|
Fix API access issues under child tenant
fixes https://gitlab.com/entgra/product-iots/-/issues/1290
|
3 years ago |
Mohamed Rashd
|
41a0c9118a
|
Add java doc comments
Use try-with resource when using CloseableHttpClient
Refactor few variable and method names
|
3 years ago |
navodzoysa
|
b11f4d08f7
|
Add missing permission scopes for windows device operations
|
3 years ago |
navodzoysa
|
cf0be2ad93
|
Temp fix for windows enrollment permission url mismatch
|
3 years ago |
osh
|
f86617a264
|
Add the sql files
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
|
3 years ago |
Mohamed Rashd
|
daaeed52e2
|
Add and Change licence from WSO2 to Entgra
|
3 years ago |
Mohamed Rashd
|
db1aab1f3a
|
Add identity service provider config
|
3 years ago |
Mohamed Rashd
|
c58f837585
|
Complete Identity Server create/delete/update APIs
|
3 years ago |
osh
|
7ba8311c93
|
fix conflict
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
|
3 years ago |
osh
|
5ad9e3e6b4
|
Add billing data export api
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
|
3 years ago |
builder
|
946a12b84d
|
[maven-release-plugin] prepare for next development iteration
|
3 years ago |
builder
|
f55ffbb19a
|
[maven-release-plugin] prepare release v5.0.5
|
3 years ago |
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
|
3 years ago |
Mohamed Rashd
|
38f9b60970
|
Fix sql query that gets subscribed devices
|
3 years ago |
builder
|
39216aa651
|
[maven-release-plugin] prepare for next development iteration
|
3 years ago |
builder
|
8deff13edd
|
[maven-release-plugin] prepare release v5.0.4
|
3 years ago |
Pahansith Gunathilake
|
15b5aaa340
|
Merge branch 'feature1277' into 'master'
Generate QR with access token for given user
See merge request entgra/carbon-device-mgt!867
|
3 years ago |
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
|
3 years ago |
Mohamed Rashd
|
c0e5edded2
|
Add sql scripts to favourites table
Fix error logging in DAO layer
|
3 years ago |
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
|
3 years ago |
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
|
3 years ago |
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
|
3 years ago |
Mohamed Rashd
|
59b2aa42b4
|
Fix duplicate devices in subscription log
|
3 years ago |
Dharmakeerthi Lasantha
|
c4091696b8
|
Merge branch 'feature/favourites/app' into 'master'
Add APIs to get favourite apps
See merge request entgra/carbon-device-mgt!866
|
3 years ago |
Muhammad Rashad
|
65f5efb638
|
Add APIs to get favourite apps
|
3 years ago |
Pahansith Gunathilake
|
c1cb8905fc
|
Fix syntax error in group search while uninstalling apps
|
3 years ago |
osh
|
a4b2a325b1
|
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
|
3 years ago |