From 28caa1d47de18b8fabd7a2cdd0cad9374b7b9c0d Mon Sep 17 00:00:00 2001 From: Yamila Moreno Date: Mon, 7 Apr 2025 16:29:47 +0200 Subject: [PATCH 1/6] :bug: Fix docker-compose.yaml (#6236) --- docker/images/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/images/docker-compose.yaml b/docker/images/docker-compose.yaml index 63caa5d00..a5fc6b57e 100644 --- a/docker/images/docker-compose.yaml +++ b/docker/images/docker-compose.yaml @@ -87,7 +87,7 @@ services: networks: - penpot - labels: + # labels: # - "traefik.enable=true" # ## HTTPS: example of labels for the case where penpot will be exposed to the From 6e3673136af0da325a4caa57a65802e4ca5de631 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 9 Apr 2025 09:19:05 +0200 Subject: [PATCH 2/6] :paperclip: Update changelog --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index ec47556d2..066ac4012 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # CHANGELOG -## 2.6.0 (Unreleased) +## 2.6.0 ### :rocket: Epics and highlights From ae3ce1220b57d07c5405a8fc582c86cc9f7b13f4 Mon Sep 17 00:00:00 2001 From: Yamila Moreno Date: Wed, 9 Apr 2025 10:05:18 +0200 Subject: [PATCH 3/6] :whale: Improve https documentation --- docs/technical-guide/getting-started/docker.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/technical-guide/getting-started/docker.md b/docs/technical-guide/getting-started/docker.md index 5b6e57993..153817cd9 100644 --- a/docs/technical-guide/getting-started/docker.md +++ b/docs/technical-guide/getting-started/docker.md @@ -151,9 +151,19 @@ Postgres database and another one for the assets uploaded by your users (images clips). There may be more volumes if you enable other features, as explained in the file itself. -## Configure the proxy +## Configure the proxy and HTTPS -Your host configuration needs to make a proxy to http://localhost:9001. +We strongly recommend to use Penpot under HTTPS/SSL. When you configure the proxy, your host configuration needs to make a proxy to http://localhost:9001. + +

+ If you plan to serve Penpot under different domain than `localhost` without HTTPS, + you need to disable the `secure` flag on cookies, with the `disable-secure-session-cookies` flag. + This is a configuration NOT recommended for production environments; as some browser APIs do + not work properly under non-https environments, this unsecure configuration + may limit the usage of Penpot; as an example, the clipboard does not work with HTTP. +

+ +Below, you can see three examples with three different proxys: ### Example with NGINX From 9f8d7c9e4168bd549350383ebcf1cf2b0c3fa486 Mon Sep 17 00:00:00 2001 From: Yamila Moreno Date: Wed, 9 Apr 2025 12:24:19 +0200 Subject: [PATCH 4/6] :whale: Improve https documentation --- docs/technical-guide/getting-started/docker.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/technical-guide/getting-started/docker.md b/docs/technical-guide/getting-started/docker.md index 153817cd9..9832623b6 100644 --- a/docs/technical-guide/getting-started/docker.md +++ b/docs/technical-guide/getting-started/docker.md @@ -153,7 +153,8 @@ itself. ## Configure the proxy and HTTPS -We strongly recommend to use Penpot under HTTPS/SSL. When you configure the proxy, your host configuration needs to make a proxy to http://localhost:9001. +We strongly recommend to use Penpot under HTTPS/SSL, which will require specific server configurations for DNS and SSL certificates. +Besides, your host configuration needs to make a proxy to http://localhost:9001.

If you plan to serve Penpot under different domain than `localhost` without HTTPS, From 965d2d4036ac20e4656106f431a4d4df965a1b2d Mon Sep 17 00:00:00 2001 From: Alejandro Date: Wed, 9 Apr 2025 12:46:00 +0200 Subject: [PATCH 5/6] :bug: Fix webhooks not shown in list (#6254) --- CHANGES.md | 6 ++++++ frontend/src/app/main/data/team.cljs | 2 +- frontend/src/app/main/ui/dashboard/team.cljs | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 066ac4012..28b1c6b99 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,11 @@ # CHANGELOG +## 2.6.1 + +### :bug: Bugs fixed + +- Fix webhooks not shown in list [Taiga #10763](https://tree.taiga.io/project/penpot/issue/10763) + ## 2.6.0 ### :rocket: Epics and highlights diff --git a/frontend/src/app/main/data/team.cljs b/frontend/src/app/main/data/team.cljs index ce96d45b2..e98dddca3 100644 --- a/frontend/src/app/main/data/team.cljs +++ b/frontend/src/app/main/data/team.cljs @@ -199,7 +199,7 @@ (ptk/reify ::webhooks-fetched ptk/UpdateEvent (update [_ state] - (update-in state [:team-id team-id] assoc :webhooks webhooks)))) + (update-in state [:teams team-id] assoc :webhooks webhooks)))) (defn fetch-webhooks [] diff --git a/frontend/src/app/main/ui/dashboard/team.cljs b/frontend/src/app/main/ui/dashboard/team.cljs index 3daefc5d7..595ec985a 100644 --- a/frontend/src/app/main/ui/dashboard/team.cljs +++ b/frontend/src/app/main/ui/dashboard/team.cljs @@ -1045,7 +1045,7 @@ (tr "dashboard.your-penpot") (:name team))))) - (mf/with-effect [team] + (mf/with-effect [] (st/emit! (dtm/fetch-webhooks))) [:* From ccb6e25914e0f29e2ab5e9bb34838b8522a37d30 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 9 Apr 2025 10:37:16 +0200 Subject: [PATCH 6/6] :bug: Fix colorpicker scroll when dropdown displayed --- CHANGES.md | 1 + frontend/src/app/main/ui/components/select.cljs | 4 ++-- frontend/src/app/main/ui/workspace/colorpicker.scss | 2 +- frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 28b1c6b99..c48189b4d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ ### :bug: Bugs fixed - Fix webhooks not shown in list [Taiga #10763](https://tree.taiga.io/project/penpot/issue/10763) +- Fix colorpicker scroll when dropdown displayed [Taiga #10696](https://tree.taiga.io/project/penpot/issue/10696) ## 2.6.0 diff --git a/frontend/src/app/main/ui/components/select.cljs b/frontend/src/app/main/ui/components/select.cljs index 9bb605c63..f6ae9e842 100644 --- a/frontend/src/app/main/ui/components/select.cljs +++ b/frontend/src/app/main/ui/components/select.cljs @@ -23,7 +23,7 @@ [item item item])) (mf/defc select - [{:keys [default-value options class dropdown-class is-open? on-change on-pointer-enter-option on-pointer-leave-option disabled]}] + [{:keys [default-value options class dropdown-class is-open? on-change on-pointer-enter-option on-pointer-leave-option disabled data-direction]}] (let [label-index (mf/with-memo [options] (into {} (map as-key-value) options)) @@ -112,7 +112,7 @@ [:span {:class (stl/css :current-label)} current-label] [:span {:class (stl/css :dropdown-button)} i/arrow] [:& dropdown {:show is-open? :on-close close-dropdown} - [:ul {:ref dropdown-element* :data-direction @dropdown-direction* + [:ul {:ref dropdown-element* :data-direction (or data-direction @dropdown-direction*) :class (dm/str dropdown-class " " (stl/css :custom-select-dropdown))} (for [[index item] (d/enumerate options)] (if (= :separator item) diff --git a/frontend/src/app/main/ui/workspace/colorpicker.scss b/frontend/src/app/main/ui/workspace/colorpicker.scss index 09b27b746..e962e8159 100644 --- a/frontend/src/app/main/ui/workspace/colorpicker.scss +++ b/frontend/src/app/main/ui/workspace/colorpicker.scss @@ -20,7 +20,7 @@ .colorpicker { border-radius: $br-8; - overflow: auto; + overflow: hidden; } .colorpicker-tabs { diff --git a/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs b/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs index 6814a9a7c..cb703ef5a 100644 --- a/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs +++ b/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs @@ -124,6 +124,7 @@ [:div {:class (stl/css :select-wrapper)} [:& select {:class (stl/css :shadow-type-select) + :data-direction "up" :default-value (or (d/name selected) "recent") :options options :on-change on-library-change}]]