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,228 Commits 31 Branches 461 Tags 183 MiB
vpp-v2
Commit Graph

10228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Inosh Perara
8d552b3070 Merge pull request 'Add VPP token field' (#182) from osh.silva/device-mgt-core:vpp-token-change-10156 into vpp-v2 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/182
 2023-07-18 02:45:29 +00:00
osh
4b9cad1c75 Update db queries 2023-07-17 16:13:07 +05:30
osh
32a289e10e Merge branch 'vpp-v2' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-token-change-10156 2023-07-17 16:02:06 +05:30
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
ec88734831 Merge pull request 'Add db scripts for VPP feature' (#179) from osh.silva/device-mgt-core:vpp-db-scripts into vpp-v2 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/179
 2023-07-17 04:35:06 +00:00
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
3d5fce400b Merge pull request 'Rearrange getOperations by eliminating the necessity of the owner param' (#170) from Sasini_Sandamali/device-mgt-core:master into master 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/170
 2023-07-14 00:46:49 +00:00
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
osh
01df370032 Add db scripts 2023-07-13 14:40:15 +05:30
Inosh Perara
fefc66bc59 Merge pull request 'Improve update asset DAO' (#174) from osh.silva/device-mgt-core:vpp-daos into vpp-v2 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/174
 2023-07-13 07:51:21 +00:00
Lasantha Dharmakeerthi
0b0d2e620f Fix class not found error in Grafana component 2023-07-11 17:49:56 +00:00
navodzoysa
90741dc502 Fix class not found error in analytics component 2023-07-11 23:08:33 +05:30
Inosh Perara
374be8bc25 Merge pull request 'Add missing ios scopes in mdm-ui-config' (#173) from prathabanKavin/device-mgt-core:mdmconfigfix into master 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/173
 2023-07-11 14:19:17 +00:00
osh
eb740773aa Improve update asset DAO 
fixes https://roadmap.entgra.net/issues/10179
 2023-07-11 15:59:42 +05:30
prathabanKavin
a0d6c2bd21 Add missing ios scopes in mdm-ui-config 2023-07-11 15:53:09 +05:30
Inosh Perara
b3a4649b64 Merge pull request 'Add DAO Layer for VPP Associate' (#168) from osh.silva/device-mgt-core:vpp-associate into vpp-v2 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/168
 2023-07-10 08:12:57 +00:00
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
Lasantha Dharmakeerthi
1e35ad1ccc Fix realm service unbinding issues 2023-07-06 02:57:11 +00:00
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
Inosh Perara
8507a88cad Merge pull request 'Add DAO improvements for user APIs' (#166) from inosh/device-mgt-core:vpp into vpp-v2 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/166
 2023-07-05 11:50:48 +00:00
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
Lasantha Dharmakeerthi
80955216d9 Fix transaction initiating issue 2023-07-05 02:16:29 +00:00
rajitha
5818a5eaed Fix transaction initiating issue 2023-07-04 18:37:39 +05:30
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