From 1120c7c7fb02c6e346188eef5cc1c93cf37bdea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?andr=C3=A9s=20gonz=C3=A1lez?= Date: Tue, 3 Jun 2025 12:28:49 +0200 Subject: [PATCH 1/4] :bug: Fix copy in error message (#6615) --- frontend/translations/en.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/translations/en.po b/frontend/translations/en.po index 679a703e32..3a8311c9f5 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -6873,7 +6873,7 @@ msgstr "Import Error: Invalid token data in JSON." #: src/app/main/ui/workspace/tokens/errors.cljs:16 msgid "workspace.token.invalid-json-token-name" -msgstr "Import Error: Invalid token name in in JSON." +msgstr "Import Error: Invalid token name in JSON." #: src/app/main/ui/workspace/tokens/errors.cljs:18 msgid "workspace.token.invalid-json-token-name-detail" From e1adbdfd9f4828fc5aed7e66a13d670b8549bc73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?andr=C3=A9s=20gonz=C3=A1lez?= Date: Wed, 4 Jun 2025 15:12:33 +0200 Subject: [PATCH 2/4] :books: Update changelog (#6616) --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 6ec6040693..8d5f22d62f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ - Update plugins runtime [Github #6604](https://github.com/penpot/penpot/pull/6604) - Backport from develop a minor fix that enables import of files generated by penpot library [Github #6614](https://github.com/penpot/penpot/pull/6614) +- Fix copy in error message [GitHub #6615](https://github.com/penpot/penpot/pull/6615) ## 2.7.1 From 4a9fef12eb108fa97cff405801c84d05bc25e18c Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Thu, 5 Jun 2025 12:28:53 +0200 Subject: [PATCH 3/4] :bug: Fix url params on invitation link (#6638) --- CHANGES.md | 2 +- backend/resources/app/email/request-file-access/en.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8d5f22d62f..f27f352901 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,7 +9,7 @@ - Backport from develop a minor fix that enables import of files generated by penpot library [Github #6614](https://github.com/penpot/penpot/pull/6614) - Fix copy in error message [GitHub #6615](https://github.com/penpot/penpot/pull/6615) - +- Fix url on invitation link [Taiga #11284](https://tree.taiga.io/project/penpot/issue/11284) ## 2.7.1 diff --git a/backend/resources/app/email/request-file-access/en.txt b/backend/resources/app/email/request-file-access/en.txt index d12e44ee7a..60dcd853df 100644 --- a/backend/resources/app/email/request-file-access/en.txt +++ b/backend/resources/app/email/request-file-access/en.txt @@ -13,7 +13,7 @@ This will automatically include {{requested-by|abbreviate:25}} in the team, so t Click the link below to provide team access: -{{ public-uri }}/#/dashboard/members?team-id{{team-id}}&invite-email={{requested-by-email|urlescape}} +{{ public-uri }}/#/dashboard/members?team-id={{team-id}}&invite-email={{requested-by-email|urlescape}} From cf8307af8fe5341c4b8842c34e1fa2295337abe9 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 5 Jun 2025 13:29:51 +0200 Subject: [PATCH 4/4] :paperclip: Update changelog --- CHANGES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index f27f352901..cca77d7fe2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,6 @@ # CHANGELOG - -## 2.7.2 (Unreleased) +## 2.7.2 ### :bug: Bugs fixed @@ -11,6 +10,7 @@ - Fix copy in error message [GitHub #6615](https://github.com/penpot/penpot/pull/6615) - Fix url on invitation link [Taiga #11284](https://tree.taiga.io/project/penpot/issue/11284) + ## 2.7.1 ### :bug: Bugs fixed