Merge branch 'master' into feat/db

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.logseq.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 82
-        versionName "0.10.8"
+        versionCode 83
+        versionName "0.10.9"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

ios/App/App.xcodeproj/project.pbxproj

@@ -519,7 +519,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.10.8;
+				MARKETING_VERSION = 0.10.9;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -546,7 +546,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.10.8;
+				MARKETING_VERSION = 0.10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
@@ -571,7 +571,7 @@
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 0.10.8;
+				MARKETING_VERSION = 0.10.9;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController;
@@ -598,7 +598,7 @@
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 0.10.8;
+				MARKETING_VERSION = 0.10.9;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";

resources/forge.config.js

@@ -4,7 +4,7 @@ module.exports = {
   packagerConfig: {
     name: 'Logseq',
     icon: './icons/logseq_big_sur.icns',
-    buildVersion: 82,
+    buildVersion: 83,
     protocols: [
       {
         "protocol": "logseq",

resources/package.json

@@ -1,7 +1,7 @@
 {
   "name": "Logseq",
   "productName": "Logseq",
-  "version": "0.10.8",
+  "version": "0.10.9",
   "main": "electron.js",
   "author": "Logseq",
   "license": "AGPL-3.0",

src/electron/electron/window.cljs

@@ -104,7 +104,10 @@
   [^js win]
   (when (.isMinimized ^object win)
     (.restore win))
-  (.focus win))
+  ;; Ref: https://github.com/electron/electron/issues/8734
+  (.setVisibleOnAllWorkspaces win true)
+  (.focus win)
+  (.setVisibleOnAllWorkspaces win false))
 
 (defn get-graph-all-windows
   [graph-path] ;; graph-path == dir

src/main/frontend/components/page.cljs

@@ -150,7 +150,12 @@
 (rum/defc add-button
   [args]
   [:div.flex-1.flex-col.rounded-sm.add-button-link-wrap
-   {:on-click (fn [] (editor-handler/api-insert-new-block! "" args))}
+   {:on-click (fn [] (editor-handler/api-insert-new-block! "" args))
+    :on-key-down (fn [e]
+                    (when (= "Enter" (util/ekey e))
+                      (editor-handler/api-insert-new-block! "" args))
+                    (util/stop e))
+    :tab-index 0}
    [:div.flex.flex-row
     [:div.block {:style {:height      20
                          :width       20

src/main/frontend/version.cljs

@@ -1,3 +1,3 @@
 (ns ^:no-doc frontend.version)
 
-(defonce version "0.10.8")
+(defonce version "0.10.9")

src/resources/dicts/it.edn

@@ -253,13 +253,13 @@
  :command.editor/select-block-down "Seleziona blocco sotto"
  :command.editor/delete-selection "Elimina i blocchi selezionati"
  :command.editor/expand-block-children "Espandi"
- :command.editor/collapse-block-children "Collassa"
+ :command.editor/collapse-block-children "Comprimi"
  :command.editor/indent "Indenta blocco"
  :command.editor/outdent "Diminuisci indentazione"
  :command.editor/copy "Copia (copia una selezione o un riferimento di blocco)"
  :command.editor/cut "Taglia"
  :command.editor/undo "Annulla"
- :command.editor/redo "Rifai"
+ :command.editor/redo "Ripeti"
  :command.editor/select-all-blocks "Seleziona tutti i blocchi"
  :command.editor/zoom-in "Ingrandisci blocco di modifica / Avanti altrimenti"
  :command.editor/zoom-out "Rimpicciolisci il blocco di modifica / Indietro altrimenti"
@@ -364,7 +364,7 @@
  :color/purple "Viola"
  :color/red "Rosso"
  :color/yellow "Giallo"
- :command.command-palette/toggle "Cerca una comando"
+ :command.command-palette/toggle "Cerca un comando"
  :command.dev/show-block-ast "(Dev) Mostra AST del blocco"
  :command.dev/show-block-data "(Dev) Mostra dati del blocco"
  :command.dev/show-page-ast "(Dev) Mostra AST della pagina"
@@ -387,8 +387,8 @@
  :command.sidebar/close-top "Chiudi l'elemento in alto nel pannello laterale destra"
  :command.ui/clear-all-notifications "Cancella tutte le notifiche"
  :command.ui/install-plugins-from-file "Installa plugin da plugins.edn"
- :command.whiteboard/bring-forward "Sposta in avanti"
- :command.whiteboard/bring-to-front "Sposta in fronte"
+ :command.whiteboard/bring-forward "Porta avanti"
+ :command.whiteboard/bring-to-front "Porta in primo piano"
  :command.whiteboard/connector "Connettore"
  :command.whiteboard/ellipse "Ellisse"
  :command.whiteboard/eraser "Gomma"
@@ -401,11 +401,11 @@
  :command.whiteboard/rectangle "Rettangolo"
  :command.whiteboard/reset-zoom "Reimposta zoom"
  :command.whiteboard/select "Seleziona zoom"
- :command.whiteboard/send-backward "Sposta indietro"
- :command.whiteboard/send-to-back "Sposta in retro"
+ :command.whiteboard/send-backward "Porta indietro"
+ :command.whiteboard/send-to-back "Porta in secondo piano"
  :command.whiteboard/text "Testo"
  :command.whiteboard/toggle-grid "Attiva/disattiva griglia"
- :command.whiteboard/ungroup "Dissocia selezione"
+ :command.whiteboard/ungroup "Separa selezione"
  :command.whiteboard/unlock "Sblocca selezione"
  :command.whiteboard/zoom-in "Aumenta zoom"
  :command.whiteboard/zoom-out "Diminuisci zoom"
@@ -698,8 +698,8 @@
  :whiteboard/link-to-any-page-or-block "Collega a qualsiasi pagina o blocco"
  :whiteboard/lock "Blocca"
  :whiteboard/medium "Medio"
- :whiteboard/move-to-back "Sposta sul retro"
- :whiteboard/move-to-front "Sposta sul fronte"
+ :whiteboard/move-to-back "Sposta indietro"
+ :whiteboard/move-to-front "Sposta avanti"
  :whiteboard/new-block "Nuovo blocco:"
  :whiteboard/new-block-no-colon "Nuovo blocco"
  :whiteboard/new-page "Nuova pagina:"
@@ -715,7 +715,7 @@
  :whiteboard/paste "Incolla"
  :whiteboard/paste-as-link "Incolla come link"
  :whiteboard/rectangle "Rettangolo"
- :whiteboard/redo "Rifai"
+ :whiteboard/redo "Ripeti"
  :whiteboard/references "Riferimento"
  :whiteboard/reload "Ricarica"
  :whiteboard/remove-link "Rimuovi link"
@@ -728,7 +728,7 @@
  :whiteboard/shape "Forma"
  :whiteboard/shape-quick-links "Link rapidi a forma"
  :whiteboard/small "Piccolo"
- :whiteboard/snap-to-grid "Aderisci alla griglia"
+ :whiteboard/snap-to-grid "Aggancia alla griglia"
  :whiteboard/start-typing-to-search "Inizia a scrivere per cercare..."
  :whiteboard/stroke-type "Tratto"
  :whiteboard/text "Testo"
@@ -736,8 +736,8 @@
  :whiteboard/toggle-pen-mode "Attiva/disattiva modalità penna"
  :whiteboard/triangle "Triangolo"
  :whiteboard/twitter-url "Indirizzo Twitter"
- :whiteboard/undo "Rifare"
- :whiteboard/ungroup "Annulla raggruppamento"
+ :whiteboard/undo "Annulla"
+ :whiteboard/ungroup "Separa selezione"
  :whiteboard/unlock "Blocca"
  :whiteboard/website-url "Link sito internet"
  :whiteboard/youtube-url "Link YouTube"
@@ -748,4 +748,20 @@
  :window/exit-fullscreen "Esci da schermo intero"
  :window/maximize "Massimizza"
  :window/minimize "Minimizza"
- :window/restore "Ripristina"}
+ :window/restore "Ripristina"
+ :command.editor/toggle-block-children "Espandi/Comprimi"
+ :command.ui/accent-color-reset "Reimposta colore principale"
+ :command.ui/accent-colors-picker "Seleziona colore principale"
+ :command.whiteboard/clone-down "Clona sotto"
+ :command.whiteboard/clone-left "Clona a sinistra"
+ :command.whiteboard/clone-right "Clona a destra"
+ :command.whiteboard/clone-up "Clone sopra"
+ :linked-references/filter-directions "Click per includere e Shift-Click per escludere. Clicca di nuovo per rimuovere."
+ :linked-references/filter-excludes "Esclude: "
+ :linked-references/filter-heading "Filtro"
+ :linked-references/filter-includes "Include: "
+ :linked-references/reference-count (fn [filtered-count total] (str (when filtered-count (str filtered-count " di ")) total (if (= total 1) " Riferimento Collegato" " Riferimenti Collegati")))
+ :linked-references/unexpected-error "Riferimenti Collegati: Errore inatteso. Per favore, re-indicizza prima il grafo."
+ :settings-page/git-commit-on-close "Esegui commit Git alla chiusura della finestra"
+ :unlinked-references/reference-count (fn [total] (str total (if (= total 1) " Riferimento Scollegato" " Riferimenti Scollegati")))
+ :whiteboard/reference-count (fn [refs-count] (if (= refs-count 1) "Riferimento" "Riferimenti"))}