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-08-02 12:02:48 +08:00
commit b7cfbf7791
4 changed files with 318 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
app/guide/20210808180117-6v0mkxr/.siyuan/sort.json
View file

@ -1,56 +1 @@
{
"20200923234011-ieuun1p": 1,
"20200923234602-gy54e67": 6,
"20200923234731-h3zkwm2": 2,
"20200924093441-ft2rhps": 1,
"20200924095938-a9p5450": 2,
"20200924100110-vcg96wy": 1,
"20200924100635-ms0p9lb": 6,
"20200924100717-yzwzn64": 20,
"20200924100744-br924ar": 9,
"20200924100808-j9sddk9": 2,
"20200924100906-0u4zfq3": 4,
"20200924100950-9op5xi1": 17,
"20200924101106-19z4kaa": 1,
"20200924101200-gss5vee": 4,
"20200924101225-k254i8g": 2,
"20200924101256-f8b1sbi": 3,
"20201004194026-s8h2cog": 18,
"20201117112518-dott91x": 6,
"20201121224345-rc27qvo": 7,
"20201204184532-3qm9l8n": 10,
"20201210233038-3xr19g5": 5,
"20201222100222-q47d64s": 2,
"20201222100339-i5hzcph": 1,
"20201227201128-m1wrouw": 19,
"20201227201751-gv0fpx2": 21,
"20210110181011-fbhoesf": 5,
"20210117215840-jcl17fx": 3,
"20210127203829-qe2mzof": 11,
"20210331201142-4g923es": 13,
"20210505164949-c085p1d": 3,
"20210613191509-cbkxcbz": 7,
"20210615213222-vs5tzbd": 14,
"20210721112159-9p645xm": 1,
"20210721112206-mhr9wxi": 2,
"20210721160238-yvhbh0h": 4,
"20210808180303-6yi0dv5": 1,
"20210808180303-axh6q1d": 4,
"20210808180303-h361q1i": 2,
"20210808180303-l3qg72k": 3,
"20210808180303-v9awwp0": 6,
"20210808180303-xaduj2o": 5,
"20210824202056-udkf7wg": 7,
"20211010212318-3wx2kqb": 12,
"20220105101227-n5zpr1a": 5,
"20220628204454-hhxohv5": 2,
"20220708103401-mgydrfg": 3,
"20221016204105-qx2aq0g": 3,
"20221223221636-ms2b4w9": 15,
"20230104152135-1iei0xa": 22,
"20230106104821-9nfphwm": 1,
"20230304000547-ibldj1z": 16,
"20230405172236-pg3l9eu": 5,
"20230429115711-ejbts4s": 4,
"20230506205948-yah52eb": 8
}
{"20200923234011-ieuun1p":1,"20200923234602-gy54e67":6,"20200923234731-h3zkwm2":2,"20200924093441-ft2rhps":1,"20200924095938-a9p5450":2,"20200924100110-vcg96wy":1,"20200924100635-ms0p9lb":6,"20200924100717-yzwzn64":20,"20200924100744-br924ar":9,"20200924100808-j9sddk9":2,"20200924100906-0u4zfq3":4,"20200924100950-9op5xi1":17,"20200924101106-19z4kaa":1,"20200924101200-gss5vee":4,"20200924101225-k254i8g":2,"20200924101256-f8b1sbi":3,"20201004194026-s8h2cog":18,"20201117112518-dott91x":6,"20201121224345-rc27qvo":7,"20201204184532-3qm9l8n":10,"20201210233038-3xr19g5":5,"20201222100222-q47d64s":2,"20201222100339-i5hzcph":1,"20201227201128-m1wrouw":19,"20201227201751-gv0fpx2":21,"20210110181011-fbhoesf":5,"20210117215840-jcl17fx":3,"20210127203829-qe2mzof":11,"20210331201142-4g923es":13,"20210505164949-c085p1d":3,"20210613191509-cbkxcbz":7,"20210615213222-vs5tzbd":14,"20210721112159-9p645xm":1,"20210721112206-mhr9wxi":2,"20210721160238-yvhbh0h":5,"20210808180303-6yi0dv5":1,"20210808180303-axh6q1d":4,"20210808180303-h361q1i":2,"20210808180303-l3qg72k":3,"20210808180303-v9awwp0":6,"20210808180303-xaduj2o":5,"20210824202056-udkf7wg":7,"20211010212318-3wx2kqb":12,"20220105101227-n5zpr1a":6,"20220628204454-hhxohv5":2,"20220708103401-mgydrfg":3,"20221016204105-qx2aq0g":3,"20221223221636-ms2b4w9":15,"20230104152135-1iei0xa":22,"20230106104821-9nfphwm":1,"20230304000547-ibldj1z":16,"20230405172236-pg3l9eu":5,"20230429115711-ejbts4s":4,"20230506205948-yah52eb":8,"20230802114825-2jkkct7":4}

302
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20230802114825-2jkkct7.sy Normal file
View file

@ -0,0 +1,302 @@
{
"ID": "20230802114825-2jkkct7",
"Spec": "1",
"Type": "NodeDocument",
"Properties": {
"id": "20230802114825-2jkkct7",
"title": "Inbox",
"updated": "20230802115024"
},
"Children": [
{
"ID": "20230802114900-1zcvrjv",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20230802114900-1zcvrjv",
"updated": "20230802115327"
},
"Children": [
{
"Type": "NodeText",
"Data": "Overview"
}
]
},
{
"ID": "20230802114900-tff1e21",
"Type": "NodeParagraph",
"Properties": {
"id": "20230802114900-tff1e21",
"updated": "20230802115024"
},
"Children": [
{
"Type": "NodeText",
"Data": "We can collect external data through the cloud inbox, and then obtain these data from the cloud through the inbox panel in SiYuan and send them to the notebook for further sorting."
}
]
},
{
"ID": "20230802115337-7ehbupv",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20230802115337-7ehbupv",
"updated": "20230802115337"
},
"Children": [
{
"Type": "NodeText",
"Data": "How to use"
}
]
},
{
"ID": "20230802114928-gcmnpw5",
"Type": "NodeParagraph",
"Properties": {
"id": "20230802114928-gcmnpw5",
"updated": "20230802115037"
},
"Children": [
{
"Type": "NodeText",
"Data": "Currently, the following methods are provided for data access."
}
]
},
{
"ID": "20230802114913-l5bxvst",
"Type": "NodeHeading",
"HeadingLevel": 3,
"Properties": {
"id": "20230802114913-l5bxvst",
"updated": "20230802114914"
},
"Children": [
{
"Type": "NodeText",
"Data": "API"
}
]
},
{
"ID": "20230802114940-rxa544n",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20230802114940-rxa544n",
"updated": "20230802114940"
},
"Children": [
{
"ID": "20230802114940-o6vf7yb",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230802114940-o6vf7yb",
"updated": "20230802114940"
},
"Children": [
{
"ID": "20230802114940-5ig0gfm",
"Type": "NodeParagraph",
"Properties": {
"id": "20230802114940-5ig0gfm",
"updated": "20230802115054"
},
"Children": [
{
"Type": "NodeText",
"Data": "POST "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "https://liuyun.io/apis/siyuan/inbox/addCloudShorthand"
},
{
"Type": "NodeText",
"Data": "​"
}
]
}
]
},
{
"ID": "20230802114940-shylzs1",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230802114940-shylzs1",
"updated": "20230802114940"
},
"Children": [
{
"ID": "20230802114940-jsg0fq5",
"Type": "NodeParagraph",
"Properties": {
"id": "20230802114940-jsg0fq5",
"updated": "20230802114940"
},
"Children": [
{
"Type": "NodeText",
"Data": "Body"
}
]
},
{
"ID": "20230802114940-vnx4oi9",
"Type": "NodeCodeBlock",
"IsFencedCodeBlock": true,
"Properties": {
"id": "20230802114940-vnx4oi9",
"updated": "20230802114940"
},
"Children": [
{
"Type": "NodeCodeBlockFenceOpenMarker",
"Data": "```"
},
{
"Type": "NodeCodeBlockFenceInfoMarker",
"CodeBlockInfo": "anNvbg=="
},
{
"Type": "NodeCodeBlockCode",
"Data": "{\n \"title\": \"A simple text title\",\n \"content\": \"Content with **Markdown**.\"\n}\n"
},
{
"Type": "NodeCodeBlockFenceCloseMarker",
"Data": "```"
}
]
}
]
},
{
"ID": "20230802114940-z2139xt",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230802114940-z2139xt",
"updated": "20230802114940"
},
"Children": [
{
"ID": "20230802114940-r5paolz",
"Type": "NodeParagraph",
"Properties": {
"id": "20230802114940-r5paolz",
"updated": "20230802115200"
},
"Children": [
{
"Type": "NodeText",
"Data": "The authentication method is the HTTP request header "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "Authorization"
},
{
"Type": "NodeText",
"Data": "​, the value is "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "token {Your API Token}"
},
{
"Type": "NodeText",
"Data": "​ (note case and spaces), API Token can be found at "
},
{
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://liuyun.io/settings/account",
"TextMarkTextContent": "LiuYun - Settings - Account"
}
]
}
]
}
]
},
{
"ID": "20230802115301-5syqyra",
"Type": "NodeParagraph",
"Properties": {
"id": "20230802115301-5syqyra",
"updated": "20230802115307"
},
"Children": [
{
"Type": "NodeText",
"Data": "​"
},
{
"Type": "NodeTextMark",
"TextMarkType": "tag",
"TextMarkTextContent": "Note"
},
{
"Type": "NodeText",
"Data": "​:"
}
]
},
{
"ID": "20230802115301-qo09t8m",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20230802115301-qo09t8m",
"updated": "20230802115314"
},
"Children": [
{
"ID": "20230802115301-ebyp74j",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230802115301-ebyp74j",
"updated": "20230802115314"
},
"Children": [
{
"ID": "20230802115301-ola9hu3",
"Type": "NodeParagraph",
"Properties": {
"id": "20230802115301-ola9hu3",
"updated": "20230802115314"
},
"Children": [
{
"Type": "NodeText",
"Data": "Frequency limit: Up to 128 inserts per 24 hours"
}
]
}
]
}
]
}
]
}

15
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20220414110705-tu2un99.sy
View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20220414110705-tu2un99",
"title": "收集箱",
"updated": "20221022010553"
"updated": "20230802115243"
},
"Children": [
{
@ -557,12 +557,21 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220419193546-kq7dd5i",
"updated": "20220419193549"
"updated": "20230802115243"
},
"Children": [
{
"Type": "NodeText",
"Data": "请注意："
"Data": "​"
},
{
"Type": "NodeTextMark",
"TextMarkType": "tag",
"TextMarkTextContent": "注意"
},
{
"Type": "NodeText",
"Data": "​："
}
]
},

3
app/nsis/installer.nsh
View file

@ -37,6 +37,9 @@ Caption "${PRODUCT_NAME} ${VERSION}"
/SD IDNO IDYES AcceptedRMWorkspace IDNO SkippedRMWrokspace
AcceptedRMWorkspace:
RMDir /r "$PROFILE\SiYuan\"
RMDir /r "$PROFILE\Desktop\conf\"
RMDir /r "$PROFILE\Desktop\data\"
RMDir /r "$PROFILE\Desktop\temp\"
SkippedRMWrokspace:
${EndIf}
!macroend