Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-11 15:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-10-07 20:56:34 +08:00
commit be8102d9a9
8 changed files with 87 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/appx/AppxManifest.xml
View file

@ -9,7 +9,7 @@
<Identity Name="89C2A984.SiYuan"
ProcessorArchitecture="x64"
Publisher='CN=087C656E-C1D9-42D8-8807-CED45A74FC0F'
Version="2.2.3.0"/>
Version="2.3.0.0"/>
<Properties>
<DisplayName>SiYuan</DisplayName>
<PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

12
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy
View file

@ -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;"
}
]
},

8
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy
View file

@ -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": "⌥,"
}
]
},

12
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy
View file

@ -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"
}
]
},

2
app/package.json
View file

@ -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",