mirror of
https://github.com/penpot/penpot.git
synced 2025-03-18 02:32:13 -05:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
Andrey Antukh
commit
809d7ab7f4
17 changed files with 1235 additions and 1663 deletions
|
|
@ -46,6 +46,7 @@
|
|||
- Fixed missing translate string [Taiga #2780](https://tree.taiga.io/project/penpot/issue/2780)
|
||||
- Fixed handoff shadow type text [Taiga #2717](https://tree.taiga.io/project/penpot/issue/2717)
|
||||
- Fixed components get "dirty" marker when moved [Taiga #2764](https://tree.taiga.io/project/penpot/issue/2764)
|
||||
- Fixed cannot align objects in a group that is not part of a frame [Taiga #2762](https://tree.taiga.io/project/penpot/issue/2762)
|
||||
|
||||
### :arrow_up: Deps updates
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
{:extra-deps
|
||||
{org.clojure/tools.namespace {:mvn/version "RELEASE"}
|
||||
org.clojure/test.check {:mvn/version "RELEASE"}
|
||||
thheller/shadow-cljs {:mvn/version "2.17.2"}
|
||||
thheller/shadow-cljs {:mvn/version "2.17.3"}
|
||||
com.bhauman/rebel-readline {:mvn/version "RELEASE"}
|
||||
criterium/criterium {:mvn/version "RELEASE"}
|
||||
mockery/mockery {:mvn/version "RELEASE"}}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
"test": "yarn run compile-test && yarn run run-test"
|
||||
},
|
||||
"devDependencies": {
|
||||
"shadow-cljs": "2.17.2",
|
||||
"shadow-cljs": "2.17.3",
|
||||
"source-map-support": "^0.5.19",
|
||||
"ws": "^7.4.6"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -533,10 +533,10 @@ shadow-cljs-jar@1.3.2:
|
|||
resolved "https://registry.yarnpkg.com/shadow-cljs-jar/-/shadow-cljs-jar-1.3.2.tgz#97273afe1747b6a2311917c1c88d9e243c81957b"
|
||||
integrity sha512-XmeffAZHv8z7451kzeq9oKh8fh278Ak+UIOGGrapyqrFBB773xN8vMQ3O7J7TYLnb9BUwcqadKkmgaq7q6fhZg==
|
||||
|
||||
shadow-cljs@2.17.2:
|
||||
version "2.17.2"
|
||||
resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.17.2.tgz#41df03aaf84b339dbcf036a627b454a0424760bb"
|
||||
integrity sha512-XE9jWWBlT80fosk6+6AADiQZ9q33zgovh+v6vmeBBsOtYGILgVAFYZZvOzoRY7oEXz12IUzMpKxbA7WFjj5I0w==
|
||||
shadow-cljs@2.17.3:
|
||||
version "2.17.3"
|
||||
resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.17.3.tgz#748e31f67cffdc401691c0cd1bf733a1da53ab5d"
|
||||
integrity sha512-GxyczUuCtACq/uEOvdTc61wT/aDOZFy8G/AGc322uTX/oUiZaeTJrwpClXe+0+e7VKG9E9RCqP/cjuG3cAG0fw==
|
||||
dependencies:
|
||||
node-libs-browser "^2.2.1"
|
||||
readline-sync "^1.4.7"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
:dev
|
||||
{:extra-deps
|
||||
{thheller/shadow-cljs {:mvn/version "2.17.2"}}}
|
||||
{thheller/shadow-cljs {:mvn/version "2.17.3"}}}
|
||||
|
||||
:shadow-cljs
|
||||
{:main-opts ["-m" "shadow.cljs.devtools.cli"]}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
"xregexp": "^5.0.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"shadow-cljs": "^2.17.2",
|
||||
"shadow-cljs": "^2.17.3",
|
||||
"source-map-support": "^0.5.21"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1010,10 +1010,10 @@ shadow-cljs-jar@1.3.2:
|
|||
resolved "https://registry.yarnpkg.com/shadow-cljs-jar/-/shadow-cljs-jar-1.3.2.tgz#97273afe1747b6a2311917c1c88d9e243c81957b"
|
||||
integrity sha512-XmeffAZHv8z7451kzeq9oKh8fh278Ak+UIOGGrapyqrFBB773xN8vMQ3O7J7TYLnb9BUwcqadKkmgaq7q6fhZg==
|
||||
|
||||
shadow-cljs@^2.17.2:
|
||||
version "2.17.2"
|
||||
resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.17.2.tgz#41df03aaf84b339dbcf036a627b454a0424760bb"
|
||||
integrity sha512-XE9jWWBlT80fosk6+6AADiQZ9q33zgovh+v6vmeBBsOtYGILgVAFYZZvOzoRY7oEXz12IUzMpKxbA7WFjj5I0w==
|
||||
shadow-cljs@^2.17.3:
|
||||
version "2.17.3"
|
||||
resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.17.3.tgz#748e31f67cffdc401691c0cd1bf733a1da53ab5d"
|
||||
integrity sha512-GxyczUuCtACq/uEOvdTc61wT/aDOZFy8G/AGc322uTX/oUiZaeTJrwpClXe+0+e7VKG9E9RCqP/cjuG3cAG0fw==
|
||||
dependencies:
|
||||
node-libs-browser "^2.2.1"
|
||||
readline-sync "^1.4.7"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
it("choose solo option", () => {
|
||||
cy.getBySel("onboarding-welcome-title").should("exist");
|
||||
cy.getBySel("fly-solo-op").click();
|
||||
cy.getBySel("onboarding-templates-title").should("exist");
|
||||
cy.getBySel("empty-placeholder").should("exist");
|
||||
});
|
||||
|
||||
it("choose team option and cancel", () => {
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
cy.get("input[type=submit]").first().click();
|
||||
cy.get("#email").should("exist");
|
||||
cy.get(".skip-action").click();
|
||||
cy.getBySel("onboarding-templates-title").should("exist");
|
||||
cy.getBySel("empty-placeholder").should("exist");
|
||||
});
|
||||
|
||||
it("choose team option, set team name and invite", () => {
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
cy.get("#email").should("exist");
|
||||
cy.get("#email").type("test@test.com");
|
||||
cy.get("input[type=submit]").first().click();
|
||||
cy.getBySel("onboarding-templates-title").should("exist");
|
||||
cy.getBySel("empty-placeholder").should("exist");
|
||||
});
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
:dev
|
||||
{:extra-paths ["dev"]
|
||||
:extra-deps
|
||||
{thheller/shadow-cljs {:mvn/version "2.17.2"}
|
||||
{thheller/shadow-cljs {:mvn/version "2.17.3"}
|
||||
org.clojure/tools.namespace {:mvn/version "RELEASE"}
|
||||
cider/cider-nrepl {:mvn/version "0.28.2"}}}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"autoprefixer": "^10.4.2",
|
||||
"cypress": "^9.4.1",
|
||||
"cypress": "^9.5.0",
|
||||
"cypress-file-upload": "^5.0.8",
|
||||
"gettext-parser": "^4.2.0",
|
||||
"gulp": "4.0.2",
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
"prettier": "^2.5.1",
|
||||
"rimraf": "^3.0.0",
|
||||
"sass": "^1.49.7",
|
||||
"shadow-cljs": "2.17.2"
|
||||
"shadow-cljs": "2.17.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@sentry/browser": "^6.17.4",
|
||||
|
|
|
|||
|
|
@ -1184,7 +1184,7 @@
|
|||
(empty? selected) false
|
||||
(> (count selected) 1) true
|
||||
:else
|
||||
(not= uuid/zero (:frame-id (get objects (first selected))))))
|
||||
(not= uuid/zero (:parent-id (get objects (first selected))))))
|
||||
|
||||
(defn align-objects
|
||||
[axis]
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
[:div.grid-item]]
|
||||
|
||||
(true? default?)
|
||||
[:div.grid-empty-placeholder.drafts
|
||||
[:div.grid-empty-placeholder.drafts {:data-test "empty-placeholder"}
|
||||
[:div.text
|
||||
[:& i18n/tr-html {:label "dashboard.empty-placeholder-drafts"}]]]
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
;; the onboarding templates modal.
|
||||
on-fly-solo
|
||||
(fn []
|
||||
(tm/schedule 400 #(st/emit! (modal/show {:type :onboarding-templates}))))
|
||||
(tm/schedule 400 #(st/emit! (modal/hide))))
|
||||
|
||||
;; When user choices the option of `team up`, we proceed to show
|
||||
;; the team creation modal.
|
||||
|
|
@ -121,14 +121,12 @@
|
|||
on-success
|
||||
(mf/use-callback
|
||||
(fn [_form response]
|
||||
(let [project-id (:default-project-id response)
|
||||
team-id (:id response)]
|
||||
(let [team-id (:id response)]
|
||||
(st/emit!
|
||||
(modal/hide)
|
||||
(rt/nav :dashboard-projects {:team-id team-id}))
|
||||
(tm/schedule 400 #(st/emit!
|
||||
(modal/show {:type :onboarding-templates
|
||||
:project-id project-id}))))))
|
||||
(modal/hide))))))
|
||||
|
||||
on-error
|
||||
(mf/use-callback
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
:data-test "close-templates-btn"} i/close]]
|
||||
|
||||
[:div.modal-content
|
||||
[:h3 {:data-test "onboarding-templates-title"} (tr "onboarding.templates.title")]
|
||||
[:h3 (tr "onboarding.templates.title")]
|
||||
[:p (tr "onboarding.templates.subtitle")]
|
||||
|
||||
[:div.templates
|
||||
|
|
|
|||
|
|
@ -257,9 +257,8 @@ msgstr "You still have no files here"
|
|||
#, markdown
|
||||
msgid "dashboard.empty-placeholder-drafts"
|
||||
msgstr ""
|
||||
"There are no files here yet. If you want to try some templates you can go "
|
||||
"to the [Libraries & templates "
|
||||
"section](https://penpot.app/libraries-templates.html)"
|
||||
"Oh no! You have no files yet! If you want to try with some templates go "
|
||||
"to [Libraries & templates](https://penpot.app/libraries-templates.html)"
|
||||
|
||||
msgid "dashboard.export-frames"
|
||||
msgstr "Export artboards to PDF..."
|
||||
|
|
|
|||
|
|
@ -261,9 +261,8 @@ msgstr "Todavía no hay ningún archivo aquí"
|
|||
#, markdown
|
||||
msgid "dashboard.empty-placeholder-drafts"
|
||||
msgstr ""
|
||||
"Aún no tienes archivos. Si quieres probar alguna plantilla visita nuestra "
|
||||
"seccion de [Bibliotecas y "
|
||||
"plantillas](https://penpot.app/libraries-templates.html)"
|
||||
"¡Oh, no! ¡Aún no tienes archivos! Si quieres probar con alguna plantilla ve a "
|
||||
"[Bibliotecas y plantillas](https://penpot.app/libraries-templates.html)"
|
||||
|
||||
msgid "dashboard.export-frames"
|
||||
msgstr "Exportar tableros a PDF..."
|
||||
|
|
|
|||
2837
frontend/yarn.lock
2837
frontend/yarn.lock
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue