Merge branch 'master' into feat/db

README.md

@@ -152,7 +152,7 @@ Logseq is also made possible by the following projects:
 * [Clojure & ClojureScript](https://clojure.org/) - A dynamic, functional, general-purpose programming language
 * [DataScript](https://github.com/tonsky/datascript) - An immutable database and Datalog query-engine for Clojure,
 ClojureScript and JS
-* [OCaml](https://ocaml.org/) & [Angstrom](https://github.com/inhabitedtype/angstrom), for the document parser [maldoc](https://github.com/mldoc/mldoc)
+* [OCaml](https://ocaml.org/) & [Angstrom](https://github.com/inhabitedtype/angstrom), for the document parser [mldoc](https://github.com/logseq/mldoc)
 * [isomorphic-git](https://isomorphic-git.org/) - A pure JavaScript implementation of Git for NodeJS and web browsers
 * [SCI](https://github.com/borkdude/sci) - A Small Clojure Interpreter
 

src/main/frontend/components/container.cljs

@@ -97,9 +97,10 @@
                                  {:on-click #(page-handler/<unfavorite-page! original-name)}
                                  (ctx-icon "star-off")
                                  (t :page/unfavorite)
-                                 (x-menu-shortcut (some-> (shortcut-dh/shortcut-binding :command/toggle-favorite) (first)
-                                                               (shortcut-utils/decorate-binding)))))
-
+                                 (x-menu-shortcut (when-let [binding (shortcut-dh/shortcut-binding :command/toggle-favorite)]
+                                                    (some-> binding
+                                                            (first)
+                                                            (shortcut-utils/decorate-binding))))))
                              (when-let [page-fpath (and (util/electron?) file-rpath
                                                      (config/get-repo-fpath (state/get-current-repo) file-rpath))]
                                [:<>