Commit Graph

8000 Commits

Author SHA1 Message Date
osh
dd7910268e Add vpp token field 2023-07-17 13:36:39 +05:30
osh
b576f3d9bb Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2 2023-07-17 10:43:21 +05:30
Inosh Perara
2dd3e86f69 Merge pull request 'Grouping Issues' (#181) from ThilinaPremachandra/device-mgt-core:groupingIssues into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/181
2023-07-15 11:28:14 +00:00
ThilinaPremachandra
6dbad29776 fix: role sharing issues for other users 2023-07-15 16:27:40 +05:30
osh
cd17d06158 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2 2023-07-14 09:46:41 +05:30
Charitha Goonetilleke
6e1e58f2ec Merge branch 'master' into master 2023-07-13 16:33:56 +00:00
osh
2249520132 Resolve conflicts 2023-07-13 17:46:04 +05:30
navodzoysa
90741dc502 Fix class not found error in analytics component 2023-07-11 23:08:33 +05:30
osh
eb740773aa Improve update asset DAO
fixes https://roadmap.entgra.net/issues/10179
2023-07-11 15:59:42 +05:30
Sasini_Sandamali
b9ecb8ce40 Rearrange getOperations by eliminating the necessity of the owner param 2023-07-10 13:18:07 +05:30
Thilina Sandaruwan
38b8c8d7b1 Grouping Improvements (#169)
Purpose

After deleting a role, delete relevant records from DM_ROLE_GROUP_MAP table
Related tickets: https://roadmap.entgra.net/issues/9528 and https://roadmap.entgra.net/issues/9529

Co-authored-by: ThilinaPremachandra <thilina@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/169
Co-authored-by: Thilina Sandaruwan <thilina@entgra.io>
Co-committed-by: Thilina Sandaruwan <thilina@entgra.io>
2023-07-10 07:46:21 +00:00
osh
81fd5687ef Update user service and token retrieval 2023-07-09 00:50:57 +05:30
ThilinaPremachandra
253dc03233 fix: deleted roles removing issue 2023-07-06 20:38:06 +05:30
ThilinaPremachandra
907043fd91 Merge branch 'master' 2023-07-06 09:56:47 +05:30
osh
dae8c09761 Resolve comments 2023-07-05 22:38:10 +05:30
osh
b978e31ab0 Resolve conflicts
fixes https://roadmap.entgra.net/issues/10186
2023-07-05 20:56:29 +05:30
osh
0e5478fb5e Add association DAO and fix meta issue
fixes https://roadmap.entgra.net/issues/10186
2023-07-05 20:49:46 +05:30
rajitha
67cdcede69 Fix realm service unbinding issues 2023-07-05 20:21:48 +05:30
inoshperera
026986cd93 Add DAO improvements for user APIs
Fixes https://roadmap.entgra.net/issues/10169
2023-07-05 17:16:38 +05:30
ThilinaPremachandra
6c645db486 add: proper msg for group delete 2023-07-05 11:54:12 +05:30
rajitha
5818a5eaed Fix transaction initiating issue 2023-07-04 18:37:39 +05:30
osh
c9ed09ee25 Resolve conflicts 2023-07-04 08:50:39 +05:30
ThilinaPremachandra
6d012bc614 fix: group assigned role issue 2023-07-03 18:53:34 +05:30
ThilinaPremachandra
aecc106f95 add: super-tenant admin check 2023-07-02 01:23:13 +05:30
ThilinaPremachandra
39f5ee8ca3 fix: sub tenants grouping issue 2023-07-01 21:06:29 +05:30
osh
1263c09079 Add DAOs for asset management
fixes https://roadmap.entgra.net/issues/10179
2023-06-30 19:05:59 +05:30
inoshperera
54111b4d94 Add association apis
fixes https://roadmap.entgra.net/issues/10182
2023-06-30 13:32:47 +05:30
inoshperera
61ffd4abff Fixing conflics 2023-06-29 09:31:46 +05:30
navodzoysa
8d9e3c8f51 Remove reserved_user when fetching users 2023-06-29 00:34:09 +05:30
osh
2e799a545f Resolve comments 2023-06-28 21:43:06 +05:30
Nishan Sangeeth
3616245ae6 Improve app visibility restricting functionality
Co-authored-by: Nishan Sangeeth <nishan@entgra.io>
Co-committed-by: Nishan Sangeeth <nishan@entgra.io>
2023-06-28 16:00:53 +00:00
inoshperera
665702d504 Add asset apis
Fixes https://roadmap.entgra.net/issues/10178
2023-06-28 21:08:20 +05:30
osh
cd42a2c48f Adding the DAO layer for vpp user management
fixes https://roadmap.entgra.net/issues/10169
2023-06-28 20:03:16 +05:30
e0a1cd3dbb Merge pull request 'Add api for get visible roles' (#146) from nishan/device-mgt-core:add-visible-role-api into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/146
2023-06-27 12:50:35 +00:00
Thilina Sandaruwan
498dc7ae34 HierarchicalGrouping (#153)
Goals
Complete hierarchical grouping task
https://roadmap.entgra.net/issues/9528 and https://roadmap.entgra.net/issues/9529

Approach
Fix the encountered issues

Co-authored-by: ThilinaPremachandra <thilina@entgra.io>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/153
Co-authored-by: Thilina Sandaruwan <thilina@entgra.io>
Co-committed-by: Thilina Sandaruwan <thilina@entgra.io>
2023-06-27 08:57:23 +00:00
rajitha
d5270c720c Update invite link 2023-06-27 13:42:07 +05:30
979d3b48cb Merge branch 'master' into sync-master 2023-06-27 05:49:13 +00:00
Inosh Perara
da694c3dbe Merge pull request 'Add device enrolment log for modifyenrolment' (#148) from prathabanKavin/device-mgt-core:enrolmentlogfix into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/148
2023-06-27 05:32:13 +00:00
Inosh Perara
f246d6b8de Merge pull request 'add vpp user services' (#151) from inosh/device-mgt-core:vpp into vpp-v2
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/151
2023-06-26 13:46:51 +00:00
inoshperera
cc8470d3c0 add vpp user services 2023-06-26 19:10:17 +05:30
navodzoysa
7073deb461 Fix skip app release error 2023-06-26 14:15:29 +05:30
763cd7df25 Fix missing imports 2023-06-26 13:43:13 +05:30
92d7f5b61f Resolve Conflicts 2023-06-26 13:31:39 +05:30
nishan
cd962b8d24 Remove the user has role validation 2023-06-26 07:28:53 +05:30
nishan
4a31d80660 add api for get visible roles 2023-06-26 02:12:52 +05:30
Oshani Silva
6109f58c49 Remove unwanted check in billing logic
Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>
2023-06-25 19:14:59 +00:00
prathabanKavin
389eb05084 Add device enrolment log for modifyenrolment 2023-06-25 20:04:36 +05:30
Inosh Perara
9dd24eda17 Merge pull request 'Add vpp user apis' (#147) from inosh/device-mgt-core:vpp into vpp-v2
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/147
2023-06-23 17:54:49 +00:00
inoshperera
9ccf3a5fa5 Add vpp user apis
fixes https://roadmap.entgra.net/issues/10162
2023-06-23 23:22:40 +05:30
577e3e9384 Remove unnecessary logs 2023-06-23 20:39:12 +05:30