From cc5f24520987d51a7127d7a6c61320b0e8e12165 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Thu, 2 Feb 2023 13:09:29 +0100 Subject: [PATCH] :bug: Fix social links broken --- CHANGES.md | 1 + .../app/emails-mjml/change-email/en.mjml | 4 +- .../app/emails-mjml/invite-to-team/en.mjml | 4 +- .../app/emails-mjml/password-recovery/en.mjml | 4 +- .../app/emails-mjml/register/en.mjml | 4 +- .../resources/app/emails/change-email/en.html | 64 +++++++++---------- .../app/emails/invite-to-team/en.html | 64 +++++++++---------- .../app/emails/password-recovery/en.html | 64 +++++++++---------- backend/resources/app/emails/register/en.html | 64 +++++++++---------- backend/src/app/rpc/commands/teams.clj | 2 +- frontend/src/app/main/ui/dashboard/team.cljs | 4 +- 11 files changed, 140 insertions(+), 139 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 0dbd1bec9..4be1cebe0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,7 @@ - Fix invitations input on team management and onboarding modal [Taiga #4760](https://tree.taiga.io/project/penpot/issue/4760) - Fix weird numeration creating new elements in dashboard [Taiga #4755](https://tree.taiga.io/project/penpot/issue/4755) - Fix can move shape with lens zoom active [Taiga #4787](https://tree.taiga.io/project/penpot/issue/4787) +- Fix social links broken [Taiga #4759](https://tree.taiga.io/project/penpot/issue/4759) ## 1.17.0 diff --git a/backend/resources/app/emails-mjml/change-email/en.mjml b/backend/resources/app/emails-mjml/change-email/en.mjml index 392452a0a..f69c418dc 100644 --- a/backend/resources/app/emails-mjml/change-email/en.mjml +++ b/backend/resources/app/emails-mjml/change-email/en.mjml @@ -48,8 +48,8 @@ - - + + diff --git a/backend/resources/app/emails-mjml/invite-to-team/en.mjml b/backend/resources/app/emails-mjml/invite-to-team/en.mjml index 82816304c..886c7d1d6 100644 --- a/backend/resources/app/emails-mjml/invite-to-team/en.mjml +++ b/backend/resources/app/emails-mjml/invite-to-team/en.mjml @@ -41,8 +41,8 @@ - - + + diff --git a/backend/resources/app/emails-mjml/password-recovery/en.mjml b/backend/resources/app/emails-mjml/password-recovery/en.mjml index f43b8eade..89bc817b5 100644 --- a/backend/resources/app/emails-mjml/password-recovery/en.mjml +++ b/backend/resources/app/emails-mjml/password-recovery/en.mjml @@ -50,8 +50,8 @@ - - + + diff --git a/backend/resources/app/emails-mjml/register/en.mjml b/backend/resources/app/emails-mjml/register/en.mjml index cb539fc2d..38b774e13 100644 --- a/backend/resources/app/emails-mjml/register/en.mjml +++ b/backend/resources/app/emails-mjml/register/en.mjml @@ -47,8 +47,8 @@ - - + + diff --git a/backend/resources/app/emails/change-email/en.html b/backend/resources/app/emails/change-email/en.html index 3120f86ba..ad95fa641 100644 --- a/backend/resources/app/emails/change-email/en.html +++ b/backend/resources/app/emails/change-email/en.html @@ -103,9 +103,9 @@ @@ -143,7 +143,7 @@ - + @@ -157,9 +157,9 @@ @@ -225,7 +225,7 @@
- + @@ -239,9 +239,9 @@ @@ -271,7 +271,7 @@
- + @@ -285,9 +285,9 @@ @@ -425,7 +425,7 @@
@@ -321,7 +321,7 @@
@@ -341,7 +341,7 @@
@@ -361,7 +361,7 @@
@@ -370,7 +370,7 @@
@@ -381,7 +381,7 @@
- +
@@ -390,7 +390,7 @@
@@ -401,7 +401,7 @@
- +
@@ -411,9 +411,9 @@
- + @@ -439,9 +439,9 @@ diff --git a/backend/resources/app/emails/invite-to-team/en.html b/backend/resources/app/emails/invite-to-team/en.html index 340ac3429..881af47f4 100644 --- a/backend/resources/app/emails/invite-to-team/en.html +++ b/backend/resources/app/emails/invite-to-team/en.html @@ -103,9 +103,9 @@ @@ -143,7 +143,7 @@
- + @@ -157,9 +157,9 @@ @@ -215,7 +215,7 @@
- + @@ -229,9 +229,9 @@ @@ -261,7 +261,7 @@
- + @@ -275,9 +275,9 @@ @@ -415,7 +415,7 @@
@@ -311,7 +311,7 @@
@@ -331,7 +331,7 @@
@@ -351,7 +351,7 @@
@@ -360,7 +360,7 @@
@@ -371,7 +371,7 @@
- +
@@ -380,7 +380,7 @@
@@ -391,7 +391,7 @@
- +
@@ -401,9 +401,9 @@
- + @@ -429,9 +429,9 @@ diff --git a/backend/resources/app/emails/password-recovery/en.html b/backend/resources/app/emails/password-recovery/en.html index 2b2db5a21..14fe1a5f2 100644 --- a/backend/resources/app/emails/password-recovery/en.html +++ b/backend/resources/app/emails/password-recovery/en.html @@ -103,9 +103,9 @@ @@ -143,7 +143,7 @@
- + @@ -157,9 +157,9 @@ @@ -220,7 +220,7 @@
- + @@ -234,9 +234,9 @@ @@ -266,7 +266,7 @@
- + @@ -280,9 +280,9 @@ @@ -420,7 +420,7 @@
@@ -316,7 +316,7 @@
@@ -336,7 +336,7 @@
@@ -356,7 +356,7 @@
@@ -365,7 +365,7 @@
@@ -376,7 +376,7 @@
- +
@@ -385,7 +385,7 @@
@@ -396,7 +396,7 @@
- +
@@ -406,9 +406,9 @@
- + @@ -434,9 +434,9 @@ diff --git a/backend/resources/app/emails/register/en.html b/backend/resources/app/emails/register/en.html index d60e1dac8..4a425b69f 100644 --- a/backend/resources/app/emails/register/en.html +++ b/backend/resources/app/emails/register/en.html @@ -103,9 +103,9 @@ @@ -143,7 +143,7 @@
- + @@ -157,9 +157,9 @@ @@ -215,7 +215,7 @@
- + @@ -229,9 +229,9 @@ @@ -261,7 +261,7 @@
- + @@ -275,9 +275,9 @@ @@ -415,7 +415,7 @@
@@ -311,7 +311,7 @@
@@ -331,7 +331,7 @@
@@ -351,7 +351,7 @@
@@ -360,7 +360,7 @@
@@ -371,7 +371,7 @@
- +
@@ -380,7 +380,7 @@
@@ -391,7 +391,7 @@
- +
@@ -401,9 +401,9 @@
- + @@ -429,9 +429,9 @@ diff --git a/backend/src/app/rpc/commands/teams.clj b/backend/src/app/rpc/commands/teams.clj index ff07667e6..9ab23583c 100644 --- a/backend/src/app/rpc/commands/teams.clj +++ b/backend/src/app/rpc/commands/teams.clj @@ -473,7 +473,7 @@ (s/def ::team-id ::us/uuid) (s/def ::member-id ::us/uuid) ;; Temporarily disabled viewer role -;; https://tree.taiga.io/project/uxboxproject/issue/1083 +;; https://tree.taiga.io/project/penpot/issue/1083 ;; (s/def ::role #{:owner :admin :editor :viewer}) (s/def ::role #{:owner :admin :editor}) diff --git a/frontend/src/app/main/ui/dashboard/team.cljs b/frontend/src/app/main/ui/dashboard/team.cljs index 983b73d04..da8d7c0e1 100644 --- a/frontend/src/app/main/ui/dashboard/team.cljs +++ b/frontend/src/app/main/ui/dashboard/team.cljs @@ -82,7 +82,7 @@ (when (:is-admin permissions) {:value "admin" :label (tr "labels.admin")}) ;; Temporarily disabled viewer roles - ;; https://tree.taiga.io/project/uxboxproject/issue/1083 + ;; https://tree.taiga.io/project/penpot/issue/1083 ;; {:value "viewer" :label (tr "labels.viewer")} ] (filterv identity))) @@ -209,7 +209,7 @@ [:li {:on-click set-admin} (tr "labels.admin")] [:li {:on-click set-editor} (tr "labels.editor")] ;; Temporarily disabled viewer role - ;; https://tree.taiga.io/project/uxboxproject/issue/1083 + ;; https://tree.taiga.io/project/penpot/issue/1083 ;; [:li {:on-click set-viewer} (tr "labels.viewer")] (when you-owner? [:li {:on-click (partial set-owner member)} (tr "labels.owner")])]]]))