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 2023-03-29 11:09:56 +08:00
commit 8b4bd896a0
14 changed files with 1185 additions and 3106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitattributes vendored
View file

@ -1 +1 @@
app/stage/protyle/** linguist-vendored
app/stage/protyle/** linguist-vendored

2
.gitignore vendored
View file

@ -34,6 +34,6 @@ yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
# package
# NPM Package
package-lock.json
yarn.lock

12
.gitmodules vendored
View file

@ -1,12 +0,0 @@
[submodule "app/appearance"]
path = app/appearance
url = git@github.com:siyuan-note/appearance.git
[submodule "app/guide/20210808180117-czj9bvb"]
path = app/guide/20210808180117-czj9bvb
url = git@github.com:siyuan-note/user-guide-zh_CN.git
[submodule "app/guide/20210808180117-6v0mkxr"]
path = app/guide/20210808180117-6v0mkxr
url = git@github.com:siyuan-note/user-guide-en_US.git
[submodule "app/guide/20211226090932-5lcq56f"]
path = app/guide/20211226090932-5lcq56f
url = git@github.com:siyuan-note/user-guide-zh_CHT.git

6
API.md
View file

@ -842,7 +842,7 @@ View API token in <kbd>Settings - About</kbd>, request header: `Authorization: T
"template": "/daily note/{{now | date \"2006/01\"}}/{{now | date \"2006-01-02\"}}"
}
```
* `template`: template content
* `template`: template content
* Return value
```json
@ -898,7 +898,7 @@ View API token in <kbd>Settings - About</kbd>, request header: `Authorization: T
"path": "/data/20210808180117-6v0mkxr/20200923234011-ieuun1p.sy"
}
```
* `path`: the file path under the workspace path
* `path`: the file path under the workspace path
* Return value
```json
@ -919,7 +919,7 @@ View API token in <kbd>Settings - About</kbd>, request header: `Authorization: T
"path": "/data/20210808180117-6v0mkxr/20200923234011-ieuun1p.sy"
}
```
* `path`: the file path under the workspace path
* `path`: the file path under the workspace path
* Return value
```json

6
API_zh_CN.md
View file

@ -835,7 +835,7 @@
"template": "/daily note/{{now | date \"2006/01\"}}/{{now | date \"2006-01-02\"}}"
}
```
* `template`：模板内容
* `template`：模板内容
* 返回值
```json
@ -892,7 +892,7 @@
"path": "/data/20210808180117-6v0mkxr/20200923234011-ieuun1p.sy"
}
```
* `path`：工作空间路径下的文件路径
* `path`：工作空间路径下的文件路径
* 返回值
```json
@ -913,7 +913,7 @@
"path": "/data/20210808180117-6v0mkxr/20200923234011-ieuun1p.sy"
}
```
* `path`：工作空间路径下的文件路径
* `path`：工作空间路径下的文件路径
* 返回值
```json

2
Dockerfile
View file

@ -29,4 +29,4 @@ ENV RUN_IN_CONTAINER=true
EXPOSE 6806
USER siyuan
ENTRYPOINT [ "/opt/siyuan/kernel" ]
ENTRYPOINT ["/opt/siyuan/kernel"]

1
README.md
View file

@ -292,6 +292,7 @@ SiYuan is made possible by the following open source projects.
* [https://github.com/gin-contrib/gzip](https://github.com/gin-contrib/gzip) `MIT License`
* [https://github.com/gin-contrib/sessions](https://github.com/gin-contrib/sessions) `MIT License`
* [https://github.com/gin-gonic/gin](https://github.com/gin-gonic/gin) `MIT License`
* [https://github.com/go-ole/go-ole](https://github.com/go-ole/go-ole) `MIT License`
* [https://github.com/imroc/req](https://github.com/imroc/req) `MIT License`
* [https://github.com/jinzhu/copier](https://github.com/jinzhu/copier) `MIT License`
* [https://github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3) `MIT License`

1
README_zh_CN.md
View file

@ -303,6 +303,7 @@
* [https://github.com/gin-contrib/gzip](https://github.com/gin-contrib/gzip) `MIT License`
* [https://github.com/gin-contrib/sessions](https://github.com/gin-contrib/sessions) `MIT License`
* [https://github.com/gin-gonic/gin](https://github.com/gin-gonic/gin) `MIT License`
* [https://github.com/go-ole/go-ole](https://github.com/go-ole/go-ole) `MIT License`
* [https://github.com/imroc/req](https://github.com/imroc/req) `MIT License`
* [https://github.com/jinzhu/copier](https://github.com/jinzhu/copier) `MIT License`
* [https://github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3) `MIT License`

1403
app/guide/20210808180117-6v0mkxr/20201121224345-rc27qvo.sy
View file

File diff suppressed because it is too large Load diff

1423
app/guide/20210808180117-czj9bvb/20201121212605-9td1a62.sy
View file

File diff suppressed because it is too large Load diff

1423
app/guide/20211226090932-5lcq56f/20211226114929-08ap1r0.sy
View file

File diff suppressed because it is too large Load diff

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -6,7 +6,7 @@ require (
github.com/88250/clipboard v0.1.5
github.com/88250/css v0.1.2
github.com/88250/gulu v1.2.3-0.20230321113152-38c4a3d73c37
github.com/88250/lute v1.7.6-0.20230320134658-c722b84ce5e7
github.com/88250/lute v1.7.6-0.20230329015356-3dd609f50804
github.com/88250/pdfcpu v0.3.14-0.20230224021324-e51076eb6390
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20230220142845-f237b6348b3e

6
kernel/go.sum
View file

@ -8,8 +8,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXS
github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20230321113152-38c4a3d73c37 h1:7ZMvlXDbH2sqaxowoAFcLjcdRN7ncVE0U1S2ukpUgac=
github.com/88250/gulu v1.2.3-0.20230321113152-38c4a3d73c37/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k=
github.com/88250/lute v1.7.6-0.20230320134658-c722b84ce5e7 h1:op+n/IE+LpxJaAfRk6l4ZnXgJQKDKEDz5EBaARCDU/w=
github.com/88250/lute v1.7.6-0.20230320134658-c722b84ce5e7/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
github.com/88250/lute v1.7.6-0.20230329015356-3dd609f50804 h1:3O2GnGwbRWFjaP7ZYt38SfLvFYm6ET8+zBT4fuVNW7c=
github.com/88250/lute v1.7.6-0.20230329015356-3dd609f50804/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
github.com/88250/pdfcpu v0.3.14-0.20230224021324-e51076eb6390 h1:q2AR33VoQ87WYtvZ4pEvwj5gZkv22HK/yMlPWwF1oyc=
github.com/88250/pdfcpu v0.3.14-0.20230224021324-e51076eb6390/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=
@ -287,8 +287,6 @@ github.com/siyuan-note/filelock v0.0.0-20230321113304-79a32917cc9f h1:zHixRabadw
github.com/siyuan-note/filelock v0.0.0-20230321113304-79a32917cc9f/go.mod h1:UMyz+Vj2tN8we7JRIPnFm0+lGvjTBWfbnhV5SbSJuBE=
github.com/siyuan-note/httpclient v0.0.0-20230309131049-f703795de6bc h1:MX2cPWpn7Hfd3FmpwLjGdPIjF84AFUS9f/mcPJc/4w4=
github.com/siyuan-note/httpclient v0.0.0-20230309131049-f703795de6bc/go.mod h1:WDO42mUVRnkk8M4AhZ4oakZ5jnghulP0c8NFCrrFWG4=
github.com/siyuan-note/logging v0.0.0-20230327034340-a7bed1fff2fe h1:QmBB+8HVbjxXzVUdAiysYaClEAaREcxeZt6kvHcrFUc=
github.com/siyuan-note/logging v0.0.0-20230327034340-a7bed1fff2fe/go.mod h1:6mRFtAAvYPn3cDzqvyv+t8BVPGqpONDMMb5ywOhY1D4=
github.com/siyuan-note/logging v0.0.0-20230327073243-ebe83aec1493 h1:oaN5b0WDFkjdBgGxmmBnMrtZxaJ76LZLwhQSZnznJMI=
github.com/siyuan-note/logging v0.0.0-20230327073243-ebe83aec1493/go.mod h1:6mRFtAAvYPn3cDzqvyv+t8BVPGqpONDMMb5ywOhY1D4=
github.com/siyuan-note/riff v0.0.0-20230224144841-cfbe0748ddb7 h1:Kr8hhMhr6v+U24TMDCP5WdP4dWrXm5maar+TycTZs9I=