From 801781a107925091140603859d034f4bdb051b4c Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 5 Feb 2024 21:14:33 +0800 Subject: [PATCH 1/2] :memo: Update changelogs --- app/changelogs/v2.12.7/v2.12.7.md | 1 + app/changelogs/v2.12.7/v2.12.7_zh_CHT.md | 1 + app/changelogs/v2.12.7/v2.12.7_zh_CN.md | 1 + 3 files changed, 3 insertions(+) diff --git a/app/changelogs/v2.12.7/v2.12.7.md b/app/changelogs/v2.12.7/v2.12.7.md index 730838beb..6a08304db 100644 --- a/app/changelogs/v2.12.7/v2.12.7.md +++ b/app/changelogs/v2.12.7/v2.12.7.md @@ -17,6 +17,7 @@ Below are the detailed changes in this version. * [Adjust custom emoticon size after using font size](https://github.com/siyuan-note/siyuan/issues/10286) * [Start new version installation on force exit](https://github.com/siyuan-note/siyuan/issues/10288) * [The dock floating position is not hard-coded](https://github.com/siyuan-note/siyuan/issues/10295) +* [Display flashcard style after exiting focus](https://github.com/siyuan-note/siyuan/issues/10296) * [Improve Marketplace - Downloaded scroll interaction](https://github.com/siyuan-note/siyuan/issues/10297) * [Improve ignore indexing](https://github.com/siyuan-note/siyuan/issues/10299) * [When `New document save location` is configured as `/`, it will be completed as `/Untitled`](https://github.com/siyuan-note/siyuan/issues/10305) diff --git a/app/changelogs/v2.12.7/v2.12.7_zh_CHT.md b/app/changelogs/v2.12.7/v2.12.7_zh_CHT.md index df480d5bc..3c41be507 100644 --- a/app/changelogs/v2.12.7/v2.12.7_zh_CHT.md +++ b/app/changelogs/v2.12.7/v2.12.7_zh_CHT.md @@ -17,6 +17,7 @@ * [調整字體大小後調整自訂表情大小](https://github.com/siyuan-note/siyuan/issues/10286) * [強制退出後啟動新版本安裝](https://github.com/siyuan-note/siyuan/issues/10288) * [停靠列浮動觸發位置動態計算](https://github.com/siyuan-note/siyuan/issues/10295) +* [退出對焦後顯示閃卡樣式](https://github.com/siyuan-note/siyuan/issues/10296) * [改進 市集 - 已下載 滾動互動](https://github.com/siyuan-note/siyuan/issues/10297) * [改進忽略索引](https://github.com/siyuan-note/siyuan/issues/10299) * [當 `新建文件存放位置` 配置為 `/` 時將其重設為 `/Untitled`](https://github.com/siyuan-note/siyuan/issues/10305) diff --git a/app/changelogs/v2.12.7/v2.12.7_zh_CN.md b/app/changelogs/v2.12.7/v2.12.7_zh_CN.md index b33ed3198..1f41bb26d 100644 --- a/app/changelogs/v2.12.7/v2.12.7_zh_CN.md +++ b/app/changelogs/v2.12.7/v2.12.7_zh_CN.md @@ -17,6 +17,7 @@ * [调整字体大小后调整自定义表情大小](https://github.com/siyuan-note/siyuan/issues/10286) * [强制退出后启动新版本安装](https://github.com/siyuan-note/siyuan/issues/10288) * [停靠栏浮动触发位置动态计算](https://github.com/siyuan-note/siyuan/issues/10295) +* [退出聚焦后显示闪卡样式](https://github.com/siyuan-note/siyuan/issues/10296) * [改进 集市 - 已下载 滚动交互](https://github.com/siyuan-note/siyuan/issues/10297) * [改进忽略索引](https://github.com/siyuan-note/siyuan/issues/10299) * [当 `新建文档存放位置` 配置为 `/` 时将其重置为 `/Untitled`](https://github.com/siyuan-note/siyuan/issues/10305) From fbe40a1ae4eda70b620518cedf4a6c3837af3ec4 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 5 Feb 2024 21:26:42 +0800 Subject: [PATCH 2/2] :arrow_up: Upgrade kernel deps --- kernel/go.mod | 6 +++--- kernel/go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index 12336c4b4..d7a394064 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -50,7 +50,7 @@ require ( github.com/rqlite/sql v0.0.0-20240102050638-e741e9f54197 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/sashabaranov/go-openai v1.19.2 - github.com/shirou/gopsutil/v3 v3.23.12 + github.com/shirou/gopsutil/v3 v3.24.1 github.com/siyuan-note/dejavu v0.0.0-20240128091346-6b5103db7026 github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4 github.com/siyuan-note/eventbus v0.0.0-20240124091459-8e1b37a55255 @@ -80,7 +80,7 @@ require ( github.com/andybalholm/brotli v1.1.0 // indirect github.com/andybalholm/cascadia v1.3.2 // indirect github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef // indirect - github.com/aws/aws-sdk-go v1.50.7 // indirect + github.com/aws/aws-sdk-go v1.50.10 // indirect github.com/bytedance/sonic v1.10.2 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect @@ -116,7 +116,7 @@ require ( github.com/juju/errors v1.0.0 // indirect github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect - github.com/leodido/go-urn v1.3.0 // indirect + github.com/leodido/go-urn v1.4.0 // indirect github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5 // indirect github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect github.com/mattn/go-isatty v0.0.20 // indirect diff --git a/kernel/go.sum b/kernel/go.sum index 1988b617c..909743613 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -49,8 +49,8 @@ github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhP github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw= github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef h1:2JGTg6JapxP9/R33ZaagQtAM4EkkSYnIAlOG5EI8gkM= github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef/go.mod h1:JS7hed4L1fj0hXcyEejnW57/7LCetXggd+vwrRnYeII= -github.com/aws/aws-sdk-go v1.50.7 h1:odKb+uneeGgF2jgAerKjFzpljiyZxleV4SHB7oBK+YA= -github.com/aws/aws-sdk-go v1.50.7/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.50.10 h1:H3NQvqRUKG+9oysCKTIyylpkqfPA7MiBtzTnu/cIGqE= +github.com/aws/aws-sdk-go v1.50.10/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= @@ -241,8 +241,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -github.com/leodido/go-urn v1.3.0 h1:jX8FDLfW4ThVXctBNZ+3cIWnCSnrACDV73r76dy0aQQ= -github.com/leodido/go-urn v1.3.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5 h1:W7p+m/AECTL3s/YR5RpQ4hz5SjNeKzZBl1q36ws12s0= github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5/go.mod h1:QMe2wuKJ0o7zIVE8AqiT8rd8epmm6WDIZ2wyuBqYPzM= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= @@ -340,8 +340,8 @@ github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+e github.com/sashabaranov/go-openai v1.19.2 h1:+dkuCADSnwXV02YVJkdphY8XD9AyHLUWwk6V7LB6EL8= github.com/sashabaranov/go-openai v1.19.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg= -github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4= -github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= +github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= +github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=