From cce67b055c4da940ab90ed14324f4344e305e7a8 Mon Sep 17 00:00:00 2001 From: Karita <49212909+ainokarita@users.noreply.github.com> Date: Wed, 5 Feb 2025 11:44:09 +0100 Subject: [PATCH 1/8] Entity permission translation for US, UK and DK (#18225) * Translation for user permissions DK and EN * Added UI Culture variants for EN-US user permissions section * removed redundant line * improved consistency for wording, and moved keys under user --- src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts | 2 ++ src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts | 2 ++ src/Umbraco.Web.UI.Client/src/assets/lang/en.ts | 2 ++ .../workspace/user-group/user-group-workspace-editor.element.ts | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts index 56f2fa1b81..287aa3d7ee 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts @@ -1930,6 +1930,8 @@ export default { chooseUserGroup: (multiple: boolean) => { return multiple ? 'Vælg brugergrupper' : 'Vælg brugergruppe'; }, + entityPermissionsLabel: 'Handlingsrettigheder', + entityPermissionsDescription: 'Tildel tilladelser til handlinger', noStartNode: 'Ingen startnode valgt', noStartNodes: 'Ingen startnoder valgt', startnode: 'Indhold startnode', diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts index 21862b3542..f897c6797e 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts @@ -1983,6 +1983,8 @@ export default { chooseUserGroup: (multiple: boolean) => { return multiple ? 'Choose User Groups' : 'Choose User Group'; }, + entityPermissionsLabel: 'Permissions', + entityPermissionsDescription: 'Assign permissions for actions', noStartNode: 'No start node selected', noStartNodes: 'No start nodes selected', startnode: 'Content start node', diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts index b6e9b4d434..055132c86f 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts @@ -2025,6 +2025,8 @@ export default { chooseUserGroup: (multiple: boolean) => { return multiple ? 'Choose User Groups' : 'Choose User Group'; }, + entityPermissionsLabel: 'Permissions', + entityPermissionsDescription: 'Assign permissions for actions', noStartNode: 'No start node selected', noStartNodes: 'No start nodes selected', startnode: 'Content start node', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts index 97124b0c4c..aae6d579e9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts @@ -244,7 +244,7 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
- + From cf8cead8a9936ffa227d87a7ec3383deb9267417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 5 Feb 2025 21:26:18 +0100 Subject: [PATCH 2/8] Update README.md (#18238) --- src/Umbraco.Web.UI.Client/.github/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/.github/README.md b/src/Umbraco.Web.UI.Client/.github/README.md index cc99c87007..d1e27aa2b0 100644 --- a/src/Umbraco.Web.UI.Client/.github/README.md +++ b/src/Umbraco.Web.UI.Client/.github/README.md @@ -48,6 +48,8 @@ Open this file in an editor: `src/Umbraco.Web.UI/appsettings.Development.json` a This will override the backoffice host URL, enabling the Client to run from a different origin. +Then start the backend server by running the command: `dotnet run` in the `Umbraco.Web.UI` folder. + #### Run the front-end server Now start the Vite server by running the command: `npm run dev:server` in the `Umbraco.Web.UI.Client` folder. From 066045f139bdc984955ea7d5d08c9e08aaf8ce5c Mon Sep 17 00:00:00 2001 From: Karita <49212909+ainokarita@users.noreply.github.com> Date: Fri, 7 Feb 2025 06:38:12 +0100 Subject: [PATCH 3/8] Granular permissions translation DK, EN, US (#18251) * Translation for user permissions DK and EN * Added UI Culture variants for EN-US user permissions section * removed redundant line * improved consistency for wording, and moved keys under user * Translated granular permissions label and description EN, US, DK --- src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts | 2 ++ src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts | 2 ++ src/Umbraco.Web.UI.Client/src/assets/lang/en.ts | 2 ++ .../documents/documents/user-permissions/manifests.ts | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts index 287aa3d7ee..6a24c20d51 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts @@ -1914,6 +1914,8 @@ export default { permissionsDefault: 'Standardrettigheder', permissionsGranular: 'Granulære rettigheder', permissionsGranularHelp: 'Sæt rettigheder for specifikke noder', + granularRightsLabel: 'Dokumenter', + granularRightsDescription: 'Tillad adgang til specifikke dokumenter', permissionsEntityGroup_document: 'Indhold', permissionsEntityGroup_media: 'Medie', permissionsEntityGroup_member: 'Medlemmer', diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts index f897c6797e..c9e3dae3e6 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts @@ -1967,6 +1967,8 @@ export default { permissionsDefault: 'Default permissions', permissionsGranular: 'Granular permissions', permissionsGranularHelp: 'Set permissions for specific nodes', + granularRightsLabel: 'Documents', + granularRightsDescription: 'Assign permissions to specific documents', permissionsEntityGroup_document: 'Content', permissionsEntityGroup_media: 'Media', permissionsEntityGroup_member: 'Member', diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts index 055132c86f..db156b6cfc 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts @@ -2009,6 +2009,8 @@ export default { permissionsDefault: 'Default permissions', permissionsGranular: 'Granular permissions', permissionsGranularHelp: 'Set permissions for specific nodes', + granularRightsLabel: 'Documents', + granularRightsDescription: 'Assign permissions to specific documents', permissionsEntityGroup_document: 'Content', permissionsEntityGroup_media: 'Media', permissionsEntityGroup_member: 'Member', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/manifests.ts index aa8d4b2c29..30505ba03a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/manifests.ts @@ -206,8 +206,8 @@ export const granularPermissions: Array = [ import('./input-document-granular-user-permission/input-document-granular-user-permission.element.js'), meta: { schemaType: 'DocumentPermissionPresentationModel', - label: 'Documents', - description: 'Assign permissions to specific documents', + label: '#user_granularRightsLabel', + description: '{#user_granularRightsDescription}', }, }, ]; From 03690fb330bd0bbe1d568ab0c01413563eb06ea2 Mon Sep 17 00:00:00 2001 From: Karita <49212909+ainokarita@users.noreply.github.com> Date: Fri, 7 Feb 2025 15:26:19 +0100 Subject: [PATCH 4/8] RTE property editor settings translation for DK&US (#18264) --- src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts | 2 ++ src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts index 6a24c20d51..8a50e6aef3 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts @@ -1673,6 +1673,7 @@ export default { elementDoesNotSupport: 'Dette benyttes ikke for en Element-type', propertyHasChanges: 'Du har lavet ændringer til denne egenskab. Er du sikker på at du vil kassere dem?\n ', displaySettingsHeadline: 'Visning', + displaySettingsLabelOnLeft: 'Label på venstre side', displaySettingsLabelOnTop: 'Label hen over (fuld bredde)', removeChildNode: 'Du fjerner noden', removeChildNodeWarning: @@ -2020,6 +2021,7 @@ export default { }, validation: { validation: 'Validering', + validateNothing: 'Ingen validering', validateAsEmail: 'Valider som e-mail', validateAsNumber: 'Valider som tal', validateAsUrl: 'Valider som URL', diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts index c9e3dae3e6..10e803bf55 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts @@ -1711,6 +1711,7 @@ export default { elementDoesNotSupport: 'This is not applicable for an Element Type', propertyHasChanges: 'You have made changes to this property. Are you sure you want to discard them?', displaySettingsHeadline: 'Appearance', + displaySettingsLabelOnLeft: 'Label to the left', displaySettingsLabelOnTop: 'Label above (full-width)', confirmDeleteTabMessage: 'Are you sure you want to delete the tab %0%?', confirmDeleteGroupMessage: 'Are you sure you want to delete the group %0%?', @@ -2060,6 +2061,7 @@ export default { }, validation: { validation: 'Validation', + validateNothing: 'No validation', validateAsEmail: 'Validate as an email address', validateAsNumber: 'Validate as a number', validateAsUrl: 'Validate as a URL', From 447b36ab677ad6a41be7ddf1a06b3431c3769771 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 15:19:48 +0000 Subject: [PATCH 5/8] Bump vite from 5.4.11 to 5.4.14 in /src/Umbraco.Web.UI.Client Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.11 to 5.4.14. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.14/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.14/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 8 ++++---- src/Umbraco.Web.UI.Client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 52e78f1956..2620634ac1 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -96,7 +96,7 @@ "typescript": "^5.7.3", "typescript-eslint": "^8.20.0", "typescript-json-schema": "^0.65.1", - "vite": "^5.4.11", + "vite": "^5.4.14", "vite-plugin-static-copy": "^2.2.0", "vite-tsconfig-paths": "^5.1.4", "web-component-analyzer": "^2.0.0" @@ -16371,9 +16371,9 @@ } }, "node_modules/vite": { - "version": "5.4.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", - "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", + "version": "5.4.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz", + "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 3fc044ac38..ed297de4d0 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -284,7 +284,7 @@ "typescript": "^5.7.3", "typescript-eslint": "^8.20.0", "typescript-json-schema": "^0.65.1", - "vite": "^5.4.11", + "vite": "^5.4.14", "vite-plugin-static-copy": "^2.2.0", "vite-tsconfig-paths": "^5.1.4", "web-component-analyzer": "^2.0.0" From 5457521f19a367c9b5194bffc020a188ac440bfb Mon Sep 17 00:00:00 2001 From: Chris Houston Date: Tue, 11 Feb 2025 04:59:06 -0500 Subject: [PATCH 6/8] Fixing the background color of the "re-login" screen when your session has timed out. (#18284) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated modal background color The background color of the authentication modal has been updated to use a CSS variable for better customization. The default value remains the same. * Update umb-app-auth-modal.element.ts to use less specific css custom property --------- Co-authored-by: Niels Lyngsø --- .../src/packages/core/auth/modals/umb-app-auth-modal.element.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/auth/modals/umb-app-auth-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/auth/modals/umb-app-auth-modal.element.ts index a92627d95d..eed8e34b53 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/auth/modals/umb-app-auth-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/auth/modals/umb-app-auth-modal.element.ts @@ -170,7 +170,7 @@ export class UmbAppAuthModalElement extends UmbModalBaseElement Date: Tue, 18 Feb 2025 09:31:21 +0000 Subject: [PATCH 7/8] Bump dompurify from 3.2.3 to 3.2.4 in /src/Umbraco.Web.UI.Client Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/3.2.3...3.2.4) --- updated-dependencies: - dependency-name: dompurify dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 8 ++++---- src/Umbraco.Web.UI.Client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 2620634ac1..8d77bb0ca0 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -31,7 +31,7 @@ "@umbraco-ui/uui-css": "^1.12.1", "base64-js": "^1.5.1", "diff": "^7.0.0", - "dompurify": "^3.2.3", + "dompurify": "^3.2.4", "element-internals-polyfill": "^1.3.12", "lit": "^3.2.1", "marked": "^15.0.6", @@ -7667,9 +7667,9 @@ } }, "node_modules/dompurify": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.3.tgz", - "integrity": "sha512-U1U5Hzc2MO0oW3DF+G9qYN0aT7atAou4AgI0XjWz061nyBPbdxkfdhfy5uMgGn6+oLFCfn44ZGbdDqCzVmlOWA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", + "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index ed297de4d0..d1b6b4947e 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -219,7 +219,7 @@ "@umbraco-ui/uui-css": "^1.12.1", "base64-js": "^1.5.1", "diff": "^7.0.0", - "dompurify": "^3.2.3", + "dompurify": "^3.2.4", "element-internals-polyfill": "^1.3.12", "lit": "^3.2.1", "marked": "^15.0.6", From 7ac57790ffdc34ed6ddcfa3067d574f35989eeb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2025 10:13:24 +0000 Subject: [PATCH 8/8] Bump dompurify from 3.2.3 to 3.2.4 in /src/Umbraco.Web.UI.Login Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/3.2.3...3.2.4) --- updated-dependencies: - dependency-name: dompurify dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Login/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Login/package-lock.json b/src/Umbraco.Web.UI.Login/package-lock.json index 47375eae8a..4c31fe7d14 100644 --- a/src/Umbraco.Web.UI.Login/package-lock.json +++ b/src/Umbraco.Web.UI.Login/package-lock.json @@ -2690,9 +2690,9 @@ } }, "node_modules/dompurify": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.3.tgz", - "integrity": "sha512-U1U5Hzc2MO0oW3DF+G9qYN0aT7atAou4AgI0XjWz061nyBPbdxkfdhfy5uMgGn6+oLFCfn44ZGbdDqCzVmlOWA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", + "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", "dev": true, "license": "(MPL-2.0 OR Apache-2.0)", "peer": true,