Pahansith Gunathilake
b894d371fb
Merge branch 'master' into 'master'
...
Implement api keymgt extension
See merge request entgra/carbon-device-mgt!890
3 years ago
Vigneshan Seshamany
2e8d1fabf0
Implement api keymgt extension
3 years ago
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
Mohamed Rashd
a98e1e4b24
Improve logging message
3 years ago
Mohamed Rashd
3b3c89849e
Fix favourite flag being always false when getting application by uuid
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
Mohamed Rashd
ab053807b3
Fix application managment test
3 years ago
Mohamed Rashd
75f825a713
Fix dbscript syntax
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
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
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
631851f7e1
Fix using wrong method name
3 years ago
navodzoysa
340be6ed65
Add new API to fetch UI policy list
3 years ago
Mohamed Rashd
c66fa5bd60
Fix application conf error message
3 years ago
Mohamed Rashd
9df320dd3b
Resolve merge conflict
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
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
Gimhan-minion
aed8d6f277
Fix validation of appname when a webclip is created
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
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
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
Mohamed Rashd
59b2aa42b4
Fix duplicate devices in subscription log
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
Mohamed Rashd
b512ff0548
Fix grafana translation not working properly
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
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
Pahansith Gunathilake
713757c3bd
Merge branch 'fix/grafana/orgId/queryParam/constant' into 'master'
...
Fix grafana orgId query param name Constant
See merge request entgra/carbon-device-mgt!846
3 years ago
Pahansith Gunathilake
f0cd2d91a2
Merge branch 'feature/add-installed-version-to-subscription-details' into 'master'
...
Add installed version for installation details view
See merge request entgra/carbon-device-mgt!842
3 years ago
Pahansith Gunathilake
7ef698058a
Merge branch 'fix-timestamp' into 'master'
...
Fix invalid time showing in device list
See merge request entgra/carbon-device-mgt!861
3 years ago
Pahansith Gunathilake
778bb3e987
Fix invalid time immediate after device enrollment
3 years ago
Gimhan-minion
1186c9e292
Add query param to publish an enterprise release directly
3 years ago
Gimhan-minion
8bdffc90c6
Add query param to publish an app directly
3 years ago
Mohamed Rashd
986828bc16
Fix application count query not containing AP_APP_RELEASE columns when filtering
...
Fix inaccurate application count when an appliction has more than 1 release
3 years ago
navodzoysa
b402d14910
Remove production scope when token is refreshed
3 years ago
osh
f611c45d3b
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
3 years ago
osh
7b1b8ecffd
Add last billed date
3 years ago
Pahansith Gunathilake
87808ec9df
Merge branch 'certificate-removal-issue-fix' into 'master'
...
Fix remove certificate API
See merge request entgra/carbon-device-mgt!855
3 years ago
Pahansith Gunathilake
cb2e5e9c66
Fix test failure
3 years ago
Pahansith Gunathilake
35e0b9189e
Add separate DAO factory for event management
3 years ago
Mohamed Rashd
097423b2b0
Improve api
3 years ago
Pahansith Gunathilake
12c48540d8
Fix device enrollment failure
3 years ago
Inosh Perara
294bf8ae90
Merge branch 'fix/post/api/not/non/repeatable/entity' into 'master'
...
Fix post api failing when trying the with refresh token due to non repeatable http entity
See merge request entgra/carbon-device-mgt!850
3 years ago
Chamindu Senanayake
5b5257301a
Fix remove certificate API
3 years ago
osh
3658e8fad2
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
3 years ago
Mohamed Rashd
fb2ab0963d
Remove unwanted new lines
3 years ago
Mohamed Rashd
9cdc438970
Change to base64 string for file uploads instead of using multipart form data
...
Make release optional when creating new application
Fix screenshots not getting saved if duplicate screenshot file name found
Delete artifacts if errors while adding release to db
Improve service provider application related apis
Refactor code
3 years ago
Charitha Goonetilleke
507a21a047
Fix incorrect response handling logic
3 years ago
Mohamed Rashd
866686c6ea
Fix post api failing when trying the with refresh token due to non repeatable http entity
3 years ago
Mohamed Rashd
5e247c6e6b
Add identity server service provider app integration
3 years ago
osh
ed256ad346
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
...
resole cofilict
3 years ago
osh
d01aa2026d
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
...
Adding the new billing API
3 years ago
Mohamed Rashd
2c518aa2ac
Fix grafana orgId query param name Constant
3 years ago
Don Kushan Saminda Wijeratne
1e0e54e818
Setting maintenance user when carbon context user is null + fixing the function which sets statuses of all devices belonging to a user
3 years ago
Mohamed Rashd
65ae8dd774
Fix grafana api context path
3 years ago
Chandima Arangala
c89db6787d
Add installed version for installation details view
3 years ago
Mohamed Rashd
bb3f86defa
Fix typo in grafana api permission
3 years ago
builder
06560d24d4
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
2784633dd6
[maven-release-plugin] prepare release v5.0.2
3 years ago
Pahansith Gunathilake
9085e45e21
Update pom.xml
3 years ago
Pahansith Gunathilake
dcdff9827d
Update pom.xml
3 years ago
Pahansith Gunathilake
c475a3d035
Update pom.xml
3 years ago
Pahansith Gunathilake
27b5283ff7
Update pom.xml
3 years ago
Pahansith Gunathilake
e17ca8a914
Update pom.xml
3 years ago
Muhammad Rashad
4e73b778e2
Move grafana to separate module
3 years ago
builder
1896199698
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
a765f780f0
[maven-release-plugin] prepare release v5.0.1
3 years ago
Amalka Subasinghe
4ed28820c8
operation timeout feature
3 years ago
builder
ef558458a0
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
8e191e75a6
[maven-release-plugin] prepare release v5.0.0
3 years ago
Pahansith Gunathilake
8b6a3ef77c
Merge branch 'master' into 'master'
...
adding device status history feature
See merge request entgra/carbon-device-mgt!836
3 years ago
Don Kushan Saminda Wijeratne
7e7fa53b8f
adding device status history feature
3 years ago
Pahansith Gunathilake
21e014d6a6
Merge branch 'api/pr/grafana/device-mgt' into 'master'
...
Added grafana integration
See merge request entgra/carbon-device-mgt!829
3 years ago
Muhammad Rashad
1f536c40e4
Added grafana integration
3 years ago
builder
2e9832caa6
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
6b0c527bb2
[maven-release-plugin] prepare release v5.0.0
3 years ago
Rushdi Mohamed
e54765e992
Updated the operation status
3 years ago
Rushdi Mohamed
fd82162909
Added new operation status
3 years ago
Charitha Goonetilleke
78824205c1
Merge branch 'master' into 'master'
...
Allow retrieving activities for multiple device ids
See merge request entgra/carbon-device-mgt!831
3 years ago
shamalka
301a7e7009
Add additional attributes to policy UI beans
3 years ago
Charitha Goonetilleke
0284c955cf
Allow retrieving activities for multiple device ids
3 years ago
builder
d7ccaa559b
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
907fb825ea
[maven-release-plugin] prepare release v5.0.0
3 years ago
Pahansith Gunathilake
ee0a1007eb
Merge branch 'french-translation' into 'master'
...
Add access_token grant type
See merge request entgra/carbon-device-mgt!830
3 years ago
Pahansith Gunathilake
69677b4982
Merge branch 'modify-activity-epnew' into 'master'
...
Add time duration filtering to activities endpoint
See merge request entgra/carbon-device-mgt!828
3 years ago
Pahansith Gunathilake
51cf354f4a
Merge branch 'kernel-4.6.2' into 'master'
...
removed unwanted todos
See merge request entgra/carbon-device-mgt!825
3 years ago
Pahansith Gunathilake
91990141c5
Merge branch 'timestamp-fixes-1' into 'master'
...
Make timestamps independent from host machine timezone
See merge request entgra/carbon-device-mgt!823
3 years ago
Pahansith Gunathilake
b61c97d603
Make timestamps independent from host machine timezone
3 years ago
inoshperera
0bdd314cb8
Add access_token grant type
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1178
3 years ago
Pahansith Gunathilake
9f2cedd09c
Change time filtering DB column
3 years ago
Pahansith Gunathilake
a0856f7069
Add time duration filtering to activities EP
3 years ago
Amalka Subasinghe
fbc255b7a8
removed unwanted todos
3 years ago
Mohamed Rashd
fd0368b8b5
Change api that checks if an appName already exists, to accept the appName as query parameter instead of context-path
3 years ago
lasantha
4b64748448
Add app subscribing feature improvement
3 years ago
Pahansith Gunathilake
5da6c70502
Merge branch 'ios-500' into 'master'
...
ios enrollment fixes
See merge request entgra/carbon-device-mgt!819
3 years ago
Pahansith Gunathilake
26ef9bcf01
Merge branch 'subs-operation-status-fix' into 'master'
...
Fix operation status issue in app subscription
See merge request entgra/carbon-device-mgt!818
3 years ago
Pahansith Gunathilake
2026b9a6fa
Merge branch 'feature/filter-apis' into 'master'
...
Add API to retrieve filters for analytics
See merge request entgra/carbon-device-mgt!817
3 years ago
Pahansith Gunathilake
76782a9bb7
Merge branch 'fix-1189' into 'master'
...
Remove duplicate app subscriptions
See merge request entgra/carbon-device-mgt!820
3 years ago
inoshperera
b6c41eabb9
Remove duplicate app subscriptions
...
When there are multiple groups on the list, there is a possibility to create multiple subscriptions. The fix is to address this problem. Fixes https://gitlab.com/entgra/product-iots/-/issues/1189
3 years ago
inoshperera
fbfd9ba911
ios enrollment fixes
...
Fixes https://gitlab.com/entgra/product-iots/-/issues/1184
3 years ago
Chamindu Senanayake
7776e19946
Fix operation status issue in app subscription
...
Fixes https://gitlab.com/entgra/product-iots/-/issues/999
3 years ago
navodzoysa
71e6ca3bd0
Add API to retrieve filters for analytics
3 years ago
Charitha Goonetilleke
6f008ea65f
Allow users with CDM Admin permission to retrieve activities
3 years ago
Charitha Goonetilleke
3fea6f79c7
Add missing initiated by field in operation retrieval
3 years ago
Pahansith Gunathilake
731ae83bc4
Merge branch 'RemoteFix' into 'master'
...
Fix remote session failing issue
See merge request entgra/carbon-device-mgt!811
3 years ago
lasantha
4c921d54b1
Update APPM subscriptions when operation log updates
3 years ago
sandaru
4d0bf16a65
Fix remote session failing issue
3 years ago
builder
216e47b429
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
5c2dc99b09
[maven-release-plugin] prepare release v5.0.0
3 years ago
Pahansith Gunathilake
9daa745001
Merge branch 'kernel-4.6.x' into 'kernel-4.6.x'
...
Sync with master
See merge request entgra/carbon-device-mgt!807
3 years ago
Pahansith Gunathilake
26fb28efd9
Merge branch 'k-46x-test-fix-2' into 'kernel-4.6.x'
...
Fix test cases kernel-4.6.x
See merge request entgra/carbon-device-mgt!800
3 years ago
Pahansith Gunathilake
f22fc7e460
Fix test cases kernel-4.6.x
3 years ago
Saad Sahibjan
b3a229a0e7
Update device property table in dm db when updating properties
...
(cherry picked from commit 5f64b0b1ad
)
3 years ago
Saad Sahibjan
1434a27cde
Add new device status ASSIGNED
...
(cherry picked from commit 68405ed229
)
3 years ago
sandaru
eb05fb9a3f
Fix web-clip install issue
...
(cherry picked from commit ebe9842d9a
)
3 years ago
Saad Sahibjan
6393276503
Fix having UPPER in query of groups retrieval
...
(cherry picked from commit 4681447ba9
)
3 years ago
Pahansith Gunathilake
06935fd5fb
Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
...
fixed issue in updating apis
See merge request entgra/carbon-device-mgt!806
3 years ago
Amalka Subasinghe
7bb616075a
fixed issue in updating apis
3 years ago
Pahansith Gunathilake
9bba7edde8
Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
...
updating existing shared scope not required
See merge request entgra/carbon-device-mgt!803
3 years ago