Commit Graph

5548 Commits

Author SHA1 Message Date
osh
4fbcd75a61 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into unmanaged-install-9211 2023-08-22 09:43:51 +05:30
osh
1fed47e8fd Add app details for UNMANAGED_APP_UNINSTALL 2023-08-21 23:27:58 +05:30
388f34e3b8 Fix try-it meta-info getting issue 2023-08-21 12:44:42 +05:30
shamalka
f286cb2306 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into device-info-config 2023-08-17 01:20:50 +05:30
tcdlpds
f9ae594326 Fix APPs getting issue in APPM DAO 2023-08-16 08:35:45 +05:30
shamalka
67864cb762 Add deviceinfo config beans 2023-08-15 12:48:58 +05:30
osh
81e57ce78f Retrieve extra details 2023-08-10 13:01:41 +05:30
osh
e2a467bc45 Update activity loading 2023-08-09 15:03:29 +05:30
osh
9fa34a32af Resolve conflicts 2023-08-09 00:29:30 +05:30
osh
e6ee539239 Add api changes for getting app details of operation 2023-08-09 00:27:33 +05:30
osh
a20c5a723c Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2 2023-08-07 11:41:55 +05:30
Charitha Goonetilleke
462669e3ec Merge branch 'master' into master 2023-08-02 08:34:57 +00:00
builder
fabd3ebae8 [maven-release-plugin] prepare for next development iteration 2023-07-27 21:09:35 +05:30
builder
02458cc4fe [maven-release-plugin] prepare release v5.0.28 2023-07-27 21:09:27 +05:30
prathabanKavin
f091d26f9c Fix issues with retrieving visible roles 2023-07-27 16:39:08 +05:30
prathabanKavin
20906122db Fix for visible role issue 2023-07-27 15:39:52 +05:30
Amalka Subasinghe
615da6303f notify cluster formation changed implementation 2023-07-24 11:52:23 +05:30
builder
f19f48d050 [maven-release-plugin] prepare for next development iteration 2023-07-23 21:35:40 +05:30
builder
ff9971ed77 [maven-release-plugin] prepare release v5.0.27 2023-07-23 21:35:33 +05:30
Rajitha Kumara
7c9d3a2108 Fixes for grouping issues (#186)
Co-authored-by: rajitha <rajitha@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/186
Co-authored-by: Rajitha Kumara <rajitha@entgra.io>
Co-committed-by: Rajitha Kumara <rajitha@entgra.io>
2023-07-23 15:12:37 +00:00
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
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
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
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
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
navodzoysa
8d9e3c8f51 Remove reserved_user when fetching users 2023-06-29 00:34:09 +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
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
763cd7df25 Fix missing imports 2023-06-26 13:43:13 +05:30
92d7f5b61f Resolve Conflicts 2023-06-26 13:31:39 +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
b0dfadbe68 Merge pull request 'iOS user enrollment support' (#143) from inosh/device-mgt-core:ios-user-enrollment into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/143
2023-06-23 04:51:44 +00:00
660fadc39d Merge branch 'support-5.0.24' of ssh://repository.entgra.net:222/support/support-carbon-device-mgt into support-5.0.24 2023-06-23 06:25:07 +05:30