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 |
|
osh
|
053a57c4f5
|
Add getting billing cost by domain change
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
|
3 years ago |
|
Mohamed Rashd
|
0dd9bb2937
|
Add operation status update wrapper api to store
|
3 years ago |
|
inoshperera
|
51cd59f436
|
Generate QR with access token for given user
fixes https://gitlab.com/entgra/product-iots/-/issues/1277
|
3 years ago |
|
Mohamed Rashd
|
3f60a0cdda
|
Fix sql query columns
Add createIdentityServer method to all DAOs
|
3 years ago |
|
Mohamed Rashd
|
3dd0690552
|
Add identity server config
Add api to create identity server
Return List of identity servers withtout extra bean for response
|
3 years ago |
|
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
|
3 years ago |
|
Pahansith Gunathilake
|
7a4cef26e4
|
Fix invalid DAO factory handling & invalid event revoke payload
|
3 years ago |
|
osh
|
c135105889
|
fixes https://gitlab.com/entgra/carbon-device-mgt/-/merge_requests/848/commits
Add re-enrollment device cost calculation
|
3 years ago |
|
osh
|
8872d1baeb
|
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
|
3 years ago |
|
builder
|
96e4aa8436
|
[maven-release-plugin] prepare for next development iteration
|
3 years ago |
|
builder
|
739266feca
|
[maven-release-plugin] prepare release v5.0.3
|
3 years ago |
|
Pahansith Gunathilake
|
4ab20f3205
|
Merge branch 'dev' into 'master'
Add query param to publish an app directly
See merge request entgra/carbon-device-mgt!847
|
3 years ago |
|
Pahansith Gunathilake
|
ac5e8547c0
|
Merge branch 'fix/grafana/translation' into 'master'
Fix grafana translation not working properly
See merge request entgra/carbon-device-mgt!854
|
3 years ago |
|
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
|
3 years ago |
|
Mohamed Rashd
|
b512ff0548
|
Fix grafana translation not working properly
|
3 years ago |
|
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
|
3 years ago |
|
Pahansith Gunathilake
|
27303cf12b
|
Fix invalid DAO factory handling & invalid event revoke payload
|
3 years ago |
|
Mohamed Rashd
|
6d7f082a6b
|
Fix grafana translation not working properly
|
3 years ago |
|
Mohamed Rashd
|
6a150b579c
|
Fix reporting config default db name
|
3 years ago |
|
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
|
3 years ago |
