Merge remote-tracking branch 'origin/main' into develop

This commit is contained in:
Alejandro Alonso 2022-09-28 14:30:28 +02:00
commit 43ceb6bb44
8 changed files with 21 additions and 12 deletions

View file

@ -501,7 +501,7 @@
resend-invitation
(fn []
(let [params {:email email
(let [params {:emails [email]
:team-id (:id team)
:resend? true
:role invitation-role}

View file

@ -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."]]

View file

@ -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))