Commit Graph

10226 Commits

Author SHA1 Message Date
Amalka Subasinghe
d021b43086 Merge pull request 'Fix test cases failing issue' (#183) from tcdlpds/device-mgt-core:sync-master into apim420
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/183
2023-07-26 07:54:57 +00:00
Dharmakeerthi Lasantha
74041070f9 Fix class def not found issue 2023-07-24 20:22:54 +05:30
Dharmakeerthi Lasantha
349bb0a3dc Fix test case failure 2023-07-24 18:33:00 +05:30
Dharmakeerthi Lasantha
5098c652ca Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into sync-master 2023-07-18 09:22:28 +05:30
Amalka Subasinghe
bfe9746d70 Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420 2023-07-18 09:20:19 +05:30
Dharmakeerthi Lasantha
1d94fb7de1 Fix test case failing 2023-07-18 09:16:25 +05:30
Amalka Subasinghe
95413f96de Merge pull request 'Fix OSGI service unbinding issue' (#177) from tcdlpds/device-mgt-core:sync-master into apim420
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/177
2023-07-13 07:06:02 +00:00
Dharmakeerthi Lasantha
2cfa73206d Fix OSGI service unbinding issue 2023-07-13 07:54:34 +05:30
Amalka Subasinghe
b249b2435f Merge pull request 'Sync with the master branch' (#172) from tcdlpds/device-mgt-core:sync-master into apim420
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/172
2023-07-12 03:46:53 +00:00
Dharmakeerthi Lasantha
a66d6389f9 Fix formatting issue 2023-07-12 00:39:31 +05:30
Dharmakeerthi Lasantha
fe4011cc7e Sync with master 2023-07-12 00:08:41 +05:30
Dharmakeerthi Lasantha
3bf6f7dd75 Improve functionality and fix formatting issues 2023-07-12 00:05:02 +05:30
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
prathabanKavin
a0d6c2bd21 Add missing ios scopes in mdm-ui-config 2023-07-11 15:53:09 +05:30
Dharmakeerthi Lasantha
78aee58c1a Fix build failure 2023-07-11 12:13:53 +05:30
Dharmakeerthi Lasantha
11efc83b06 Fix dependency importing issue 2023-07-11 11:43:26 +05:30
Dharmakeerthi Lasantha
816ade11e6 Sync with master 2023-07-11 11:28:31 +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
Amalka Subasinghe
2e5579fdc2 fixed operation template unit tests 2023-07-07 11:16:53 +05:30
Amalka Subasinghe
013df183cd operation template related unit test fixes 2023-07-07 11:11:31 +05:30
Amalka Subasinghe
b7c0a8fb9b fixed unit tests 2023-07-06 17:06:48 +05:30
Amalka Subasinghe
edcf235ff8 fixed unit tests 2023-07-06 14:54:56 +05:30
Amalka Subasinghe
9352382406 fixed unit tests 2023-07-06 14:50:32 +05:30
Amalka Subasinghe
78f9f746d8 fixed unit tests 2023-07-06 14:26:32 +05:30
Amalka Subasinghe
9759520157 fixed unit tests 2023-07-06 14:22:21 +05:30
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
Lasantha Dharmakeerthi
1e35ad1ccc Fix realm service unbinding issues 2023-07-06 02:57:11 +00:00
rajitha
67cdcede69 Fix realm service unbinding issues 2023-07-05 20:21:48 +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
Amalka Subasinghe
204b5d956b fixed unit tests of application-mgt 2023-07-04 16:54:32 +05:30
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
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
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
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
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
Dharmakeerthi Lasantha
e7062b37b2 Fix Cron Expression defining issue 2023-06-28 18:59:30 +05:30