Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Vanessa219 committed Oct 9, 2023
2 parents a3094fe + 3827753 commit 1eccb8b
Show file tree
Hide file tree
Showing 7 changed files with 179 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Install pnpm: `npm install -g pnpm`

Set the Electron mirror environment variable and install Electron:

* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@26.3.0 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.9.0 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@26.3.0 -D`
* `pnpm install electron@25.9.0 -D`

NPM mirror:

Expand All @@ -30,7 +30,7 @@ NPM mirror:

On the desktop, go to the app folder to run:

* `pnpm install electron@26.3.0 -D`
* `pnpm install electron@25.9.0 -D`
* `pnpm run dev`
* `pnpm run start`

Expand Down
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

* macOS/Linux:
```
ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@26.3.0 -D
ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.9.0 -D
```
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@26.3.0 -D`
* `pnpm install electron@25.9.0 -D`

NPM 镜像:

Expand All @@ -32,7 +32,7 @@ NPM 镜像:

桌面端进入 app 文件夹运行:

* `pnpm install electron@26.3.0 -D`
* `pnpm install electron@25.9.0 -D`
* `pnpm run dev`
* `pnpm run start`

Expand Down
55 changes: 55 additions & 0 deletions app/changelogs/v2.10.9/v2.10.9.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
## Overview

This version fixes some bugs, and it is recommended to upgrade.

Advertisement: Currently, `PRO Features` are in the early bird price stage, welcome to [learn more](https://b3log.org/siyuan/en/pricing.html).

Note: The annual `Subscription` includes `Pro features`. If you are an annual subscriber, you do not need to buy PRO Features separately.

## Changelogs

Below are the detailed changes in this version.

### Enhancement

* [Support heading blocks to make flashcards](https://github.com/siyuan-note/siyuan/issues/9005)
* [Remove outline, backlink and graph from floating window document menu](https://github.com/siyuan-note/siyuan/issues/9341)
* [Perform indexing in the background when moving a large number of documents](https://github.com/siyuan-note/siyuan/issues/9356)
* [Improve some UI details](https://github.com/siyuan-note/siyuan/issues/9359)
* [Improve bookmark panel rendering](https://github.com/siyuan-note/siyuan/issues/9361)
* [Improve block-level copying](https://github.com/siyuan-note/siyuan/issues/9362)
* [Block ref anchor text no longer contains contents of inline-level memos](https://github.com/siyuan-note/siyuan/issues/9363)
* [Document-level new card/review card limit control](https://github.com/siyuan-note/siyuan/issues/9365)
* [Only one-time payment (PRO) is not showing its status](https://github.com/siyuan-note/siyuan/issues/9367)
* [Export related flashcard data when exporting .sy.zip](https://github.com/siyuan-note/siyuan/issues/9372)
* [The Microsoft Store version no longer supports settings automatic launch at boot](https://github.com/siyuan-note/siyuan/issues/9373)
* [Show notebooks in hpath of block ref search list results](https://github.com/siyuan-note/siyuan/issues/9378)
* [Replace non-breaking spaces with normal spaces when copying](https://github.com/siyuan-note/siyuan/issues/9382)

### Bugfix

* [The line number of the code block that does not wrap is misplaced](https://github.com/siyuan-note/siyuan/issues/9337)
* [New window fails to load some PDFs](https://github.com/siyuan-note/siyuan/issues/9343)
* [The access authorization code setting item is not displayed on the mobile APP](https://github.com/siyuan-note/siyuan/issues/9346)
* [Unable to start on some Linux desktop distributions](https://github.com/siyuan-note/siyuan/issues/9347)
* [List item multi-select cutting issue](https://github.com/siyuan-note/siyuan/issues/9349)
* [Unable to enter custom emoji in table](https://github.com/siyuan-note/siyuan/issues/9358)
* [Cannot paste in inline-level code](https://github.com/siyuan-note/siyuan/issues/9369)
* [Custom emotions in inline-level elements are lost when editing](https://github.com/siyuan-note/siyuan/issues/9370)
* [Unable to cancel network proxy settings](https://github.com/siyuan-note/siyuan/issues/9374)
* [LiuYun data center sigin captcha does not display](https://github.com/siyuan-note/siyuan/issues/9375)

### Refactor

* [Refactor kernel model transaction](https://github.com/siyuan-note/siyuan/issues/9338)
* [Upgrade Electron](https://github.com/siyuan-note/siyuan/issues/9342)
* [Use ipcRenderer to replace @electron/remote](https://github.com/siyuan-note/siyuan/issues/9368)

### Development

* [Improve some database details](https://github.com/siyuan-note/siyuan/issues/9274)
* [Database column icon](https://github.com/siyuan-note/siyuan/issues/9304)
* [Supports searching database blocks by the view title](https://github.com/siyuan-note/siyuan/issues/9348)
* [Add plugin event bus `open-menu-doctree`](https://github.com/siyuan-note/siyuan/issues/9351)
* [Database template column supports `created` and `updated` built-in variables](https://github.com/siyuan-note/siyuan/issues/9364)
* [Add created and updated type column to database](https://github.com/siyuan-note/siyuan/issues/9371)
55 changes: 55 additions & 0 deletions app/changelogs/v2.10.9/v2.10.9_zh_CHT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
## 概述

此版本修復了一些缺陷,建議升級。

廣告: 目前 `功能特性` 正處於早鳥價階段,歡迎[了解](https://b3log.org/siyuan/pricing.html)

註:`年付訂閱` 包含 `功能特性`,如果你是訂閱會員,則無需單獨購買功能特性。

## 變更記錄

以下是此版本中的詳細變更。

### 改進功能

* [支援標題區塊製作閃卡](https://github.com/siyuan-note/siyuan/issues/9005)
* [移除浮窗中文件選單大綱、反鍊與關係圖選單項目](https://github.com/siyuan-note/siyuan/issues/9341)
* [移動大陸文件時在背景執行索引](https://github.com/siyuan-note/siyuan/issues/9356)
* [改進一些介面細節](https://github.com/siyuan-note/siyuan/issues/9359)
* [改進書籤面板渲染](https://github.com/siyuan-note/siyuan/issues/9361)
* [改進區塊級複製](https://github.com/siyuan-note/siyuan/issues/9362)
* [區塊引錨文本不再包含行級備註內容](https://github.com/siyuan-note/siyuan/issues/9363)
* [支援設定文件等級新卡/複習卡上限](https://github.com/siyuan-note/siyuan/issues/9365)
* [僅開放功能特性的帳號顯示其開啟狀態](https://github.com/siyuan-note/siyuan/issues/9367)
* [文件匯出 .sy.zip 時關聯匯出相關閃卡](https://github.com/siyuan-note/siyuan/issues/9372)
* [微軟商店版不再顯示開機自動啟動設定項目](https://github.com/siyuan-note/siyuan/issues/9373)
* [區塊引搜尋結果清單中顯示筆記本路徑](https://github.com/siyuan-note/siyuan/issues/9378)
* [複製時替換不間斷空格為普通空格](https://github.com/siyuan-note/siyuan/issues/9382)

### 修復缺陷

* [程式碼區塊行號錯位](https://github.com/siyuan-note/siyuan/issues/9337)
* [在新視窗載入某些 PDF 失敗](https://github.com/siyuan-note/siyuan/issues/9343)
* [行動端 APP 不顯示存取授權碼設定項目](https://github.com/siyuan-note/siyuan/issues/9346)
* [在部分 Linux 桌面發行版上無法啟動](https://github.com/siyuan-note/siyuan/issues/9347)
* [多重選擇清單項目剪切異常](https://github.com/siyuan-note/siyuan/issues/9349)
* [無法在表格中輸入自訂表情](https://github.com/siyuan-note/siyuan/issues/9358)
* [無法在行級程式碼中貼上](https://github.com/siyuan-note/siyuan/issues/9369)
* [行級元素中的自訂表情輸入後遺失](https://github.com/siyuan-note/siyuan/issues/9370)
* [無法取消網路代理設定](https://github.com/siyuan-note/siyuan/issues/9374)
* [流雲資料中心帳號登入驗證碼無法顯示](https://github.com/siyuan-note/siyuan/issues/9375)

### 開發重構

* [重建內核模型層事務機制](https://github.com/siyuan-note/siyuan/issues/9338)
* [升級 Electron](https://github.com/siyuan-note/siyuan/issues/9342)
* [使用 ipcRenderer 取代 @electron/remote](https://github.com/siyuan-note/siyuan/issues/9368)

### 開發者

* [改進一些資料庫細節](https://github.com/siyuan-note/siyuan/issues/9274)
* [資料庫列圖示](https://github.com/siyuan-note/siyuan/issues/9304)
* [支援透過視圖標題搜尋資料庫區塊](https://github.com/siyuan-note/siyuan/issues/9348)
* [新增外掛事件匯流排 `open-menu-doctree`](https://github.com/siyuan-note/siyuan/issues/9351)
* [資料庫範本列支援 `created``updated` 內建變數](https://github.com/siyuan-note/siyuan/issues/9364)
* [資料庫支援建立時間和更新時間列](https://github.com/siyuan-note/siyuan/issues/9371)
55 changes: 55 additions & 0 deletions app/changelogs/v2.10.9/v2.10.9_zh_CN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
## 概述

该版本修复了一些缺陷,建议升级。

广告: 目前 `功能特性` 正处于早鸟价阶段,欢迎[了解](https://b3log.org/siyuan/pricing.html)

注:`年付订阅` 包含 `功能特性`,如果你是订阅会员,则无需单独购买功能特性。

## 变更记录

以下是此版本中的详细变更。

### 改进功能

* [支持标题块制作闪卡](https://github.com/siyuan-note/siyuan/issues/9005)
* [移除浮窗中文档菜单大纲、反链和关系图菜单项](https://github.com/siyuan-note/siyuan/issues/9341)
* [移动大陆文档时在后台执行索引](https://github.com/siyuan-note/siyuan/issues/9356)
* [改进一些界面细节](https://github.com/siyuan-note/siyuan/issues/9359)
* [改进书签面板渲染](https://github.com/siyuan-note/siyuan/issues/9361)
* [改进块级复制](https://github.com/siyuan-note/siyuan/issues/9362)
* [块引锚文本不再包含行级备注内容](https://github.com/siyuan-note/siyuan/issues/9363)
* [支持设置文档级新卡/复习卡上限](https://github.com/siyuan-note/siyuan/issues/9365)
* [仅开通功能特性的账号显示其开通状态](https://github.com/siyuan-note/siyuan/issues/9367)
* [文档导出 .sy.zip 时关联导出相关闪卡](https://github.com/siyuan-note/siyuan/issues/9372)
* [微软商店版不再显示开机自动启动配置项](https://github.com/siyuan-note/siyuan/issues/9373)
* [块引搜索结果列表中显示笔记本路径](https://github.com/siyuan-note/siyuan/issues/9378)
* [复制时替换不间断空格为普通空格](https://github.com/siyuan-note/siyuan/issues/9382)

### 修复缺陷

* [代码块行号错位](https://github.com/siyuan-note/siyuan/issues/9337)
* [在新窗口加载某些 PDF 失败](https://github.com/siyuan-note/siyuan/issues/9343)
* [移动端 APP 不显示访问授权码设置项](https://github.com/siyuan-note/siyuan/issues/9346)
* [在部分 Linux 桌面发行版上无法启动](https://github.com/siyuan-note/siyuan/issues/9347)
* [多选列表项剪切异常](https://github.com/siyuan-note/siyuan/issues/9349)
* [无法在表格中输入自定义表情](https://github.com/siyuan-note/siyuan/issues/9358)
* [无法在行级代码中粘贴](https://github.com/siyuan-note/siyuan/issues/9369)
* [行级元素中的自定义表情输入后丢失](https://github.com/siyuan-note/siyuan/issues/9370)
* [无法取消网络代理设置](https://github.com/siyuan-note/siyuan/issues/9374)
* [流云数据中心账号登录验证码无法显示](https://github.com/siyuan-note/siyuan/issues/9375)

### 开发重构

* [重构内核模型层事务机制](https://github.com/siyuan-note/siyuan/issues/9338)
* [升级 Electron](https://github.com/siyuan-note/siyuan/issues/9342)
* [使用 ipcRenderer 替代 @electron/remote](https://github.com/siyuan-note/siyuan/issues/9368)

### 开发者

* [改进一些数据库细节](https://github.com/siyuan-note/siyuan/issues/9274)
* [数据库列图标](https://github.com/siyuan-note/siyuan/issues/9304)
* [支持通过视图标题搜索数据库块](https://github.com/siyuan-note/siyuan/issues/9348)
* [添加插件事件总线 `open-menu-doctree`](https://github.com/siyuan-note/siyuan/issues/9351)
* [数据库模板列支持 `created``updated` 内置变量](https://github.com/siyuan-note/siyuan/issues/9364)
* [数据库支持创建时间和更新时间列](https://github.com/siyuan-note/siyuan/issues/9371)
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"clean-webpack-plugin": "^4.0.0",
"css-loader": "^6.7.1",
"dayjs": "^1.11.5",
"electron": "26.3.0",
"electron": "25.9.0",
"electron-builder": "^24.6.3",
"encoding": "^0.1.13",
"esbuild-loader": "^3.0.1",
Expand Down
14 changes: 7 additions & 7 deletions app/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1eccb8b

Please sign in to comment.