Merge branch 'master' into feat/db

pull/11055/head
Gabriel Horner 2024-03-21 12:13:01 -04:00
commit 073ae34730
9 changed files with 16 additions and 13 deletions

View File

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

View File

@ -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.7;
MARKETING_VERSION = 0.10.8;
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.7;
MARKETING_VERSION = 0.10.8;
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.7;
MARKETING_VERSION = 0.10.8;
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.7;
MARKETING_VERSION = 0.10.8;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController;
PRODUCT_NAME = "$(TARGET_NAME)";

View File

@ -4113,9 +4113,9 @@ find-up@^4.1.0:
path-exists "^4.0.0"
follow-redirects@^1.14.8:
version "1.15.4"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
version "1.15.6"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
fs-extra@^10.0.0:
version "10.1.0"

View File

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

View File

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

View File

@ -415,7 +415,7 @@
(when (and (not (.contains (.-classList target) "extensions__pdf-hls-area-region"))
(.closest target ".page"))
(and e (or (.-metaKey e)
(and util/win32? (.-shiftKey e))
(.-shiftKey e)
@*area-mode?)))))
reset-coords! #(do

View File

@ -50,6 +50,7 @@
(set! js/window.onerror
(fn [message, _source, _lineno, _colno, error]
(when-not (error/ignored? message)
(js/console.error message)
(log/error :exception error))))))
(defn- watch-for-date!

View File

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

View File

@ -335,6 +335,8 @@
(clj->js {:keys ["name"]
:shouldSort true
:tokenize true
:distance 1024
:threshold 0.5 ;; search for 50% match from the start
:minMatchCharLength 1}))]
(swap! indices assoc-in [repo :pages] indice)
indice))