community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,443 Commits 31 Branches 461 Tags 183 MiB
d1799e54e7
Commit Graph

10443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Inosh Perara
949fbef41b Merge pull request 'Add DAOs for asset management' (#162) from osh.silva/device-mgt-core:asset-dao-10179 into vpp-v2 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/162
 2023-07-04 04:57:36 +00:00
osh
c9ed09ee25 Resolve conflicts 2023-07-04 08:50:39 +05:30
Inosh Perara
a69218d436 Merge pull request 'Add association apis' (#161) from inosh/device-mgt-core:vpp into vpp-v2 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/161
 2023-07-04 03:03:03 +00:00
Inosh Perara
240ccf970e Merge pull request 'Fix grouping Issues' (#164) from ThilinaPremachandra/device-mgt-core:groupingIssues into master 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/164
 2023-07-03 15:02:05 +00:00
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
Pahansith Gunathilake
b93f736850 Merge pull request 'Fix sub tenants grouping issue' (#163) from ThilinaPremachandra/device-mgt-core:groupingIssue into master 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/163
 2023-07-01 17:33:20 +00:00
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
Kavin Prathaban
87de656571 Add footer config template 
## Purpose
* Fixes https://roadmap.entgra.net/issues/10180

## Description
* cdm-config.xml.j2, cdm-config.xml templates are updated from hardcoded values to retrieve values from deployment.toml
* server_name, server_version and current_year are added as variables

* **Usage:** change deployment.toml values when a new version released. This will update the footer

## Related PRs
* https://repository.entgra.net/proprietary/product-uem/pulls/15

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/160
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
 2023-06-30 06:32:38 +00:00
Inosh Perara
caa9959dcd Merge pull request 'Add asset apis' (#156) from inosh/device-mgt-core:vpp into vpp-v2 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/156
 2023-06-29 04:09:05 +00:00
inoshperera
61ffd4abff Fixing conflics 2023-06-29 09:31:46 +05:30
Inosh Perara
fa565eb1ea Merge pull request 'Adding the DAO layer for vpp user management' (#155) from osh.silva/device-mgt-core:vpp-user-dao-10169 into vpp-v2 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/155
 2023-06-29 03:24:42 +00:00
Lasantha Dharmakeerthi
9ac38127b9 Remove reserved_user when fetching users 2023-06-28 19:16:52 +00:00
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
Pahansith Gunathilake
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
Pahansith Gunathilake
22000de5a8 Merge pull request 'Update invite link' (#152) from rajitha/device-mgt-core:update-invitation-mail-invite-link into master 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/152
 2023-06-27 08:21:58 +00:00
rajitha
d5270c720c Update invite link 2023-06-27 13:42:07 +05:30
Pahansith Gunathilake
99e760278c Merge pull request 'Sync OTP enrollment and mutual SSL related features' (#149) from pahansith/device-mgt-core:sync-master into master 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/149
 2023-06-27 05:59:39 +00:00
Pahansith Gunathilake
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
Lasantha Dharmakeerthi
0084fbbf36 Fix skip app release error 2023-06-26 09:13:17 +00:00
navodzoysa
7073deb461 Fix skip app release error 2023-06-26 14:15:29 +05:30
Pahansith
763cd7df25 Fix missing imports 2023-06-26 13:43:13 +05:30
Pahansith
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
Pahansith
577e3e9384 Remove unnecessary logs 2023-06-23 20:39:12 +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
Pahansith
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
Lasantha Dharmakeerthi
ecdabea744 Fix incorrect clear app scope 2023-06-23 00:50:36 +00:00
Lasantha Dharmakeerthi
f199c96400 Remove apim_reserved_user when fetching users 2023-06-23 00:50:01 +00:00
Pahansith Gunathilake
26e7f68cc1 Merge pull request 'Add the logic to save device id to certificate DB' (#90) from inosh/support-carbon-device-mgt:store-certificate-device-id into support-5.0.24 
Reviewed-on: https://repository.entgra.net/support/support-carbon-device-mgt/pulls/90
 2023-06-23 00:37:33 +00:00
Pahansith Gunathilake
bfdd6cf8d0 Merge branch 'support-5.0.24' into store-certificate-device-id 2023-06-23 00:35:50 +00:00
navodzoysa
d862ab8143 Fix incorrect clear app scope 2023-06-22 19:45:11 +05:30
navodzoysa
00bd74734a Remove apim_reserved_user when fetching users 2023-06-22 19:38:33 +05:30
Pahansith Gunathilake
bf7757bc53 Merge pull request 'Update dynamic configuration endpoint to use OTP' (#91) from rajitha/support-carbon-device-mgt:update-dynamic-config-endpoint into support-5.0.24 
Reviewed-on: https://repository.entgra.net/support/support-carbon-device-mgt/pulls/91
 2023-06-22 10:04:31 +00:00
builder
ab2e1297e5 [maven-release-plugin] prepare for next development iteration 2023-06-21 13:48:25 +05:30