Skip to content

Commit afbca60

Browse files
EightDoorEightDoor
committed
Merge remote-tracking branch 'upstream/master'
2 parents 1631320 + 6ef83b4 commit afbca60

File tree

165 files changed

+2151
-1002
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+2151
-1002
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ mkdir /artifacts
2121
mv appearance stage guide changelogs /artifacts/
2222
EORUN
2323

24-
FROM golang:1.24-alpine AS go-build
24+
FROM golang:1.25-alpine AS go-build
2525

2626
RUN <<EORUN
2727
#!/bin/sh -e

‎app/appearance/icons/ant/icon.js‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/appearance/icons/ant/icon.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"name": "ant",
33
"author": "Vanessa",
44
"url": "https://github.com/Vanessa219",
5-
"version": "1.35.0"
5+
"version": "1.36.0"
66
}

‎app/appearance/icons/index.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,17 @@
2828
<body>
2929
<h2>SiYuan</h2>
3030
<div class="fn__clear">
31+
<div>
32+
<svg>
33+
<use xlink:href="#iconCallout"></use>
34+
</svg>
35+
iconCallout
36+
</div>
3137
<div>
3238
<svg>
3339
<use xlink:href="#iconInclude"></use>
3440
</svg>
35-
iconGroups
41+
iconInclude
3642
</div>
3743
<div>
3844
<svg>

‎app/appearance/icons/material/icon.js‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/appearance/icons/material/icon.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"name": "material",
33
"author": "Vanessa",
44
"url": "https://github.com/Vanessa219",
5-
"version": "1.35.0"
5+
"version": "1.36.0"
66
}

‎app/appearance/langs/ar_SA.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"callout": "تلميح",
3+
"hasAttrName": "اسم السمة ${x} موجود بالفعل",
24
"statusBarMsgPushTip": "من خلال رسائل شريط الحالة يمكنك معرفة حالة عمل النظام فورًا، وإذا كانت مزعجة يمكنك إيقافها",
35
"useBackground": "ملء خلفية العمود بلون الخيار",
46
"print": "طباعة",
@@ -918,6 +920,7 @@
918920
"moveToRight": "تحريك لليمين",
919921
"copyProtocol": "نسخ الرابط التشعبي للكتلة",
920922
"copyProtocolInMd": "‫نسخ رابط Markdown للكتلة‬",
923+
"copyWebURL": "نسخ رابط الويب",
921924
"uploadAssets2CDN": "رفع ملفات الأصول إلى السحابة",
922925
"uploadAssets2CDNConfirmTip": "هل أنت متأكد من رفع الأصول في هذا المستند إلى السحابة؟",
923926
"notSupport1": "لا يمكن السحب والإسقاط عبر الدفاتر",

‎app/appearance/langs/de_DE.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"callout": "Hinweis",
3+
"hasAttrName": "Der Attributname ${x} ist bereits vorhanden",
24
"statusBarMsgPushTip": "Über Nachrichten in der Statusleiste können Sie den Zustand des Systems sofort erfahren, wenn sie stören, können Sie sie deaktivieren",
35
"useBackground": "Spaltenhintergrund mit der Farbe der Option füllen",
46
"print": "Drucken",
@@ -918,6 +920,7 @@
918920
"moveToRight": "Nach rechts bewegen",
919921
"copyProtocol": "Blockhyperlink kopieren",
920922
"copyProtocolInMd": "Block-Markdown-Link kopieren",
923+
"copyWebURL": "Web-URL kopieren",
921924
"uploadAssets2CDN": "Asset-Dateien in die Cloud hochladen",
922925
"uploadAssets2CDNConfirmTip": "Sind Sie sicher, dass Sie die Assets in diesem Dokument in die Cloud hochladen möchten?",
923926
"notSupport1": "Unterstützt kein Drag & Drop über Notizen hinweg.",

‎app/appearance/langs/en_US.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"callout": "Callout",
3+
"hasAttrName": "The attribute name ${x} already exists",
24
"statusBarMsgPushTip": "Status bar messages let you instantly know the system's running status, and if they bother you you can turn them off",
35
"useBackground": "Fill column background with option color",
46
"print": "Print",
@@ -918,6 +920,7 @@
918920
"moveToRight": "Move Right",
919921
"copyProtocol": "Copy block hyperlink",
920922
"copyProtocolInMd": "Copy block Markdown link",
923+
"copyWebURL": "Copy web URL",
921924
"uploadAssets2CDN": "Upload asset files to cloud",
922925
"uploadAssets2CDNConfirmTip": "Are you sure to upload the assets in this document to the cloud?",
923926
"notSupport1": "Does not support drag and drop across notebooks",

‎app/appearance/langs/es_ES.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"callout": "Aviso",
3+
"hasAttrName": "El nombre del atributo ${x} ya existe",
24
"statusBarMsgPushTip": "A través de los mensajes en la barra de estado puedes conocer al instante el funcionamiento del sistema, si te molestan puedes desactivarlos",
35
"useBackground": "Rellenar el fondo de la columna con el color de la opción",
46
"print": "Imprimir",
@@ -918,6 +920,7 @@
918920
"moveToRight": "Mover a la derecha",
919921
"copyProtocol": "Copiar hipervínculo de bloque",
920922
"copyProtocolInMd": "Copiar enlace de bloque de Markdown",
923+
"copyWebURL": "Copiar URL web",
921924
"uploadAssets2CDN": "Subir archivos de activos a la nube",
922925
"uploadAssets2CDNConfirmTip": "¿Está seguro de cargar los recursos de este documento en la nube?",
923926
"notSupport1": "No admite la función de arrastrar y soltar en los cuadernos",

0 commit comments

Comments
 (0)