From 85f2804af8308ab4c520b89743d8c3aef4ac4ee1 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 10 Jun 2022 08:24:13 +0200 Subject: [PATCH 1/5] :paperclip: Tag new minor release --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index f5cfa2bf3a..85c97c2c51 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.13.6-beta +1.13.7-beta From a3fd5d65166f6b7416bc932c8da207762afc15a9 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 13 Jun 2022 10:16:10 +0200 Subject: [PATCH 2/5] :books: Update changelog --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 2bef44f651..187424f9c5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,7 @@ - Added fixed elements when scrolling [Taiga #1533](https://tree.taiga.io/project/penpot/us/1533) - Multiple team invitations on onboarding [Taiga #3084](https://tree.taiga.io/project/penpot/us/3084) - Change text properties position at the sidebar [Taiga #3047](https://tree.taiga.io/project/penpot/us/3047) +- Group assets by drag and drop [Taiga #2831](https://tree.taiga.io/project/penpot/us/2831) ### :bug: Bugs fixed - Fix menu file not accessible in certain conditions [Taiga #3385](https://tree.taiga.io/project/penpot/issue/3385) @@ -70,7 +71,6 @@ ### :sparkles: New features -- Group assets by drag and drop [Taiga #2831](https://tree.taiga.io/project/penpot/us/2831) - Search and filter layers [Taiga #2564](https://tree.taiga.io/project/penpot/us/2564) - Exporting big files flow [Taiga #2218](https://tree.taiga.io/project/penpot/us/2218) - Multiexport from main menu [Taiga #520](https://tree.taiga.io/project/penpot/us/28541) From 189d33221e16c5396aec29908700b5200453712e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 13 Jun 2022 14:44:40 +0200 Subject: [PATCH 3/5] :bug: Add missing resolver to frontend docker image --- docker/images/files/nginx.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/images/files/nginx.conf b/docker/images/files/nginx.conf index 52922f3a04..35863895be 100644 --- a/docker/images/files/nginx.conf +++ b/docker/images/files/nginx.conf @@ -38,6 +38,8 @@ http { gzip_types text/plain text/css text/javascript application/javascript application/json application/transit+json; + resolver 127.0.0.11; + map $http_upgrade $connection_upgrade { default upgrade; '' close; From 2132bad8985dc356147e4516a3276197e097fe4d Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 13 Jun 2022 14:44:40 +0200 Subject: [PATCH 4/5] :bug: Add missing resolver to frontend docker image --- docker/images/files/nginx.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/images/files/nginx.conf b/docker/images/files/nginx.conf index 52922f3a04..35863895be 100644 --- a/docker/images/files/nginx.conf +++ b/docker/images/files/nginx.conf @@ -38,6 +38,8 @@ http { gzip_types text/plain text/css text/javascript application/javascript application/json application/transit+json; + resolver 127.0.0.11; + map $http_upgrade $connection_upgrade { default upgrade; '' close; From 6b5ee2401069703b0f254a1d795ac561699d837a Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 14 Jun 2022 09:08:06 +0200 Subject: [PATCH 5/5] :sparkles: Add team and project ids to update-file mutation for audit log --- backend/src/app/rpc/mutations/files.clj | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/backend/src/app/rpc/mutations/files.clj b/backend/src/app/rpc/mutations/files.clj index 796d0dd5aa..7bc10d6562 100644 --- a/backend/src/app/rpc/mutations/files.clj +++ b/backend/src/app/rpc/mutations/files.clj @@ -13,6 +13,7 @@ [app.common.uuid :as uuid] [app.config :as cf] [app.db :as db] + [app.loggers.audit :as audit] [app.metrics :as mtx] [app.rpc.permissions :as perms] [app.rpc.queries.files :as files] @@ -279,10 +280,14 @@ [{:keys [pool] :as cfg} {:keys [id profile-id] :as params}] (db/with-atomic [conn pool] (db/xact-lock! conn id) - (let [{:keys [id] :as file} (db/get-by-id conn :file id {:for-key-share true})] + (let [{:keys [id] :as file} (db/get-by-id conn :file id {:for-key-share true}) + team-id (retrieve-team-id conn (:project-id file))] (files/check-edition-permissions! conn profile-id id) - (update-file (assoc cfg :conn conn) - (assoc params :file file))))) + (with-meta + (update-file (assoc cfg :conn conn) + (assoc params :file file)) + {::audit/props {:project-id (:project-id file) + :team-id team-id}})))) (defn- take-snapshot? "Defines the rule when file `data` snapshot should be saved."