Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-02 20:39:09 -05:00
Code Issues Activity

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

Browse source
This commit is contained in:
Andrey Antukh 2023-05-04 22:15:18 +02:00
commit ceeed73dea
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
backend/resources/app/onboarding.edn
View file

@ -1,4 +1,8 @@
[{:id "tutorial-for-beginners" [{:id "material-design-3"
:name "Material Design 3"
:thumbnail-uri "https://penpot.app/images/libraries/cover-md3.jpg"
:file-uri "https://github.com/penpot/penpot-files/raw/main/Material%20Design%203.penpot"}
{:id "tutorial-for-beginners"
:name "Tutorial for beginners" :name "Tutorial for beginners"
:thumbnail-uri "https://penpot.app/images/libraries/tutorial-for-beginners.jpg" :thumbnail-uri "https://penpot.app/images/libraries/tutorial-for-beginners.jpg"
:file-uri "https://github.com/penpot/penpot-files/raw/binary-files/tutorial-for-beginners.penpot"} :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/tutorial-for-beginners.penpot"}
@ -29,8 +33,4 @@
{:id "whiteboarding-kit" {:id "whiteboarding-kit"
:name "Whiteboarding Kit" :name "Whiteboarding Kit"
:thumbnail-uri "https://penpot.app/images/libraries/cover-whiteboards.jpg" :thumbnail-uri "https://penpot.app/images/libraries/cover-whiteboards.jpg"
:file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Whiteboarding-mapping-kit.penpot"} :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Whiteboarding-mapping-kit.penpot"}]
{:id "material-design-3"
:name "Material Design 3"
:thumbnail-uri "https://penpot.app/images/libraries/cover-md3.jpg"
:file-uri "https://github.com/penpot/penpot-files/raw/main/Material%20Design%203.penpot"}]

2
backend/src/app/email.clj
View file

@ -65,7 +65,7 @@
(some? bcc) (assign-recipient :bcc bcc))) (some? bcc) (assign-recipient :bcc bcc)))
(defn- assign-from (defn- assign-from
[mmsg {:keys [default-from]} {:keys [from] :as props}] [mmsg {:keys [::default-from] :as cfg} {:keys [from] :as params}]
(let [from (or from default-from)] (let [from (or from default-from)]
(when from (when from
(let [from (parse-address from)] (let [from (parse-address from)]