osh
c9ed09ee25
Resolve conflicts
2 years ago
Inosh Perara
a69218d436
Merge pull request 'Add association apis' ( #161 ) from inosh/device-mgt-core:vpp into vpp-v2
...
Reviewed-on: community/device-mgt-core#161
2 years ago
Inosh Perara
240ccf970e
Merge pull request 'Fix grouping Issues' ( #164 ) from ThilinaPremachandra/device-mgt-core:groupingIssues into master
...
Reviewed-on: community/device-mgt-core#164
2 years ago
Thilina Sandaruwan
6d012bc614
fix: group assigned role issue
2 years ago
Thilina Sandaruwan
aecc106f95
add: super-tenant admin check
2 years ago
Pahansith Gunathilake
b93f736850
Merge pull request 'Fix sub tenants grouping issue' ( #163 ) from ThilinaPremachandra/device-mgt-core:groupingIssue into master
...
Reviewed-on: community/device-mgt-core#163
2 years ago
Thilina Sandaruwan
39f5ee8ca3
fix: sub tenants grouping issue
2 years ago
osh
1263c09079
Add DAOs for asset management
...
fixes https://roadmap.entgra.net/issues/10179
2 years ago
inoshperera
54111b4d94
Add association apis
...
fixes https://roadmap.entgra.net/issues/10182
2 years ago
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
* proprietary/product-uem#15
Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: community/device-mgt-core#160
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2 years ago
Inosh Perara
caa9959dcd
Merge pull request 'Add asset apis' ( #156 ) from inosh/device-mgt-core:vpp into vpp-v2
...
Reviewed-on: community/device-mgt-core#156
2 years ago
inoshperera
61ffd4abff
Fixing conflics
2 years ago
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: community/device-mgt-core#155
2 years ago
Lasantha Dharmakeerthi
9ac38127b9
Remove reserved_user when fetching users
2 years ago
Navod Zoysa
8d9e3c8f51
Remove reserved_user when fetching users
2 years ago
osh
2e799a545f
Resolve comments
2 years ago
Nishan Sangeeth
3616245ae6
Improve app visibility restricting functionality
...
Co-authored-by: Nishan Sangeeth <nishan@entgra.io>
Co-committed-by: Nishan Sangeeth <nishan@entgra.io>
2 years ago
inoshperera
665702d504
Add asset apis
...
Fixes https://roadmap.entgra.net/issues/10178
2 years ago
osh
cd42a2c48f
Adding the DAO layer for vpp user management
...
fixes https://roadmap.entgra.net/issues/10169
2 years ago
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: community/device-mgt-core#146
2 years ago
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: community/device-mgt-core#153
Co-authored-by: Thilina Sandaruwan <thilina@entgra.io>
Co-committed-by: Thilina Sandaruwan <thilina@entgra.io>
2 years ago
Pahansith Gunathilake
22000de5a8
Merge pull request 'Update invite link' ( #152 ) from rajitha/device-mgt-core:update-invitation-mail-invite-link into master
...
Reviewed-on: community/device-mgt-core#152
2 years ago
Rajitha Kumara
d5270c720c
Update invite link
2 years ago
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: community/device-mgt-core#149
2 years ago
Pahansith Gunathilake
979d3b48cb
Merge branch 'master' into sync-master
2 years ago
Inosh Perara
da694c3dbe
Merge pull request 'Add device enrolment log for modifyenrolment' ( #148 ) from prathabanKavin/device-mgt-core:enrolmentlogfix into master
...
Reviewed-on: community/device-mgt-core#148
2 years ago
Inosh Perara
f246d6b8de
Merge pull request 'add vpp user services' ( #151 ) from inosh/device-mgt-core:vpp into vpp-v2
...
Reviewed-on: community/device-mgt-core#151
2 years ago
inoshperera
cc8470d3c0
add vpp user services
2 years ago
Lasantha Dharmakeerthi
0084fbbf36
Fix skip app release error
2 years ago
Navod Zoysa
7073deb461
Fix skip app release error
2 years ago
Pahansith Gunathilake
763cd7df25
Fix missing imports
2 years ago
Pahansith Gunathilake
92d7f5b61f
Resolve Conflicts
2 years ago
Nishan Sangeeth
cd962b8d24
Remove the user has role validation
2 years ago
Nishan Sangeeth
4a31d80660
add api for get visible roles
2 years ago
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>
2 years ago
prathabanKavin
389eb05084
Add device enrolment log for modifyenrolment
2 years ago
Inosh Perara
9dd24eda17
Merge pull request 'Add vpp user apis' ( #147 ) from inosh/device-mgt-core:vpp into vpp-v2
...
Reviewed-on: community/device-mgt-core#147
2 years ago
inoshperera
9ccf3a5fa5
Add vpp user apis
...
fixes https://roadmap.entgra.net/issues/10162
2 years ago
Pahansith Gunathilake
577e3e9384
Remove unnecessary logs
2 years ago
Inosh Perara
b0dfadbe68
Merge pull request 'iOS user enrollment support' ( #143 ) from inosh/device-mgt-core:ios-user-enrollment into master
...
Reviewed-on: community/device-mgt-core#143
2 years ago
Pahansith Gunathilake
660fadc39d
Merge branch 'support-5.0.24' of ssh://repository.entgra.net:222/support/support-carbon-device-mgt into support-5.0.24
2 years ago
Lasantha Dharmakeerthi
ecdabea744
Fix incorrect clear app scope
2 years ago
Lasantha Dharmakeerthi
f199c96400
Remove apim_reserved_user when fetching users
2 years ago
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: support/support-carbon-device-mgt#90
2 years ago
Pahansith Gunathilake
bfdd6cf8d0
Merge branch 'support-5.0.24' into store-certificate-device-id
2 years ago
Navod Zoysa
d862ab8143
Fix incorrect clear app scope
2 years ago
Navod Zoysa
00bd74734a
Remove apim_reserved_user when fetching users
2 years ago
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: support/support-carbon-device-mgt#91
2 years ago
builder
ab2e1297e5
[maven-release-plugin] prepare for next development iteration
2 years ago
builder
6c9d33a16a
[maven-release-plugin] prepare release v5.0.26
2 years ago