0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-09-09 10:34:22 +08:00
commit cc52aff0cb
5 changed files with 1082 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -189,6 +189,16 @@ SiYuan is completely open source, and contributions are welcome:
For more details, please refer to [Development Guide](https://github.com/siyuan-note/siyuan/blob/master/.github/CONTRIBUTING.md).
### How to upgrade to a new version?
* If installed via app store, please update via app store
* If it is installed through the installation package on the desktop, you can open the option of <kbd>Settings</kbd> - <kbd>About</kbd> - <kbd>Automatically download update installation package</kbd>, so that SiYuan will automatically download The latest version of the installation package and prompts to install
* If it is installed by manual installation package, please download the installation package again to install
You can <kbd>Check update</kbd> in <kbd>Settings</kbd> - <kbd>About</kbd> - <kbd>Current Version</kbd>, or by following [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) or [SiYuan Announcement](https://ld246.com/tag/siyuan-announcement) to get the new version.
**Note**: Do not place the workspace in the installation directory, because the updated version will clear all files in the installation directory
### Is there any note for deleting docs?
After deletion, the doc will not appear in the operating system's recycle bin, but will be deleted directly. When deleted, SiYuan will generate edit history.

10
README_zh_CN.md
View file

@ -197,6 +197,16 @@
更多细节请参考[开发指南](https://github.com/siyuan-note/siyuan/blob/master/.github/CONTRIBUTING_zh_CN.md)。
### 如何升级到新版本？
* 如果是通过应用商店安装的，请通过应用商店更新
* 如果是桌面端通过安装包安装的，可打开 <kbd>设置</kbd> - <kbd>关于</kbd> - <kbd>自动下载更新安装包</kbd> 选项，这样思源会自动下载最新版安装包并提示安装
* 如果是通过手动安装包安装的，请再次下载安装包安装
可在 <kbd>设置</kbd> - <kbd>关于</kbd> - <kbd>当前版本</kbd> 中 <kbd>检查更新</kbd>，也可以通过关注 [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) 或者[思源笔记公告](https://ld246.com/tag/siyuan-announcement)来获取新版本。
**注意**：切勿将工作空间放置于安装目录下，因为更新版本会清空安装目录下的所有文件
### 删除文档有什么注意事项吗？
文档被删除后不会出现在操作系统回收站中，而是直接删除，删除时思源会生成编辑历史。

356
app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy
View file

@ -6,7 +6,7 @@
"id": "20200923234731-h3zkwm2",
"title": "FAQ",
"type": "doc",
"updated": "20220820000523"
"updated": "20220909101124"
},
"Children": [
{
@ -1143,6 +1143,360 @@
}
]
},
{
"ID": "20220909100946-x94gyft",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20220909100946-x94gyft",
"updated": "20220909100946"
},
"Children": [
{
"Type": "NodeText",
"Data": "How to upgrade to a new version?"
}
]
},
{
"ID": "20220909100946-nieof3y",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20220909100946-nieof3y",
"updated": "20220909101032"
},
"Children": [
{
"ID": "20220909100946-zpelmha",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220909100946-zpelmha",
"updated": "20220909100946"
},
"Children": [
{
"ID": "20220909100946-8qnhzi2",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100946-8qnhzi2",
"updated": "20220909100946"
},
"Children": [
{
"Type": "NodeText",
"Data": "If installed via app store, please update via app store"
}
]
}
]
},
{
"ID": "20220909100946-ej9yi4j",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220909100946-ej9yi4j",
"updated": "20220909101032"
},
"Children": [
{
"ID": "20220909100946-n3d5619",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100946-n3d5619",
"updated": "20220909101032"
},
"Children": [
{
"Type": "NodeText",
"Data": "If it is installed through the installation package on the desktop, you can open the option of "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "Settings"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "About"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "Automatically download update installation package"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": ", so that SiYuan will automatically download The latest version of the installation package and prompts to install"
}
]
}
]
},
{
"ID": "20220909100946-kw38sog",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220909100946-kw38sog",
"updated": "20220909100946"
},
"Children": [
{
"ID": "20220909100946-3n9cy34",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100946-3n9cy34",
"updated": "20220909100946"
},
"Children": [
{
"Type": "NodeText",
"Data": "If it is installed by manual installation package, please download the installation package again to install"
}
]
}
]
}
]
},
{
"ID": "20220909100946-9eyc3uh",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100946-9eyc3uh",
"updated": "20220909101124"
},
"Children": [
{
"Type": "NodeText",
"Data": "You can "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "Check update"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " in "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "Settings"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "About"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "Current Version"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": ", or by following "
},
{
"Type": "NodeLink",
"Data": "span",
"Children": [
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "GitHub Releases"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "https ://github.com/siyuan-note/siyuan/releases"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": " or "
},
{
"Type": "NodeLink",
"Data": "span",
"Children": [
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "SiYuan Announcement"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "https://ld246.com/tag/siyuan-announcement"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": " to get the new version."
}
]
},
{
"ID": "20220909100946-k0d6ska",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100946-k0d6ska",
"updated": "20220909100946"
},
"Children": [
{
"Type": "NodeTag",
"Data": "span",
"Children": [
{
"Type": "NodeTagOpenMarker"
},
{
"Type": "NodeText",
"Data": "Note"
},
{
"Type": "NodeTagCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": ": Do not place the workspace in the installation directory, because the updated version will clear all files in the installation directory"
}
]
},
{
"ID": "20201224120448-ygu8bzx",
"Type": "NodeHeading",

353
app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy
View file

@ -6,7 +6,7 @@
"id": "20200813093015-u6bopdt",
"title": "常见问题",
"type": "doc",
"updated": "20220820000334"
"updated": "20220909100829"
},
"Children": [
{
@ -1241,6 +1241,357 @@
}
]
},
{
"ID": "20220909095627-1vhq1bl",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20220909095627-1vhq1bl",
"updated": "20220909095639"
},
"Children": [
{
"Type": "NodeText",
"Data": "如何升级到新版本？"
}
]
},
{
"ID": "20220909100235-t30d1wi",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20220909100235-t30d1wi",
"updated": "20220909100253"
},
"Children": [
{
"ID": "20220909100253-15etc5i",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220909100253-15etc5i",
"updated": "20220909100253"
},
"Children": [
{
"ID": "20220909100253-1st45ji",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100253-1st45ji",
"updated": "20220909100437"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果是通过应用商店安装的，请通过应用商店更新"
}
]
}
]
},
{
"ID": "20220909100320-uzt8n3d",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220909100320-uzt8n3d"
},
"Children": [
{
"ID": "20220909100320-2a59jog",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100320-2a59jog",
"updated": "20220909100659"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果是桌面端通过安装包安装的，可打开 "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "设置"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "关于"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "自动下载更新安装包"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 选项，这样思源会自动下载最新版安装包并提示安装"
}
]
}
]
},
{
"ID": "20220909100659-fbfsm0k",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220909100659-fbfsm0k"
},
"Children": [
{
"ID": "20220909100659-bd8dtiv",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100659-bd8dtiv",
"updated": "20220909100741"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果是通过手动安装包安装的，请再次下载安装包安装"
}
]
}
]
}
]
},
{
"ID": "20220909100742-liorixq",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100742-liorixq"
},
"Children": [
{
"Type": "NodeText",
"Data": "可在 "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "设置"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "关于"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "当前版本"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 中 "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "检查更新"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": "，也可以通过关注 "
},
{
"Type": "NodeLink",
"Data": "span",
"Children": [
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "GitHub Releases"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "https://github.com/siyuan-note/siyuan/releases"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": " 或者"
},
{
"Type": "NodeLink",
"Data": "span",
"Children": [
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "思源笔记公告"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "https://ld246.com/tag/siyuan-announcement"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": "来获取新版本。"
}
]
},
{
"ID": "20220909100800-1g0ueym",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100800-1g0ueym",
"updated": "20220909100829"
},
"Children": [
{
"Type": "NodeTag",
"Data": "span",
"Children": [
{
"Type": "NodeTagOpenMarker"
},
{
"Type": "NodeText",
"Data": "注意"
},
{
"Type": "NodeTagCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": "：切勿将工作空间放置于安装目录下，因为更新版本会清空安装目录下的所有文件"
}
]
},
{
"ID": "20201224120447-dscw9gl",
"Type": "NodeHeading",

356
app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy
View file

@ -5,7 +5,7 @@
"icon": "2753",
"id": "20211226115227-r1rty9v",
"title": "常見問題",
"updated": "20220820000508"
"updated": "20220909100912"
},
"Children": [
{
@ -1139,6 +1139,360 @@
}
]
},
{
"ID": "20220909100912-0495w3d",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20220909100912-0495w3d",
"updated": "20220909100912"
},
"Children": [
{
"Type": "NodeText",
"Data": "如何升級到新版本？"
}
]
},
{
"ID": "20220909100912-n6wkkil",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20220909100912-n6wkkil",
"updated": "20220909100912"
},
"Children": [
{
"ID": "20220909100912-1o9qnn7",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220909100912-1o9qnn7",
"updated": "20220909100912"
},
"Children": [
{
"ID": "20220909100912-ctmcg6t",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100912-ctmcg6t",
"updated": "20220909100912"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果是通過應用商店安裝的，請通過應用商店更新"
}
]
}
]
},
{
"ID": "20220909100912-hslsskw",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220909100912-hslsskw",
"updated": "20220909100912"
},
"Children": [
{
"ID": "20220909100912-59zjygn",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100912-59zjygn",
"updated": "20220909100912"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果是桌面端通過安裝包安裝的，可打開 "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "設置"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "關於"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "自動下載更新安裝包"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 選項，這樣思源會自動下載最新版安裝包並提示安裝"
}
]
}
]
},
{
"ID": "20220909100912-245jk59",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220909100912-245jk59",
"updated": "20220909100912"
},
"Children": [
{
"ID": "20220909100912-4n5hoac",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100912-4n5hoac",
"updated": "20220909100912"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果是通過手動安裝包安裝的，請再次下載安裝包安裝"
}
]
}
]
}
]
},
{
"ID": "20220909100912-rvyxrtl",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100912-rvyxrtl",
"updated": "20220909100912"
},
"Children": [
{
"Type": "NodeText",
"Data": "可在 "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "設置"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "關於"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "當前版本"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 中 "
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
},
{
"Type": "NodeText",
"Data": "檢查更新"
},
{
"Type": "NodeKbdCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": "，也可以通過關注 "
},
{
"Type": "NodeLink",
"Data": "span",
"Children": [
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "GitHub Releases"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "https://github.com/siyuan-note/siyuan/releases"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": " 或者"
},
{
"Type": "NodeLink",
"Data": "span",
"Children": [
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "思源筆記公告"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "https://ld246.com/tag/siyuan-announcement"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": "來獲取新版本。"
}
]
},
{
"ID": "20220909100912-ng52828",
"Type": "NodeParagraph",
"Properties": {
"id": "20220909100912-ng52828",
"updated": "20220909100912"
},
"Children": [
{
"Type": "NodeTag",
"Data": "span",
"Children": [
{
"Type": "NodeTagOpenMarker"
},
{
"Type": "NodeText",
"Data": "注意"
},
{
"Type": "NodeTagCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": "：切勿將工作空間放置於安裝目錄下，因為更新版本會清空安裝目錄下的所有文件"
}
]
},
{
"ID": "20211226115356-m9gd7qb",
"Type": "NodeHeading",