mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-15 16:41:07 +08:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
d29d66f1ab
@ -8,7 +8,7 @@
|
|||||||
"title": "Please Start Here",
|
"title": "Please Start Here",
|
||||||
"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
|
"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
|
||||||
"type": "doc",
|
"type": "doc",
|
||||||
"updated": "20230728103732"
|
"updated": "20230816170602"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -83,7 +83,7 @@
|
|||||||
"Type": "NodeSuperBlock",
|
"Type": "NodeSuperBlock",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210528120135-bznvpp6",
|
"id": "20210528120135-bznvpp6",
|
||||||
"updated": "20230728103732"
|
"updated": "20230816170602"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -259,7 +259,7 @@
|
|||||||
"Type": "NodeSuperBlock",
|
"Type": "NodeSuperBlock",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210528120140-1cfmrhm",
|
"id": "20210528120140-1cfmrhm",
|
||||||
"updated": "20211223213241"
|
"updated": "20230816170602"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -290,7 +290,7 @@
|
|||||||
"ListData": {},
|
"ListData": {},
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20201225220954-kjfoqak",
|
"id": "20201225220954-kjfoqak",
|
||||||
"updated": "20211223213241"
|
"updated": "20230816170602"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -333,7 +333,7 @@
|
|||||||
},
|
},
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210528120207-5wey3qg",
|
"id": "20210528120207-5wey3qg",
|
||||||
"updated": "20210528120213"
|
"updated": "20230816170602"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -341,14 +341,18 @@
|
|||||||
"Type": "NodeParagraph",
|
"Type": "NodeParagraph",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210528120207-0u97bon",
|
"id": "20210528120207-0u97bon",
|
||||||
"updated": "20210528120213"
|
"updated": "20230816170602"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
"Type": "NodeTextMark",
|
"Type": "NodeTextMark",
|
||||||
"TextMarkType": "a",
|
"TextMarkType": "a",
|
||||||
"TextMarkAHref": "https://github.com/orgs/siyuan-note/projects/1",
|
"TextMarkAHref": "https://ld246.com/article/1619868273581",
|
||||||
"TextMarkTextContent": "Roadmap"
|
"TextMarkTextContent": "Origin"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Type": "NodeText",
|
||||||
|
"Data": " (in Chinese)"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -371,7 +375,7 @@
|
|||||||
"Type": "NodeSuperBlock",
|
"Type": "NodeSuperBlock",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210528120236-zyh2t7d",
|
"id": "20210528120236-zyh2t7d",
|
||||||
"updated": "20230621112336"
|
"updated": "20230816170456"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -493,7 +497,7 @@
|
|||||||
"Type": "NodeSuperBlock",
|
"Type": "NodeSuperBlock",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210528120308-9wuiyyz",
|
"id": "20210528120308-9wuiyyz",
|
||||||
"updated": "20230418085821"
|
"updated": "20230816170456"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -524,7 +528,7 @@
|
|||||||
"ListData": {},
|
"ListData": {},
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210317214434-nx9mt0d",
|
"id": "20210317214434-nx9mt0d",
|
||||||
"updated": "20230418085821"
|
"updated": "20230816170456"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -567,7 +571,7 @@
|
|||||||
},
|
},
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20221114173201-njmd9n7",
|
"id": "20221114173201-njmd9n7",
|
||||||
"updated": "20230418085821"
|
"updated": "20230816170456"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -575,14 +579,14 @@
|
|||||||
"Type": "NodeParagraph",
|
"Type": "NodeParagraph",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20221114173201-7ilqkuo",
|
"id": "20221114173201-7ilqkuo",
|
||||||
"updated": "20230418085821"
|
"updated": "20230816170456"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
"Type": "NodeTextMark",
|
"Type": "NodeTextMark",
|
||||||
"TextMarkType": "a",
|
"TextMarkType": "a",
|
||||||
"TextMarkAHref": "https://github.com/siyuan-note/bazaar",
|
"TextMarkAHref": "https://b3log.org/siyuan/en/pricing.html",
|
||||||
"TextMarkTextContent": "Community marketplace"
|
"TextMarkTextContent": "Pay to support development"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
"title": "请从这里开始",
|
"title": "请从这里开始",
|
||||||
"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
|
"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
|
||||||
"type": "doc",
|
"type": "doc",
|
||||||
"updated": "20230728103645"
|
"updated": "20230816170413"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -83,7 +83,7 @@
|
|||||||
"Type": "NodeSuperBlock",
|
"Type": "NodeSuperBlock",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210528115012-vst5lwt",
|
"id": "20210528115012-vst5lwt",
|
||||||
"updated": "20230728103645"
|
"updated": "20210501192542"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -251,7 +251,7 @@
|
|||||||
"Type": "NodeSuperBlock",
|
"Type": "NodeSuperBlock",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210528115016-kgyy5mm",
|
"id": "20210528115016-kgyy5mm",
|
||||||
"updated": "20210528115049"
|
"updated": "20210501192542"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -282,7 +282,7 @@
|
|||||||
"ListData": {},
|
"ListData": {},
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20201225220955-5tzog8p",
|
"id": "20201225220955-5tzog8p",
|
||||||
"updated": "20210528115049"
|
"updated": "20210501192542"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -324,7 +324,8 @@
|
|||||||
"Marker": "Kg=="
|
"Marker": "Kg=="
|
||||||
},
|
},
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20201225220955-uxl2u8n"
|
"id": "20201225220955-uxl2u8n",
|
||||||
|
"updated": "20210501192542"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -344,36 +345,6 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"ID": "20210528115047-mf8zy3i",
|
|
||||||
"Type": "NodeListItem",
|
|
||||||
"ListData": {
|
|
||||||
"BulletChar": 42,
|
|
||||||
"Marker": "Kg=="
|
|
||||||
},
|
|
||||||
"Properties": {
|
|
||||||
"id": "20210528115047-mf8zy3i",
|
|
||||||
"updated": "20210528115049"
|
|
||||||
},
|
|
||||||
"Children": [
|
|
||||||
{
|
|
||||||
"ID": "20210528115047-78736rc",
|
|
||||||
"Type": "NodeParagraph",
|
|
||||||
"Properties": {
|
|
||||||
"id": "20210528115047-78736rc",
|
|
||||||
"updated": "20210528115049"
|
|
||||||
},
|
|
||||||
"Children": [
|
|
||||||
{
|
|
||||||
"Type": "NodeTextMark",
|
|
||||||
"TextMarkType": "a",
|
|
||||||
"TextMarkAHref": "https://github.com/orgs/siyuan-note/projects/1",
|
|
||||||
"TextMarkTextContent": "路线图"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@ -392,7 +363,7 @@
|
|||||||
"Type": "NodeSuperBlock",
|
"Type": "NodeSuperBlock",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210528115259-ifi35e9",
|
"id": "20210528115259-ifi35e9",
|
||||||
"updated": "20210601234211"
|
"updated": "20230816170413"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -514,7 +485,7 @@
|
|||||||
"Type": "NodeSuperBlock",
|
"Type": "NodeSuperBlock",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210528115302-oa09t9p",
|
"id": "20210528115302-oa09t9p",
|
||||||
"updated": "20221114173007"
|
"updated": "20230816170413"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -545,7 +516,7 @@
|
|||||||
"ListData": {},
|
"ListData": {},
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20210131160231-t1cr21p",
|
"id": "20210131160231-t1cr21p",
|
||||||
"updated": "20221114173007"
|
"updated": "20230816170413"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -580,30 +551,30 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ID": "20221114172803-v3e5sfh",
|
"ID": "20230816170212-hv7dtb0",
|
||||||
"Type": "NodeListItem",
|
"Type": "NodeListItem",
|
||||||
"ListData": {
|
"ListData": {
|
||||||
"BulletChar": 42,
|
"BulletChar": 42,
|
||||||
"Marker": "Kg=="
|
"Marker": "Kg=="
|
||||||
},
|
},
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20221114172803-v3e5sfh",
|
"id": "20230816170212-hv7dtb0",
|
||||||
"updated": "20221114173007"
|
"updated": "20230816170413"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
"ID": "20221114172803-vqryeav",
|
"ID": "20230816170212-3leiyax",
|
||||||
"Type": "NodeParagraph",
|
"Type": "NodeParagraph",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20221114172803-vqryeav",
|
"id": "20230816170212-3leiyax",
|
||||||
"updated": "20221114173007"
|
"updated": "20230816170413"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
"Type": "NodeTextMark",
|
"Type": "NodeTextMark",
|
||||||
"TextMarkType": "a",
|
"TextMarkType": "a",
|
||||||
"TextMarkAHref": "https://github.com/siyuan-note/bazaar",
|
"TextMarkAHref": "https://b3log.org/siyuan/pricing.html",
|
||||||
"TextMarkTextContent": "社区集市"
|
"TextMarkTextContent": "付费支持开发"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
"id": "20211226115423-d5z1joq",
|
"id": "20211226115423-d5z1joq",
|
||||||
"title": "請從這裡開始",
|
"title": "請從這裡開始",
|
||||||
"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
|
"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
|
||||||
"updated": "20230808220623"
|
"updated": "20230816170515"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -82,7 +82,7 @@
|
|||||||
"Type": "NodeSuperBlock",
|
"Type": "NodeSuperBlock",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20211226115745-rorv31l",
|
"id": "20211226115745-rorv31l",
|
||||||
"updated": "20230728103709"
|
"updated": "20211226115745"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -332,7 +332,7 @@
|
|||||||
},
|
},
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20211226115745-z2p8vju",
|
"id": "20211226115745-z2p8vju",
|
||||||
"updated": "20211225212623"
|
"updated": "20211226115745"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -352,36 +352,6 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"ID": "20211226115745-x2tcgwg",
|
|
||||||
"Type": "NodeListItem",
|
|
||||||
"ListData": {
|
|
||||||
"BulletChar": 42,
|
|
||||||
"Marker": "Kg=="
|
|
||||||
},
|
|
||||||
"Properties": {
|
|
||||||
"id": "20211226115745-x2tcgwg",
|
|
||||||
"updated": "20211226115745"
|
|
||||||
},
|
|
||||||
"Children": [
|
|
||||||
{
|
|
||||||
"ID": "20211226115745-4xvotrv",
|
|
||||||
"Type": "NodeParagraph",
|
|
||||||
"Properties": {
|
|
||||||
"id": "20211226115745-4xvotrv",
|
|
||||||
"updated": "20211225212644"
|
|
||||||
},
|
|
||||||
"Children": [
|
|
||||||
{
|
|
||||||
"Type": "NodeTextMark",
|
|
||||||
"TextMarkType": "a",
|
|
||||||
"TextMarkAHref": "https://github.com/orgs/siyuan-note/projects/1",
|
|
||||||
"TextMarkTextContent": "路線圖"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@ -400,7 +370,7 @@
|
|||||||
"Type": "NodeSuperBlock",
|
"Type": "NodeSuperBlock",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20211226115745-1yev4ow",
|
"id": "20211226115745-1yev4ow",
|
||||||
"updated": "20211226115745"
|
"updated": "20230816170515"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -522,7 +492,7 @@
|
|||||||
"Type": "NodeSuperBlock",
|
"Type": "NodeSuperBlock",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20211226115745-gllrx2n",
|
"id": "20211226115745-gllrx2n",
|
||||||
"updated": "20221114173758"
|
"updated": "20230816170515"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -553,7 +523,7 @@
|
|||||||
"ListData": {},
|
"ListData": {},
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20211226115745-rx1tyat",
|
"id": "20211226115745-rx1tyat",
|
||||||
"updated": "20221114173758"
|
"updated": "20230816170515"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -596,7 +566,7 @@
|
|||||||
},
|
},
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20221114173649-jg9t3nk",
|
"id": "20221114173649-jg9t3nk",
|
||||||
"updated": "20221114173707"
|
"updated": "20230816170515"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@ -604,14 +574,14 @@
|
|||||||
"Type": "NodeParagraph",
|
"Type": "NodeParagraph",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"id": "20221114173649-umu8m0b",
|
"id": "20221114173649-umu8m0b",
|
||||||
"updated": "20221114173707"
|
"updated": "20230816170515"
|
||||||
},
|
},
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
"Type": "NodeTextMark",
|
"Type": "NodeTextMark",
|
||||||
"TextMarkType": "a",
|
"TextMarkType": "a",
|
||||||
"TextMarkAHref": "https://github.com/siyuan-note/bazaar",
|
"TextMarkAHref": "https://b3log.org/siyuan/pricing.html",
|
||||||
"TextMarkTextContent": "社區集市"
|
"TextMarkTextContent": "付费支持开发"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user