-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
# Conflicts: # .github/workflows/dockerimage.yml # README.md # app/package.json # app/src/config/account.ts
- Loading branch information
Showing
130 changed files
with
2,515 additions
and
610 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,21 +16,21 @@ 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 [email protected].3 -D` | ||
| * macOS/Linux: `ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/ pnpm install [email protected].4 -D` | ||
| * Windows: | ||
| * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` | ||
| * `pnpm install [email protected].3 -D` | ||
| * `SET ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/` | ||
| * `pnpm install [email protected].4 -D` | ||
|
|
||
| NPM mirror: | ||
|
|
||
| * Use npmmirror China mirror repository `pnpm --registry https://r.cnpmjs.org/ i` | ||
| * Revert to using official repository `pnpm --registry https://registry.npmjs.org i` | ||
| * Use npmmirror China mirror repository `pnpm --registry https://registry.npmmirror.com/ i` | ||
| * Revert to using official repository `pnpm --registry https://registry.npmmirror.com i` | ||
|
|
||
| </details> | ||
|
|
||
| On the desktop, go to the app folder to run: | ||
|
|
||
| * `pnpm install [email protected].3 -D` | ||
| * `pnpm install [email protected].4 -D` | ||
| * `pnpm run dev` | ||
| * `pnpm run start` | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,21 +18,21 @@ | |
|
|
||
| * macOS/Linux: | ||
| ``` | ||
| ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install [email protected].3 -D | ||
| ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/ pnpm install [email protected].4 -D | ||
| ``` | ||
| * Windows: | ||
| * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` | ||
| * `pnpm install [email protected].3 -D` | ||
| * `SET ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/` | ||
| * `pnpm install [email protected].4 -D` | ||
|
|
||
| NPM 镜像： | ||
|
|
||
| * 使用 npmmirror 中国镜像仓库 `pnpm --registry https://r.cnpmjs.org/ i` | ||
| * 恢复使用官方仓库 `pnpm --registry https://registry.npmjs.org i` | ||
| * 使用 npmmirror 中国镜像仓库 `pnpm --registry https://registry.npmmirror.com/ i` | ||
| * 恢复使用官方仓库 `pnpm --registry https://registry.npmmirror.com i` | ||
| </details> | ||
|
|
||
| 桌面端进入 app 文件夹运行： | ||
|
|
||
| * `pnpm install [email protected].3 -D` | ||
| * `pnpm install [email protected].4 -D` | ||
| * `pnpm run dev` | ||
| * `pnpm run start` | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| ## Overview | ||
|
|
||
| This version improves data sync stability and resolves an issue that caused data loss during data sync on Android 14. | ||
|
|
||
| ## Changelogs | ||
|
|
||
| Below are the detailed changes in this version. | ||
|
|
||
| ### Enhancement | ||
|
|
||
| * [Improve parsing code block pasted from web page](https://github.com/siyuan-note/siyuan/issues/10183) | ||
| * [Setting `Esc` as a hotkey is not allowed](https://github.com/siyuan-note/siyuan/issues/10194) | ||
| * [Use default icon if marketplace package icon does not exist](https://github.com/siyuan-note/siyuan/issues/10199) | ||
| * [Plugins should be reloaded after the data sync](https://github.com/siyuan-note/siyuan/issues/10203) | ||
| * [Adjust maximum width of dialog box on the desktop](https://github.com/siyuan-note/siyuan/issues/10211) | ||
| * [Adjust the position of the indent and outdent button on the mobile](https://github.com/siyuan-note/siyuan/issues/10213) | ||
| * [Improve AI-generated content parsing](https://github.com/siyuan-note/siyuan/issues/10217) | ||
| * [Use ⌃0-9 instead of ⌥0-9 in macOS](https://github.com/siyuan-note/siyuan/issues/10218) | ||
| * [Improve data sync to prevent an old snapshot to overwrite the new one](https://github.com/siyuan-note/siyuan/issues/10229) | ||
| * [Improve search and replace spaces](https://github.com/siyuan-note/siyuan/issues/10231) | ||
|
|
||
| ### Bugfix | ||
|
|
||
| * [Data sync may cause data loss on Android 14](https://github.com/siyuan-note/siyuan/issues/10205) | ||
| * [Repeated escaping in preview area when searching for matching doc blocks](https://github.com/siyuan-note/siyuan/issues/10219) | ||
| * [Remove invalid requests during boot](https://github.com/siyuan-note/siyuan/pull/10227) | ||
| * [Spaced repetition read-only mode is invalid](https://github.com/siyuan-note/siyuan/issues/10230) | ||
|
|
||
| ### Refactor | ||
|
|
||
| * [Simplify retry mechanism to get system version](https://github.com/siyuan-note/siyuan/pull/10198) | ||
| * [Upgrade Electron v28.1.4](https://github.com/siyuan-note/siyuan/issues/10223) | ||
|
|
||
| ### Development | ||
|
|
||
| * [Attribute Panel - Database supports adding key and sorting key](https://github.com/siyuan-note/siyuan/issues/10142) | ||
| * [Improve database table view select filtering](https://github.com/siyuan-note/siyuan/issues/10193) | ||
| * [Unable to update database table view cell under unknown circumstances](https://github.com/siyuan-note/siyuan/issues/10200) | ||
| * [Add some database related internal kernel APIs](https://github.com/siyuan-note/siyuan/issues/10201) | ||
| * [`Delete` at the end of a block should not delete the next block which is a database table view block](https://github.com/siyuan-note/siyuan/issues/10207) | ||
| * [Add or remove the dock plugin should update "window.siyuan.config.uiLayout"](https://github.com/siyuan-note/siyuan/issues/10208) | ||
| * [Set the maximum message size of WebSocket broadcast to 128 MiB](https://github.com/siyuan-note/siyuan/pull/10221) | ||
| * [Improve database table view asset column name display](https://github.com/siyuan-note/siyuan/issues/10225) | ||
|
|
||
| ## Download | ||
|
|
||
| * [B3log](https://b3log.org/siyuan/en/download.html) | ||
| * [GitHub](https://github.com/siyuan-note/siyuan/releases) |
Oops, something went wrong.