Commit Graph

9733 Commits

Author SHA1 Message Date
Shamalka Navod
3384b597f9 Improve device name search 2022-10-05 18:10:49 +00:00
Pahansith Gunathilake
94ac25deab Merge branch 'app_restriction_policy_issue' into 'master'
Add a searchable input for App Restriction Settings policy

See merge request entgra/carbon-device-mgt!916
2022-10-04 09:37:45 +00:00
Kavindya Sathsarani
bb5f779c26 Add a searchable input for App Restriction Settings policy 2022-10-04 09:37:45 +00:00
Dharmakeerthi Lasantha
d1f41971dd Merge branch 'improvement_policy_ui' into 'master'
Improve table component structure of the policy config

See merge request entgra/carbon-device-mgt!923
2022-09-29 03:30:24 +00:00
kavindyaS007
92f2a6f50d improvements in policy ui 2022-09-28 13:08:31 +05:30
Inosh Perara
715d1ce79f Merge branch 'permanant-delete' into 'master'
Fix permanant delete issue

Closes product-iots#1540

See merge request entgra/carbon-device-mgt!922
2022-09-28 06:51:14 +00:00
shamalka
f6b3af2e90 Fix permanant delete issue 2022-09-28 11:51:25 +05:30
Inosh Perara
19db22c5a5 Merge branch 'master' into 'master'
Test case fix and logs added

See merge request entgra/carbon-device-mgt!920
2022-09-27 02:32:38 +00:00
inoshperera
0fc27682df Test case fix and logs added
Related to https://gitlab.com/entgra/product-iots/-/issues/1541
2022-09-27 08:00:40 +05:30
Pahansith Gunathilake
c0ac653ca6 Merge branch 'fix-1541' into 'master'
Fix ios enrolment error

Closes product-iots#1541

See merge request entgra/carbon-device-mgt!919
2022-09-23 06:06:00 +00:00
inoshperera
e9cf04551a Fix ios enrolment error
fixes https://gitlab.com/entgra/product-iots/-/issues/1541
2022-09-23 06:57:52 +05:30
builder
223637c887 [maven-release-plugin] prepare for next development iteration 2022-09-14 20:25:10 +05:30
builder
b7311af447 [maven-release-plugin] prepare release v5.0.11 2022-09-14 20:25:02 +05:30
Pahansith Gunathilake
08e42dcc53 Merge branch 'master' into 'master'
Fixes related to publishing ws api and routing requests

See merge request entgra/carbon-device-mgt!913
2022-09-12 06:03:21 +00:00
Amalka Subasinghe
5f1271db93 Fixes related to publishing ws api and routing requests 2022-09-12 06:03:21 +00:00
Shamalka Navod
f4854ee066 Merge branch 'traccar' into 'master'
Add traccar changes

See merge request entgra/carbon-device-mgt!911
2022-09-05 04:37:29 +00:00
shamalka
eaad94b3e9 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar 2022-09-02 00:33:35 +05:30
shamalka
83be953583 Fix issues 2022-09-02 00:33:22 +05:30
Pahansith Gunathilake
fef1d41d39 Merge branch 'ldap-fixes' into 'master'
Add optional user store domain query param to user APIs

See merge request entgra/carbon-device-mgt!892
2022-09-01 18:15:58 +00:00
Inosh Perara
0ce43ae648 Merge branch 'billinng-api-fixes' into 'master'
Update config files to fix billing UI isssues

Closes product-iots#1226

See merge request entgra/carbon-device-mgt!909
2022-09-01 09:15:50 +00:00
Oshani Silva
cc98f6a881 Update config files to fix billing UI isssues 2022-09-01 09:15:50 +00:00
shamalka
d61814329c Revert global exception msg 2022-09-01 11:03:45 +05:30
Shamalka Navod
87ef31ab1b Merge branch 'feature/traccar-sync' into 'feature/traccar-sync'
Feature/traccar sync

See merge request entgra/carbon-device-mgt!914
2022-09-01 05:07:37 +00:00
Rushdi
df60140f9c Remove unwanted codelines and handle exceptions 2022-08-31 20:38:33 +05:30
Rushdi
ce0d0a1903 revert changes 2022-08-31 16:07:34 +05:30
Shamalka Navod
4e489a642e Merge branch 'traccar' into 'feature/traccar-sync'
Sync traccar changes to latest

See merge request entgra/carbon-device-mgt!912
2022-08-31 05:20:13 +00:00
shamalka
c68478daca Fix formatting issues 2022-08-30 09:10:20 +05:30
shamalka
642067b146 Remove wildcard imports 2022-08-29 17:17:43 +05:30
shamalka
c312e69bf4 Revert unwanted change 2022-08-29 17:14:10 +05:30
shamalka
b311908d47 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar 2022-08-29 17:09:05 +05:30
shamalka
31bb87db41 Add missing error logs and fix formatting issues 2022-08-29 17:07:49 +05:30
Pahansith Gunathilake
d21782160a Merge branch 'dev-1' into 'master'
Fix validation of appname when a webclip is created

See merge request entgra/carbon-device-mgt!874
2022-08-25 13:41:54 +00:00
Pahansith Gunathilake
6962e42ca8 Merge branch 'fix-groupnames' into 'master'
Fix group names being able to be duplicated when renaming

See merge request entgra/carbon-device-mgt!907
2022-08-25 13:40:55 +00:00
Pahansith Gunathilake
a38f239a00 Merge branch 'removeAccount' into 'master'
Add remove account feature scope

See merge request entgra/carbon-device-mgt!910
2022-08-25 13:35:40 +00:00
Pahansith Gunathilake
a50d37bbf2 Merge branch 'support-4.1.15' into 'master'
Add Windows app uninstallation feature

See merge request entgra/carbon-device-mgt!904
2022-08-25 10:41:14 +00:00
shamalka
5ff9ef7782 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar 2022-08-23 16:00:16 +05:30
amith10
ccf8e108c0 Add remove account scope 2022-08-22 12:24:07 +05:30
Rushdi
29a2713af0 update the traccar-config.xml on test 2022-08-16 10:26:58 +05:30
navodzoysa
6b6e9ba640 Fix group names being able to be duplicated when renaming 2022-08-03 15:07:26 +05:30
navodzoysa
6a62546440 Add optional user domain query param to user APIs 2022-08-01 20:06:51 +05:30
Pahansith Gunathilake
2a5630cfb7 Merge branch 'fix/cross-tenant-api-subscription' into 'master'
Fix cross-tenant api subscription issue

See merge request entgra/carbon-device-mgt!905
2022-07-26 08:43:23 +00:00
Vigneshan
638c6b12c9 Fix cross-tenant api subscription issue 2022-07-23 17:13:11 +05:30
Pahansith Gunathilake
426dcf16bf Merge branch 'ui-config' into 'master'
Add Windows permission scopes to ui config

See merge request entgra/carbon-device-mgt!895
2022-07-18 20:55:11 +00:00
builder
3c9fc68619 [maven-release-plugin] prepare for next development iteration 2022-07-18 23:07:51 +05:30
builder
0b4fe08847 [maven-release-plugin] prepare release v5.0.10 2022-07-18 23:07:47 +05:30
Pahansith Gunathilake
cd6a4e3c0c Merge branch 'master' into 'master'
Implement multi-tenant api publishing

See merge request entgra/carbon-device-mgt!900
2022-07-18 12:00:58 +00:00
Vigneshan
ebc5f5de31 Implement multi-tenant api publishing 2022-07-15 11:10:47 +05:30
builder
0290758c25 [maven-release-plugin] prepare for next development iteration 2022-07-12 01:22:56 +05:30
builder
790ab62b34 [maven-release-plugin] prepare release v5.0.9 2022-07-12 01:22:51 +05:30
Inosh Perara
68956f0c92 Merge branch 'fix/admin-user-role-assignment-issue' into 'master'
Fix admin role not assigned issue during admin user creation

See merge request entgra/carbon-device-mgt!901
2022-07-11 09:30:02 +00:00