mirror of
https://github.com/penpot/penpot.git
synced 2025-07-29 19:57:15 +02:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
commit
e4c9b736f7
26 changed files with 170 additions and 167 deletions
|
@ -323,6 +323,7 @@
|
|||
|
||||
file (-> (get-file cfg id :project-id project-id)
|
||||
(assoc :permissions perms)
|
||||
(assoc :team-id (:id team))
|
||||
(check-version!))]
|
||||
|
||||
(-> (cfeat/get-team-enabled-features cf/flags team)
|
||||
|
@ -613,6 +614,7 @@
|
|||
SELECT l.id,
|
||||
l.features,
|
||||
l.project_id,
|
||||
p.team_id,
|
||||
l.created_at,
|
||||
l.modified_at,
|
||||
l.deleted_at,
|
||||
|
@ -622,6 +624,7 @@
|
|||
l.synced_at,
|
||||
l.is_shared
|
||||
FROM libs AS l
|
||||
INNER JOIN project AS p ON (p.id = l.project_id)
|
||||
WHERE l.deleted_at IS NULL OR l.deleted_at > now();")
|
||||
|
||||
(defn get-file-libraries
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue