From 1fdd3b85abacc64c040891c423548e229c0c244d Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 24 Aug 2022 09:00:28 +0200 Subject: [PATCH 1/7] :bug: Fix typo in releases 1.15 --- frontend/src/app/main/ui/releases/v1_15.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/releases/v1_15.cljs b/frontend/src/app/main/ui/releases/v1_15.cljs index 369a1dd83..15ad17997 100644 --- a/frontend/src/app/main/ui/releases/v1_15.cljs +++ b/frontend/src/app/main/ui/releases/v1_15.cljs @@ -77,7 +77,7 @@ [:img {:src "images/features/1.15-comments.gif" :border "0" :alt "Comments positioning"}]] [:div.modal-right [:div.modal-title - [:h2 "Comments poitioning"]] + [:h2 "Comments positioning"]] [:div.modal-content [:p "They live! Now you can move existing comments wherever you want by dragging them."] [:p "Also, comments inside boards will be associated with it, so that if you move a board its comments will maintain its place inside it."]] From 51307cdf8d70e685c917fab27d84e609a89edbbb Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 27 Sep 2022 13:11:17 +0200 Subject: [PATCH 2/7] :bug: Fix content-lenght calculation on exporter response --- exporter/src/app/core.cljs | 11 +++++++---- exporter/src/app/handlers/export_shapes.cljs | 2 +- exporter/src/app/http.cljs | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/exporter/src/app/core.cljs b/exporter/src/app/core.cljs index 453ff720b..ee089a0d9 100644 --- a/exporter/src/app/core.cljs +++ b/exporter/src/app/core.cljs @@ -9,7 +9,7 @@ ["process" :as proc] [app.browser :as bwr] [app.common.logging :as l] - [app.config] + [app.config :as cf] [app.http :as http] [app.redis :as redis] [promesa.core :as p])) @@ -19,7 +19,9 @@ (defn start [& _] - (l/info :msg "initializing") + (l/info :msg "initializing" + :public-uri (str (cf/get :public-uri)) + :version (:full @cf/version)) (p/do! (bwr/init) (redis/init) @@ -39,5 +41,6 @@ (http/stop) (done))) -(proc/on "uncaughtException" (fn [cause] - (js/console.error cause))) +(proc/on "uncaughtException" + (fn [cause] + (js/console.error cause))) diff --git a/exporter/src/app/handlers/export_shapes.cljs b/exporter/src/app/handlers/export_shapes.cljs index 02e7a824d..7de0e7286 100644 --- a/exporter/src/app/handlers/export_shapes.cljs +++ b/exporter/src/app/handlers/export_shapes.cljs @@ -77,7 +77,7 @@ :name (:name resource) :status "ended"})))) on-error (fn [cause] - (l/error :hint "unexpected error happened on export multiple process" + (l/error :hint "unexpected error on export multiple" :cause cause) (if wait (p/rejected cause) diff --git a/exporter/src/app/http.cljs b/exporter/src/app/http.cljs index e38a08d53..a43d7f67b 100644 --- a/exporter/src/app/http.cljs +++ b/exporter/src/app/http.cljs @@ -90,12 +90,13 @@ (fn [{:keys [:response/body :response/status] :as exchange}] (cond (map? body) - (let [data (t/encode-str body {:type :json-verbose})] + (let [data (t/encode-str body {:type :json-verbose}) + size (js/Buffer.byteLength data "utf-8")] (-> exchange (assoc :response/body data) (assoc :response/status 200) (update :response/headers assoc "content-type" "application/transit+json") - (update :response/headers assoc "content-length" (count data)))) + (update :response/headers assoc "content-length" size))) (and (nil? body) (= 200 status)) From d8f1df01427c036d1d5e885bd535ee8d0870328c Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 27 Sep 2022 14:04:48 +0200 Subject: [PATCH 3/7] :bug: Fix cannot take out an element from a group at layers panel by drag --- CHANGES.md | 1 + frontend/src/app/main/ui/workspace/sidebar/layers.cljs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d86a920e7..81f1c979d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ - Fix error after user drags any layer in search functionality [Taiga #4161](https://tree.taiga.io/project/penpot/issue/4161) - Fix font search works only with lowercase letters [Taiga #4140](https://tree.taiga.io/project/penpot/issue/4140) - Fix Terms and Privacy links overlapping [Taiga #4137](https://tree.taiga.io/project/penpot/issue/4137) +- Fix Cannot take out an element from a group at layers panel by drag [Taiga #4209](https://tree.taiga.io/project/penpot/issue/4209) ## 1.15.3-beta diff --git a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs index 87265242d..eb91f47ac 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs @@ -247,7 +247,8 @@ :selected selected :index index :objects objects - :key (:id item)}]))])])) + :key (:id item) + :sortable? sortable?}]))])])) ;; This components is a piece for sharding equality check between top ;; level frames and try to avoid rerender frames that are does not From 6ac1d47de1fd2bf9710a73101a5231dad6ea16a2 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 28 Sep 2022 08:42:49 +0200 Subject: [PATCH 4/7] :bug: Fix Internal error when resending invitation email --- CHANGES.md | 1 + frontend/src/app/main/ui/dashboard/team.cljs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 81f1c979d..cb4738617 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -23,6 +23,7 @@ - Fix font search works only with lowercase letters [Taiga #4140](https://tree.taiga.io/project/penpot/issue/4140) - Fix Terms and Privacy links overlapping [Taiga #4137](https://tree.taiga.io/project/penpot/issue/4137) - Fix Cannot take out an element from a group at layers panel by drag [Taiga #4209](https://tree.taiga.io/project/penpot/issue/4209) +- Fix Internal error when resending invitation email [Taiga #4212](https://tree.taiga.io/project/penpot/issue/4212) ## 1.15.3-beta diff --git a/frontend/src/app/main/ui/dashboard/team.cljs b/frontend/src/app/main/ui/dashboard/team.cljs index 98c92857f..85363547d 100644 --- a/frontend/src/app/main/ui/dashboard/team.cljs +++ b/frontend/src/app/main/ui/dashboard/team.cljs @@ -492,7 +492,7 @@ resend-invitation (fn [] - (let [params {:email email + (let [params {:emails [email] :team-id (:id team) :resend? true :role invitation-role} From c2ccdd568097d2b46e0e297f8b86e78b27b4f887 Mon Sep 17 00:00:00 2001 From: Eva Date: Wed, 28 Sep 2022 09:52:46 +0200 Subject: [PATCH 5/7] :bug: Fix PDF exportation order --- CHANGES.md | 1 + frontend/src/app/main/ui/workspace/header.cljs | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index cb4738617..8e8f78915 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,7 @@ - Fix Terms and Privacy links overlapping [Taiga #4137](https://tree.taiga.io/project/penpot/issue/4137) - Fix Cannot take out an element from a group at layers panel by drag [Taiga #4209](https://tree.taiga.io/project/penpot/issue/4209) - Fix Internal error when resending invitation email [Taiga #4212](https://tree.taiga.io/project/penpot/issue/4212) +- Fix PDF exportation order [Taiga #4216](https://tree.taiga.io/project/penpot/issue/4216) ## 1.15.3-beta diff --git a/frontend/src/app/main/ui/workspace/header.cljs b/frontend/src/app/main/ui/workspace/header.cljs index bd1228255..63ac5c7d1 100644 --- a/frontend/src/app/main/ui/workspace/header.cljs +++ b/frontend/src/app/main/ui/workspace/header.cljs @@ -6,6 +6,8 @@ (ns app.main.ui.workspace.header (:require + [app.common.pages.helpers :as cph] + [app.common.uuid :as uuid] [app.config :as cf] [app.main.data.events :as ev] [app.main.data.exports :as de] @@ -107,7 +109,9 @@ show-sub-menu? (mf/use-state false) editing? (mf/use-state false) edit-input-ref (mf/use-ref nil) - frames (mf/deref refs/workspace-frames) + objects (mf/deref refs/workspace-page-objects) + frames (->> (cph/get-immediate-children objects uuid/zero) + (filterv cph/frame-shape?)) add-shared-fn #(st/emit! (dwl/set-file-shared (:id file) true)) From ba37168a843d517ba08d1c7fa93587bedccde7fd Mon Sep 17 00:00:00 2001 From: Eva Date: Wed, 28 Sep 2022 11:01:13 +0200 Subject: [PATCH 6/7] :bug: Fix some typos --- CHANGES.md | 4 ++++ frontend/translations/ca.po | 2 +- frontend/translations/de.po | 2 +- frontend/translations/en.po | 8 ++++---- frontend/translations/es.po | 2 +- frontend/translations/fa.po | 2 +- frontend/translations/fr.po | 2 +- frontend/translations/gl.po | 2 +- frontend/translations/he.po | 2 +- frontend/translations/id.po | 2 +- frontend/translations/lt.po | 2 +- frontend/translations/ml.po | 2 +- frontend/translations/pl.po | 2 +- frontend/translations/pt_BR.po | 2 +- frontend/translations/ru.po | 2 +- frontend/translations/tr.po | 2 +- frontend/translations/zh_CN.po | 2 +- frontend/translations/zh_Hant.po | 2 +- 18 files changed, 24 insertions(+), 20 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8e8f78915..0c3c0a132 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,7 +24,11 @@ - Fix Terms and Privacy links overlapping [Taiga #4137](https://tree.taiga.io/project/penpot/issue/4137) - Fix Cannot take out an element from a group at layers panel by drag [Taiga #4209](https://tree.taiga.io/project/penpot/issue/4209) - Fix Internal error when resending invitation email [Taiga #4212](https://tree.taiga.io/project/penpot/issue/4212) +<<<<<<< HEAD - Fix PDF exportation order [Taiga #4216](https://tree.taiga.io/project/penpot/issue/4216) +======= +- Fix some typos [Taiga #4215](https://tree.taiga.io/project/penpot/issue/4215) +>>>>>>> 093b14d28 (:bug: Fix some typos) ## 1.15.3-beta diff --git a/frontend/translations/ca.po b/frontend/translations/ca.po index 3f7b30b24..d901dc3f1 100644 --- a/frontend/translations/ca.po +++ b/frontend/translations/ca.po @@ -242,7 +242,7 @@ msgstr "" "plantilles](https://penpot.app/libraries-templates.html)" msgid "dashboard.export-frames" -msgstr "Exporta les taules de treball a PDF..." +msgstr "Exporta les taules de treball a PDF" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/de.po b/frontend/translations/de.po index a58c54632..5632313a7 100644 --- a/frontend/translations/de.po +++ b/frontend/translations/de.po @@ -246,7 +246,7 @@ msgstr "" "Vorlagen](https://penpot.app/libraries-templates.html) gehen" msgid "dashboard.export-frames" -msgstr "Zeichenflächen als PDF exportieren…" +msgstr "Zeichenflächen als PDF exportieren" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/en.po b/frontend/translations/en.po index 465199ae4..2c7c66d4f 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -280,7 +280,7 @@ msgid "dashboard.export-binary-multi" msgstr "Download %s Penpot files (.penpot)" msgid "dashboard.export-frames" -msgstr "Export artboards to PDF…" +msgstr "Export artboards to PDF" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" @@ -2373,7 +2373,7 @@ msgid "shortcuts.toggle-lock-size" msgstr "Lock proportions" msgid "shortcuts.toggle-rules" -msgstr "Show/hide rules" +msgstr "Show/hide rulers" msgid "shortcuts.toggle-scale-text" msgstr "Toggle scale text" @@ -2776,7 +2776,7 @@ msgstr "Hide pixel grid" #: src/app/main/ui/workspace/header.cljs msgid "workspace.header.menu.hide-rules" -msgstr "Hide rules" +msgstr "Hide rulers" #: src/app/main/ui/workspace/header.cljs msgid "workspace.header.menu.hide-textpalette" @@ -2823,7 +2823,7 @@ msgstr "Show pixel grid" #: src/app/main/ui/workspace/header.cljs msgid "workspace.header.menu.show-rules" -msgstr "Show rules" +msgstr "Show rulers" #: src/app/main/ui/workspace/header.cljs msgid "workspace.header.menu.show-textpalette" diff --git a/frontend/translations/es.po b/frontend/translations/es.po index 653b5eecd..ca9289b69 100644 --- a/frontend/translations/es.po +++ b/frontend/translations/es.po @@ -286,7 +286,7 @@ msgid "dashboard.export-binary-multi" msgstr "Descargar %s archivos Penpot (.penpot)" msgid "dashboard.export-frames" -msgstr "Exportar tableros a PDF..." +msgstr "Exportar tableros a PDF" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/fa.po b/frontend/translations/fa.po index eaa690f76..05ee1b530 100644 --- a/frontend/translations/fa.po +++ b/frontend/translations/fa.po @@ -246,7 +246,7 @@ msgstr "" "(https://penpot.app/libraries-templates.html)" msgid "dashboard.export-frames" -msgstr "خروجی آرت‌بوردها به پی‌دی‌اف…" +msgstr "خروجی آرت‌بوردها به پی‌دی‌اف" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/fr.po b/frontend/translations/fr.po index 9a3b1f975..652c0001b 100644 --- a/frontend/translations/fr.po +++ b/frontend/translations/fr.po @@ -245,7 +245,7 @@ msgstr "" "(https://penpot.app/libraries-templates.html)" msgid "dashboard.export-frames" -msgstr "Exporter les plans de travail au format PDF…" +msgstr "Exporter les plans de travail au format PDF" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/gl.po b/frontend/translations/gl.po index e9c505bc8..4c36da5ff 100644 --- a/frontend/translations/gl.po +++ b/frontend/translations/gl.po @@ -255,7 +255,7 @@ msgstr "" "vai a [Bibliotecas e modelos] (https://penpot.app/libraries-templates.html)" msgid "dashboard.export-frames" -msgstr "Exportar marcos a PDF…" +msgstr "Exportar marcos a PDF" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/he.po b/frontend/translations/he.po index 8445462b5..60c580bb9 100644 --- a/frontend/translations/he.po +++ b/frontend/translations/he.po @@ -236,7 +236,7 @@ msgstr "" "והתבניות](https://penpot.app/libraries-templates.html)" msgid "dashboard.export-frames" -msgstr "ייצוא לוחות אומנות ל־PDF…" +msgstr "ייצוא לוחות אומנות ל־PDF" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/id.po b/frontend/translations/id.po index b70e2ab45..40b9855fc 100644 --- a/frontend/translations/id.po +++ b/frontend/translations/id.po @@ -240,7 +240,7 @@ msgstr "" "section](https://penpot.app/libraries-templates.html)" msgid "dashboard.export-frames" -msgstr "Ekspor artboards ke PDF ..." +msgstr "Ekspor artboards ke PDF" msgid "dashboard.export-multi" msgstr "Ekspor % file" diff --git a/frontend/translations/lt.po b/frontend/translations/lt.po index a3acf4cc3..a26792f7b 100644 --- a/frontend/translations/lt.po +++ b/frontend/translations/lt.po @@ -244,7 +244,7 @@ msgstr "" "į [Bibliotekos ir šablonai] (https://penpot.app/libraries-templates.html)" msgid "dashboard.export-frames" -msgstr "Eksportuokite darbalaukius į PDF..." +msgstr "Eksportuokite darbalaukius į PDF" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/ml.po b/frontend/translations/ml.po index c123de101..4d8c8967f 100644 --- a/frontend/translations/ml.po +++ b/frontend/translations/ml.po @@ -246,7 +246,7 @@ msgstr "" "വിഭാഗത്തിലേക്ക്] (https://penpot.app/libraries-templates.html) പോകാവുന്നതാണ്" msgid "dashboard.export-frames" -msgstr "ആർട്ട്ബോർഡുകൾ പിഡിഎഫായി എക്സ്പോർട്ട് ചെയ്യുക...." +msgstr "ആർട്ട്ബോർഡുകൾ പിഡിഎഫായി എക്സ്പോർട്ട് ചെയ്യുക" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/pl.po b/frontend/translations/pl.po index 00d313b19..3b9edcaad 100644 --- a/frontend/translations/pl.po +++ b/frontend/translations/pl.po @@ -243,7 +243,7 @@ msgstr "" "szablony](https://penpot.app/libraries-templates.html)" msgid "dashboard.export-frames" -msgstr "Eksportuj obszary kompozycji do PDF…" +msgstr "Eksportuj obszary kompozycji do PDF" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/pt_BR.po b/frontend/translations/pt_BR.po index 350c29fcb..ed6b0d3b8 100644 --- a/frontend/translations/pt_BR.po +++ b/frontend/translations/pt_BR.po @@ -260,7 +260,7 @@ msgstr "" "modelos](https://penpot.app/libraries-templates.html)" msgid "dashboard.export-frames" -msgstr "Exportar pranchetas para PDF…" +msgstr "Exportar pranchetas para PDF" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/ru.po b/frontend/translations/ru.po index a94c4c007..41d332477 100644 --- a/frontend/translations/ru.po +++ b/frontend/translations/ru.po @@ -244,7 +244,7 @@ msgstr "" "[\"Libraries & templates\"](https://penpot.app/libraries-templates.html)" msgid "dashboard.export-frames" -msgstr "Экспорт кадров в PDF..." +msgstr "Экспорт кадров в PDF" msgid "dashboard.export-multi" msgstr "Экспорт файлов Penpot (%s)" diff --git a/frontend/translations/tr.po b/frontend/translations/tr.po index 45dec9963..deba4ea50 100644 --- a/frontend/translations/tr.po +++ b/frontend/translations/tr.po @@ -244,7 +244,7 @@ msgstr "" "sayfasına gidin" msgid "dashboard.export-frames" -msgstr "Çalışma yüzeylerini PDF'ye aktar…" +msgstr "Çalışma yüzeylerini PDF'ye aktar" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/zh_CN.po b/frontend/translations/zh_CN.po index 8bde2b82e..a2939f0d9 100644 --- a/frontend/translations/zh_CN.po +++ b/frontend/translations/zh_CN.po @@ -237,7 +237,7 @@ msgid "dashboard.empty-placeholder-drafts" msgstr "现在尚无文件。如果你想尝试一些模板，请点击[库和模板](https://penpot.app/libraries-templates.html)" msgid "dashboard.export-frames" -msgstr "导出画板到PDF…" +msgstr "导出画板到PDF" #: src/app/main/ui/export.cljs msgid "dashboard.export-frames.title" diff --git a/frontend/translations/zh_Hant.po b/frontend/translations/zh_Hant.po index 57311fc5a..5b4dfc4f8 100644 --- a/frontend/translations/zh_Hant.po +++ b/frontend/translations/zh_Hant.po @@ -240,7 +240,7 @@ msgstr "" #, fuzzy msgid "dashboard.export-frames" -msgstr "將 artboards 匯出為 PDF..." +msgstr "將 artboards 匯出為 PDF" msgid "dashboard.export-multi" msgstr "匯出 %s 個檔案" From 745aa17d8a3a28f23b8a4aebd1285dbf548f2154 Mon Sep 17 00:00:00 2001 From: Eva Date: Wed, 28 Sep 2022 13:15:11 +0200 Subject: [PATCH 7/7] :bug: Fix alignment of 'no boards' message in viewer --- CHANGES.md | 4 +--- frontend/resources/styles/main/partials/viewer.scss | 12 +++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 0c3c0a132..957759bda 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,11 +24,9 @@ - Fix Terms and Privacy links overlapping [Taiga #4137](https://tree.taiga.io/project/penpot/issue/4137) - Fix Cannot take out an element from a group at layers panel by drag [Taiga #4209](https://tree.taiga.io/project/penpot/issue/4209) - Fix Internal error when resending invitation email [Taiga #4212](https://tree.taiga.io/project/penpot/issue/4212) -<<<<<<< HEAD - Fix PDF exportation order [Taiga #4216](https://tree.taiga.io/project/penpot/issue/4216) -======= - Fix some typos [Taiga #4215](https://tree.taiga.io/project/penpot/issue/4215) ->>>>>>> 093b14d28 (:bug: Fix some typos) +- Fix "no boards" message in viewer [Taiga #4243](https://tree.taiga.io/project/penpot/issue/4243) ## 1.15.3-beta diff --git a/frontend/resources/styles/main/partials/viewer.scss b/frontend/resources/styles/main/partials/viewer.scss index 0f1ddcdf9..12dcc4622 100644 --- a/frontend/resources/styles/main/partials/viewer.scss +++ b/frontend/resources/styles/main/partials/viewer.scss @@ -141,11 +141,6 @@ align-items: center; overflow: hidden; - .empty-state { - justify-content: center; - align-items: center; - } - svg { transform-origin: center; } @@ -168,6 +163,13 @@ height: 100%; z-index: 10; } + + .empty-state { + width: 100vw; + display: flex; + justify-content: center; + align-items: center; + } } .viewport-container {