Amalka Subasinghe
b08f3fcc49
fixed unit tests
2023-07-06 13:15:02 +05:30
Amalka Subasinghe
1c4ee6cacc
fixed mockito dependency issue
2023-07-06 10:40:38 +05:30
Amalka Subasinghe
9f19c1d1c1
fixed unit tests in analytics-mgt
2023-07-06 10:35:43 +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
Dharmakeerthi Lasantha
437c0e642d
Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420
2023-07-04 23:49:24 +05:30
rajitha
5818a5eaed
Fix transaction initiating issue
2023-07-04 18:37:39 +05:30
Amalka Subasinghe
204b5d956b
fixed unit tests of application-mgt
2023-07-04 16:54:32 +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
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
Amalka Subasinghe
2ff6e2e529
updated jackson-databind version
2023-06-30 12:02:53 +05:30
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
Amalka Subasinghe
1c3cd7cd2f
fixed webapp deploying failure
2023-06-30 12:02:17 +05:30
Amalka Subasinghe
86c114f52f
Merge pull request 'Remove Capp Deploying service' ( #159 ) from tcdlpds/device-mgt-core:cron-fix into apim420
...
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/159
2023-06-29 13:06:19 +00:00
Dharmakeerthi Lasantha
35ee44f799
Remove Capp Deploying service
2023-06-29 15:47:08 +05:30
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
Amalka Subasinghe
bfc38eeff0
Merge pull request 'Fix Cron Expression defining issue' ( #157 ) from tcdlpds/device-mgt-core:cron-fix into apim420
...
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/157
2023-06-29 03:51:39 +00:00
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
Dharmakeerthi Lasantha
e7062b37b2
Fix Cron Expression defining issue
2023-06-28 18:59:30 +05:30
Dharmakeerthi Lasantha
1e9b38440b
Improve subscription filtering logic
2023-06-28 09:33:27 +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
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
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
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
