Commit Graph

10598 Commits

Author SHA1 Message Date
Lasantha Dharmakeerthi
7376ff0476 Merge pull request 'Sync with upstream apim420' (#21) from sync-upstream into apim420
Reviewed-on: https://repository.entgra.net/tcdlpds/device-mgt-core/pulls/21
2023-10-24 18:40:56 +00:00
pasindu
66bc7e88bd Sync with upstream 2023-10-24 18:47:29 +05:30
Lasantha Dharmakeerthi
0dd57b8dd5 Fix sso login app creation payload and remove unused methods 2023-10-24 07:58:05 +00:00
Lasantha Dharmakeerthi
bfae0e0de8 Sync apim420 branch with master branch
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/261
2023-10-24 07:56:51 +00:00
pasindu
c7494bcd81 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420 2023-10-23 18:09:19 +05:30
pasindu
26a2950f85 Fix webapp publisher issues 2023-10-23 18:06:41 +05:30
pasindu
383eed95e8 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into sync-master 2023-10-23 12:45:44 +05:30
Lasantha Dharmakeerthi
ba17f0e778 Add tenant view perm to role permissions 2023-10-23 01:36:37 +00:00
prathabanKavin
9ab12d1b3f Add tenant view perm to role permissions 2023-10-22 12:02:13 +05:30
Lasantha Dharmakeerthi
566f6e9469 Fix the resource path not detecting issue 2023-10-20 09:42:18 +00:00
Rajitha Kumara
9054329e34 Fix not detecting resource path 2023-10-20 14:48:38 +05:30
Lasantha Dharmakeerthi
5d7f3627ed Add android remove account scope to ui config 2023-10-20 07:19:20 +00:00
navodzoysa
77d82238e2 Add android remove account scope to ui config 2023-10-20 11:58:24 +05:30
pasindu
a46ab4c355 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420 2023-10-20 00:43:12 +05:30
Lasantha Dharmakeerthi
ae5bcf4f8a Fix unmodifiable list referencing issue 2023-10-19 18:15:34 +00:00
Rajitha Kumara
a7387fda31 Add missed role key 2023-10-19 23:36:57 +05:30
Rajitha Kumara
30f7a32c55 Fix unmodifiable list referencing issue 2023-10-19 23:32:30 +05:30
pasindu
518bc7271a Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420 2023-10-19 14:34:14 +05:30
Lasantha Dharmakeerthi
947c174808 Add missing scope to mdm-ui-config.xml 2023-10-18 14:45:19 +00:00
Viranga Gunarathna
5d5fd5d9a0 Add missing scope 2023-10-18 20:01:11 +05:30
Lasantha Dharmakeerthi
8385c0c836 Fixes in API publishing flow 2023-10-18 08:56:17 +00:00
Inosh Perara
24d79b72cb Merge pull request 'Add new get device activities API' (#246) from Sasini_Sandamali/device-mgt-core-forked:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/246
2023-10-18 08:14:30 +00:00
Sasini_Sandamali
3631acfe45 Add new get device activities API 2023-10-18 12:51:14 +05:30
Charitha Goonetilleke
d3c24482cd Merge pull request 'Remove jaggery modules' (#258) from tcdlpds/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/258
2023-10-18 04:58:47 +00:00
Charitha Goonetilleke
31889b4a05 Merge branch 'master' into master 2023-10-18 04:43:04 +00:00
tcdlpds
8fa8cca776 Remove jaggery modules 2023-10-18 08:26:09 +05:30
f406399dca Merge pull request 'Fix errors with MSSQL cdm tables' (#256) from prathabanKavin/device-mgt-core:dbscriptfix into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/256
2023-10-17 17:26:25 +00:00
Amalka Subasinghe
d9f61ab35e Merge pull request 'Update db scripts' (#255) from rajitha/device-mgt-core:admin-role-isssue into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/255
2023-10-17 10:52:05 +00:00
prathabanKavin
ead5f2dfc4 Fix errors with cdm tables 2023-10-17 15:49:46 +05:30
Rajitha Kumara
3d30ee9135 Update db scripts 2023-10-17 12:35:51 +05:30
pasindu
1325780e3b Map JsonObject to dto classes in publisher API documentation 2023-10-17 12:25:28 +05:30
pasindu
fa37fa33cc Map JsonObject to dto classes in publisher API revesion 2023-10-17 12:25:28 +05:30
pasindu
bdf1e97d84 Map Json object return types to dto classes in Publisher 2023-10-17 12:25:28 +05:30
pasindu
565a7614ad Change JSON object return methods:Scopes 2023-10-17 12:25:28 +05:30
pasindu
1eda7bd237 Fixes in API publishing flow 2023-10-17 12:25:28 +05:30
9767f7e90f Add validation for user deletion (#244)
## Purpose
* Fixes https://roadmap.entgra.net/issues/10337

## Description
* Add validation to check whether the user has enrolled devices

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/244
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-10-17 04:20:12 +00:00
Charitha Goonetilleke
7a9869f044 Merge pull request 'Improvements to the device sub type impl' (#248) from amalka.subasinghe/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/248
2023-10-16 06:59:56 +00:00
Charitha Goonetilleke
e3e9ad851c Merge branch 'master' into master 2023-10-16 05:54:10 +00:00
Inosh Perara
15de6d397e Merge pull request 'Add permission updating logic' (#254) from tcdlpds/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/254
2023-10-16 05:39:04 +00:00
Oshani Silva
c3cc4fe6d4 Add fix for search operation (#251)
fixes https://roadmap.entgra.net/issues/10279

Co-authored-by: osh <osh.silva@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/251
Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>
2023-10-16 05:21:44 +00:00
tcdlpds
1b0ad156b2 Add Java Doc comments 2023-10-16 10:36:51 +05:30
8696ec9343 Merge pull request 'Modify get Geofence API to get total count' (#243) from pramilaniroshan/device-mgt-core:add-geofence-count into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/243
2023-10-16 04:27:46 +00:00
akeela_azhar
22b9897a4b Add permission updating logic 2023-10-16 08:00:42 +05:30
Lasantha Dharmakeerthi
fe795bc399 Add admin role when adding shared scopes 2023-10-15 12:55:43 +00:00
Rajitha Kumara
4418caa631 Update db scripts 2023-10-15 16:03:06 +05:30
Rajitha Kumara
3a63f948a0 Add admin role when adding shared scopes 2023-10-15 14:25:37 +05:30
98954c9374 Merge pull request 'Add default perm config' (#252) from tcdlpds/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/252
2023-10-13 05:47:00 +00:00
Inosh Perara
6b7c4e9069 Merge pull request 'Fix scope-permission mapping issue' (#249) from viranga/device-mgt-core:scope-fixes into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/249
2023-10-13 04:30:50 +00:00
tcdlpds
49747efa18 Add default perm config 2023-10-13 09:39:44 +05:30
Viranga Gunarathna
d63f2a3f24 mapping permissions with scopes 2023-10-12 15:25:20 +05:30