From 8de40a7cfa30b57c5732fed5619ebe8dfec6631c Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 7 Oct 2022 20:34:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:memo:=20=E6=89=93=E5=BC=80=E5=9D=97?= =?UTF-8?q?=E5=BC=95=E5=BF=AB=E6=8D=B7=E9=94=AE=E5=8F=98=E6=9B=B4=E4=B8=BA?= =?UTF-8?q?=20`Alt+,`=20/=20`=E2=8C=A5,`=20https://github.com/siyuan-note/?= =?UTF-8?q?siyuan/issues/6077?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20210808180303-xaduj2o/20200924100950-9op5xi1.sy | 12 ++++++------ .../20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy | 8 ++++---- .../20211226121203-rjjngpz/20211226122549-jktxego.sy | 12 ++++++++---- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy index 95f90693a..5d01fc20d 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy @@ -7,7 +7,7 @@ "id": "20200924100950-9op5xi1", "title": "Shortcuts", "type": "doc", - "updated": "20220904093759" + "updated": "20221007203302" }, "Children": [ { @@ -1655,7 +1655,7 @@ "Properties": { "colgroup": "||", "id": "20210106154319-yozlufs", - "updated": "20220904093759" + "updated": "20221007203302" }, "Children": [ { @@ -4033,7 +4033,7 @@ { "Type": "NodeTextMark", "TextMarkType": "kbd", - "TextMarkTextContent": "Ctrl+." + "TextMarkTextContent": "Atl+," }, { "Type": "NodeText", @@ -4042,7 +4042,7 @@ { "Type": "NodeTextMark", "TextMarkType": "kbd", - "TextMarkTextContent": "⌘." + "TextMarkTextContent": "⌥," } ] }, @@ -4079,7 +4079,7 @@ { "Type": "NodeTextMark", "TextMarkType": "kbd", - "TextMarkTextContent": "Ctrl+Shift+\u003e" + "TextMarkTextContent": "Ctrl+Shift+\u0026gt;" }, { "Type": "NodeText", @@ -4088,7 +4088,7 @@ { "Type": "NodeTextMark", "TextMarkType": "kbd", - "TextMarkTextContent": "⇧⌘\u003e" + "TextMarkTextContent": "⇧⌘\u0026gt;" } ] }, diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy index 1c3a2df47..8e564b1cc 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy @@ -7,7 +7,7 @@ "id": "20200813004551-gm0pbn1", "title": "快捷键", "type": "doc", - "updated": "20221006214105" + "updated": "20221007202446" }, "Children": [ { @@ -1657,7 +1657,7 @@ "Properties": { "colgroup": "||", "id": "20201227133317-vopotjc", - "updated": "20220916195306" + "updated": "20221007202446" }, "Children": [ { @@ -4083,7 +4083,7 @@ { "Type": "NodeTextMark", "TextMarkType": "kbd", - "TextMarkTextContent": "Ctrl+." + "TextMarkTextContent": "Atl+," }, { "Type": "NodeText", @@ -4092,7 +4092,7 @@ { "Type": "NodeTextMark", "TextMarkType": "kbd", - "TextMarkTextContent": "⌘." + "TextMarkTextContent": "⌥," } ] }, diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy index f7f9d257c..c4ee32d19 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy @@ -6,7 +6,7 @@ "icon": "2328", "id": "20211226122549-jktxego", "title": "快捷鍵", - "updated": "20220916195834" + "updated": "20221007202526" }, "Children": [ { @@ -1645,7 +1645,7 @@ "Properties": { "colgroup": "||", "id": "20211226122652-pb50zx4", - "updated": "20220916195834" + "updated": "20221007202526" }, "Children": [ { @@ -4083,7 +4083,7 @@ { "Type": "NodeTextMark", "TextMarkType": "kbd", - "TextMarkTextContent": "Ctrl+." + "TextMarkTextContent": "Atl+," }, { "Type": "NodeText", @@ -4092,7 +4092,11 @@ { "Type": "NodeTextMark", "TextMarkType": "kbd", - "TextMarkTextContent": "⌘." + "TextMarkTextContent": "⌥," + }, + { + "Type": "NodeBr", + "Data": "br" } ] }, From ef840667ccfdc528478d9c6cd87b2fe032ff2795 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 7 Oct 2022 20:42:54 +0800 Subject: [PATCH 2/2] :bookmark: Release v2.3.0 --- .github/workflows/dockerimage.yml | 2 +- CHANGELOG.md | 64 +++++++++++++++++++++++++++++++ app/appx/AppxManifest.xml | 2 +- app/package.json | 2 +- kernel/util/working.go | 4 +- 5 files changed, 69 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index d5130b43b..cb4d3a0e6 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -33,4 +33,4 @@ jobs: - name: Build the Docker image run: | - docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.2.3 . \ No newline at end of file + docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.3.0 . \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e9ad1bf2..b991155fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,67 @@ +## v2.3.0 / 2022-10-07 + +### 引入特性 + +* [移动端支持编辑工具栏](https://github.com/siyuan-note/siyuan/issues/2621) +* [编辑器式反链面板](https://github.com/siyuan-note/siyuan/issues/3565) + +### 改进功能 + +* [块引用与所引用的内容块进行交换](https://github.com/siyuan-note/siyuan/issues/4981) +* [浏览器剪藏扩展迁移到 Manifest V3](https://github.com/siyuan-note/siyuan/issues/6008) +* [移除文件锁](https://github.com/siyuan-note/siyuan/issues/6010) +* [生成重复/冲突文档时移除 `scroll` 浏览位置属性](https://github.com/siyuan-note/siyuan/issues/6016) +* [Windows 端支持 `AppsKey` 按键 打开右键菜单](https://github.com/siyuan-note/siyuan/issues/6017) +* [上传云端标记快照（云端备份）数据量较大时超时](https://github.com/siyuan-note/siyuan/issues/6019) +* [支持按文档大小排序](https://github.com/siyuan-note/siyuan/issues/6029) +* [支持按子文档数排序](https://github.com/siyuan-note/siyuan/issues/6030) +* [复制引用中的一部分粘贴后应为静态锚文本](https://github.com/siyuan-note/siyuan/issues/6031) +* [文档树面板 `定位打开的文档` 显示在中间](https://github.com/siyuan-note/siyuan/issues/6033) +* [PDF 搜索换行隔断文本](https://github.com/siyuan-note/siyuan/issues/6034) +* [编辑时状态栏实时统计文档信息](https://github.com/siyuan-note/siyuan/issues/6036) +* [文档信息统计增加超链接数、图片数、引用数和大小](https://github.com/siyuan-note/siyuan/issues/6037) +* [块操作 API 支持使用 `` 和 `` 插入对应行级元素](https://github.com/siyuan-note/siyuan/issues/6039) +* [桌面端重启以后保证窗口最小大小](https://github.com/siyuan-note/siyuan/issues/6041) +* [大纲面板定位时显示在中间](https://github.com/siyuan-note/siyuan/issues/6042) +* [桌面端托盘加入选项 `重启时重置窗口`](https://github.com/siyuan-note/siyuan/issues/6043) +* [块标拖拽按住 `Alt` 为引用，按住 `Shift` 为嵌入](https://github.com/siyuan-note/siyuan/issues/6048) +* [从外部复制富文本时加粗、斜体等排版元素不再自动添加空格](https://github.com/siyuan-note/siyuan/issues/6051) +* [从外部复制富文本时不产生多余换行](https://github.com/siyuan-note/siyuan/issues/6052) +* [`F3` 没有选中也可以新建子文档](https://github.com/siyuan-note/siyuan/issues/6053) +* [从外部复制富文本时超链接嵌套加粗、斜体等元素解析改进](https://github.com/siyuan-note/siyuan/issues/6055) +* [通过浏览器使用时剪切再粘贴会导致光标定位到文档开头](https://github.com/siyuan-note/siyuan/issues/6060) +* [移动端行级元素编辑跳出](https://github.com/siyuan-note/siyuan/issues/6069) +* [浏览器端无法读取路径，不支持 `Alt` 拖拽](https://github.com/siyuan-note/siyuan/issues/6073) +* [移动端键盘弹起后光标定位居中](https://github.com/siyuan-note/siyuan/issues/6074) +* [打开块引快捷键变更为 `Alt+,` / `⌥,`](https://github.com/siyuan-note/siyuan/issues/6077) + +### 开发重构 + +* [将 `windowControls` 的样式移至 base.css 中](https://github.com/siyuan-note/siyuan/pull/6027) +* [升级 pdf.js](https://github.com/siyuan-note/siyuan/issues/6035) +* [升级 Electron](https://github.com/siyuan-note/siyuan/issues/6040) +* [升级 mermaid](https://github.com/siyuan-note/siyuan/issues/6057) + +### 修复缺陷 + +* [浏览器剪藏扩展对于某些页面滚动到底部以后没有响应](https://github.com/siyuan-note/siyuan/issues/6003) +* [无法定位到后退内容为动态加载的块](https://github.com/siyuan-note/siyuan/issues/6004) +* [行内末尾 `Ctrl+M` 会匹配前一个数学公式](https://github.com/siyuan-note/siyuan/issues/6007) +* [添加字体风格会把行级公式删掉](https://github.com/siyuan-note/siyuan/issues/6009) +* [Windows 端安装包数字签名问题](https://github.com/siyuan-note/siyuan/issues/6011) +* [引用块合并后锚文本重复](https://github.com/siyuan-note/siyuan/issues/6014) +* [自定义表情后无法进行回车](https://github.com/siyuan-note/siyuan/issues/6018) +* [使用 `Enter` 创建双链位置异常](https://github.com/siyuan-note/siyuan/issues/6020) +* [动态锚文本剪切修改后没有变为静态锚文本](https://github.com/siyuan-note/siyuan/issues/6025) +* [在空白段落块/标题块中无法使用快捷键 `Ctrl+M` 插入行级公式](https://github.com/siyuan-note/siyuan/issues/6026) +* [选中两个公式后 `Ctrl+M` 导致公式异常](https://github.com/siyuan-note/siyuan/issues/6028) +* [引用命名块时动态锚文本没有使用命名](https://github.com/siyuan-note/siyuan/issues/6032) +* [粘贴引用后转义消失](https://github.com/siyuan-note/siyuan/issues/6054) +* [文档标题为空时顶部栏没有显示](https://github.com/siyuan-note/siyuan/issues/6058) +* [`Ctrl+M` 行级公式后输入标点符号重复](https://github.com/siyuan-note/siyuan/issues/6065) +* [解析 Markdown 围栏代码块 `~~~` 异常](https://github.com/siyuan-note/siyuan/issues/6067) +* [行级文本标记解析异常](https://github.com/siyuan-note/siyuan/issues/6070) + ## v2.2.3 / 2022-09-28 ### 改进功能 diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml index 54d567334..8c1bfe108 100644 --- a/app/appx/AppxManifest.xml +++ b/app/appx/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.3.0.0"/> SiYuan 云南链滴科技有限公司 diff --git a/app/package.json b/app/package.json index 2f2ffadbd..be2e6a04a 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "SiYuan", - "version": "2.3.0-alpha3", + "version": "2.3.0", "description": "Build Your Eternal Digital Garden", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", diff --git a/kernel/util/working.go b/kernel/util/working.go index 6a4bee0c7..12e64c933 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -41,8 +41,8 @@ import ( var Mode = "prod" const ( - Ver = "2.3.0-alpha3" - IsInsider = true + Ver = "2.3.0" + IsInsider = false ) var (