Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: siyuan-note/siyuan
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.8.4
Choose a base ref
...
head repository: siyuan-note/siyuan
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.8.5
Choose a head ref
4 contributors
Loading
Showing with 3,909 additions and 2,253 deletions.
  1. +1 −1 .github/CONTRIBUTING.md
  2. +1 −1 .github/CONTRIBUTING_zh_CN.md
  3. +4 −4 .github/PULL_REQUEST_TEMPLATE.md
  4. +3 −7 .github/SECURITY.md
  5. +1 −1 .github/workflows/dockerimage.yml
  6. +5 −5 app/appearance/icons/material/icon.js
  7. +7 −58 app/appearance/langs/en_US.json
  8. +7 −58 app/appearance/langs/es_ES.json
  9. +6 −58 app/appearance/langs/fr_FR.json
  10. +6 −57 app/appearance/langs/zh_CHT.json
  11. +6 −57 app/appearance/langs/zh_CN.json
  12. +1 −1 app/appx/AppxManifest.xml
  13. +1 −1 app/changelogs/v2.8.4_zh_CN.md
  14. +65 −0 app/changelogs/v2.8.5.md
  15. +65 −0 app/changelogs/v2.8.5_zh_CN.md
  16. +11 −6 app/electron/init.html
  17. +12 −7 app/electron/main.js
  18. +34 −9 app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p.sy
  19. +361 −208 ...de/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-axh6q1d/20200924095938-a9p5450.sy
  20. +195 −96 ...de/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-axh6q1d/20200924100110-vcg96wy.sy
  21. +110 −5 ...de/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100744-br924ar.sy
  22. +6 −5 ...de/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20201204184532-3qm9l8n.sy
  23. +7 −7 ...de/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210824202056-udkf7wg.sy
  24. +44 −1 app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy
  25. +28 −3 app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa.sy
  26. +186 −94 ...de/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-qgr0b3q/20200922101913-d5yitmq.sy
  27. +344 −195 ...de/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-qgr0b3q/20200922102318-oz84yu3.sy
  28. +109 −4 ...de/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200915214115-42b8zma.sy
  29. +44 −1 app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy
  30. +44 −1 app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy
  31. +28 −3 app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq.sy
  32. +348 −184 ...de/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121109-f060fkg/20211226121326-v5kpxfp.sy
  33. +146 −26 ...de/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121109-f060fkg/20211226121633-qa2fjpl.sy
  34. +110 −5 ...de/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226123038-4umgpxy.sy
  35. +6 −7 app/package.json
  36. +0 −18 app/pnpm-lock.yaml
  37. +0 −1 app/src/assets/scss/base.scss
  38. +9 −2 app/src/assets/scss/business/_card.scss
  39. +8 −2 app/src/assets/scss/business/_config.scss
  40. +1 −1 app/src/assets/scss/component/_card.scss
  41. +3 −1 app/src/assets/scss/mobile.scss
  42. +9 −0 app/src/assets/scss/util/_function.scss
  43. +1 −1 app/src/assets/scss/util/_responsive.scss
  44. +17 −0 app/src/boot/globalShortcut.ts
  45. +1 −1 app/src/card/makeCard.ts
  46. +168 −68 app/src/card/openCard.ts
  47. +40 −3 app/src/card/viewCards.ts
  48. +3 −3 app/src/config/about.ts
  49. +0 −21 app/src/config/appearance.ts
  50. +1 −1 app/src/config/bazaar.ts
  51. +30 −32 app/src/config/index.ts
  52. +1 −1 app/src/config/keymap.ts
  53. +1 −1 app/src/config/search.ts
  54. +0 −72 app/src/config/util/colorPicker.ts
  55. +2 −1 app/src/constants.ts
  56. +3 −1 app/src/dialog/confirmDialog.ts
  57. +6 −4 app/src/editor/deleteFile.ts
  58. +28 −2 app/src/editor/util.ts
  59. +2 −3 app/src/index.ts
  60. +29 −9 app/src/layout/dock/Files.ts
  61. +47 −2 app/src/layout/dock/Graph.ts
  62. +2 −3 app/src/menus/navigation.ts
  63. +93 −60 app/src/menus/protyle.ts
  64. +4 −0 app/src/mobile/editor.ts
  65. +1 −1 app/src/mobile/menu/index.ts
  66. +1 −1 app/src/mobile/menu/search.ts
  67. +217 −20 app/src/mobile/settings/editor.ts
  68. +15 −9 app/src/mobile/util/MobileBackFoward.ts
  69. +3 −1 app/src/mobile/util/initFramework.ts
  70. +48 −30 app/src/mobile/util/keyboardToolbar.ts
  71. +10 −6 app/src/mobile/util/touch.ts
  72. +8 −0 app/src/protyle/breadcrumb/index.ts
  73. +5 −4 app/src/protyle/export/index.ts
  74. +17 −0 app/src/protyle/header/Background.ts
  75. +4 −31 app/src/protyle/header/Title.ts
  76. +1 −0 app/src/protyle/hint/extend.ts
  77. +1 −1 app/src/protyle/markdown/abcRender.ts
  78. +2 −2 app/src/protyle/markdown/chartRender.ts
  79. +1 −1 app/src/protyle/toolbar/Font.ts
  80. +1 −1 app/src/protyle/toolbar/InlineMath.ts
  81. +23 −17 app/src/protyle/toolbar/index.ts
  82. +25 −1 app/src/protyle/ui/hideElements.ts
  83. +2 −3 app/src/protyle/util/compatibility.ts
  84. +40 −0 app/src/protyle/util/hotKey.ts
  85. +8 −3 app/src/protyle/util/paste.ts
  86. +79 −0 app/src/protyle/wysiwyg/commonClick.ts
  87. +1 −1 app/src/protyle/wysiwyg/enter.ts
  88. +27 −30 app/src/protyle/wysiwyg/index.ts
  89. +4 −3 app/src/protyle/wysiwyg/keydown.ts
  90. +3 −2 app/src/search/util.ts
  91. +21 −2 app/src/sync/syncGuide.ts
  92. +3 −2 app/src/types/index.d.ts
  93. +2 −2 app/src/util/assets.ts
  94. +24 −15 app/src/util/pathName.ts
  95. +0 −3 app/src/window/index.ts
  96. +2 −2 app/stage/protyle/js/abcjs/abcjs-basic-min.js
  97. +1 −1 app/stage/protyle/js/abcjs/abcjs-basic-min.js.LICENSE
  98. +1 −2 app/stage/protyle/js/protyle-html.js
  99. +34 −0 kernel/api/asset.go
  100. +7 −0 kernel/api/block_op.go
  101. +26 −7 kernel/api/filetree.go
  102. +6 −0 kernel/api/import.go
  103. +19 −3 kernel/api/notebook.go
  104. +15 −6 kernel/api/riff.go
  105. +2 −2 kernel/api/router.go
  106. +6 −1 kernel/api/search.go
  107. +0 −37 kernel/api/setting.go
  108. +0 −2 kernel/conf/appearance.go
  109. +3 −3 kernel/go.mod
  110. +6 −6 kernel/go.sum
  111. +1 −9 kernel/model/appearance.go
  112. +18 −9 kernel/model/assets.go
  113. +7 −242 kernel/model/css.go
  114. +8 −14 kernel/model/export.go
  115. +1 −1 kernel/model/export_merge.go
  116. +66 −15 kernel/model/file.go
  117. +113 −67 kernel/model/flashcard.go
  118. +40 −116 kernel/model/graph.go
  119. +3 −3 kernel/model/history.go
  120. +3 −3 kernel/model/mount.go
  121. +10 −5 kernel/model/search.go
  122. +1 −1 kernel/model/sync.go
  123. +7 −2 kernel/sql/block_ref_query.go
  124. +15 −0 kernel/treenode/blocktree.go
  125. +2 −2 kernel/treenode/heading.go
  126. +1 −1 kernel/treenode/node.go
  127. +15 −5 kernel/util/tesseract.go
  128. +1 −1 kernel/util/working.go
  129. +3 −3 scripts/parse-changelog.py
  130. +8 −0 scripts/win-build.bat
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ Note: In the development environment, the kernel process will not be automatical
### Android

* `cd kernel`
* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm,android/arm64' ./mobile/`
* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' ./mobile/`
* https://github.com/siyuan-note/siyuan-android

For the mobile-end, please refer to the corresponding project repository.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING_zh_CN.md
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ NPM 镜像：

### Android

* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm,android/arm64' ./kernel/mobile/`
* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' ./kernel/mobile/`
* https://github.com/siyuan-note/siyuan-android

移动端请参考对应项目仓库。
8 changes: 4 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* [ ] Please commit to the dev branch 请提交到 dev 开发分支
* [ ] For contributing new features, please supplement and improve the corresponding user guide documents 对于贡献新特性，请补充完善对应用户指南文档
* [ ] For bug fixes, please describe the problem and solution via code comments 对于修复缺陷，请通过代码注释描述问题和解决方案
* [ ] For text improvements (such as typos and wording adjustments), please submit directly 对于文案改进（比如错别字措辞调整）请直接提交
* [ ] Please commit to the dev branch
* [ ] For contributing new features, please supplement and improve the corresponding user guide documents
* [ ] For bug fixes, please describe the problem and solution via code comments
* [ ] For text improvements (such as typos and wording adjustments), please submit directly
10 changes: 3 additions & 7 deletions .github/SECURITY.md
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
# 安全报告 Security report
# Security report

如果你发现安全相关漏洞请通过如下任意一种方式告知我们：\
If you find security-related vulnerabilities, please inform us in any of the following ways:

* 直接开 Issue（请隐去站点、实际项目等敏感信息）\
Open Issue directly (please hide sensitive information such as site and actual project)
* 发邮件至 845765@qq.com\
Send an email to 845765@qq.com
* Open Issue directly (please hide sensitive information such as site and actual project)
* Send an email to 845765@qq.com

非常感谢！\
Thank you very much!
2 changes: 1 addition & 1 deletion .github/workflows/dockerimage.yml
View file
Original file line number Diff line number Diff line change
@@ -33,4 +33,4 @@ jobs:

- name: Build the Docker image
run: |
docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v2.8.4 .
docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v2.8.5 .
10 changes: 5 additions & 5 deletions app/appearance/icons/material/icon.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 7 additions & 58 deletions app/appearance/langs/en_US.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"ocrResult": "OCR result text",
"reOCR": "Re OCR",
"continueReview1": "Continue Review",
"continueReview2": "There are still <code class='fn__code'>${count}</code> cards to review, continue?",
"whatsNewInSiYuan": "What's New in SiYuan",
"returnDesktop": "Press back again to desktop",
"enterNew": "Enter to create",
@@ -33,7 +37,7 @@
"apiBaseURL": "API Base URL",
"apiBaseURLTip": "The base address of the request, such as <code class='fn__code'>https://api.openai.com/v1</code>",
"skip": "Skip",
"reboot": "Reboot",
"nextRound": "Next round",
"save": "Save",
"ai": "Artificial Intelligence",
"aiContinueWrite": "Continue writing",
@@ -537,7 +541,7 @@
"download": "Download",
"uninstall": "Uninstall",
"all": "All",
"bazaar": "Bazaar",
"bazaar": "Marketplace",
"revolve": "Revolve",
"useDefault": "Open with default program",
"previous": "Previous",
@@ -546,7 +550,7 @@
"kernelFault1": "Please check if the network connection and kernel process is normal",
"kernelFault2": "If the problem still occurs after restarting, please report it via <a href=\"https://github.com/siyuan-note/siyuan/issues\" target=\"_blank\">GitHub Issues</a>",
"fontSize": "Font Size",
"fontSizeTip": "The default font size is 16px, this setting only affects the font size display in the editor",
"fontSizeTip": "The default font size is 16px, this setting affects the editor and exported PDF/HTML font size display",
"font1": "This setting only affects the font family display in the editor, choose <code class='fn__code'>Default</code> to use the theme&#039;s font family",
"newNameFile": "The name of the new subdocument is",
"newNameSettingFile": "The name of the new document is",
@@ -589,61 +593,8 @@
"pasteEmbed": "Paste Block Embed",
"cut": "Cut",
"mentions": "Mentions",
"colorBorder": "Border Color",
"colorFont": "Font Color",
"colorGraph": "Graph Color",
"colorInline": "Document Inline Color",
"colorPrimary": "Background Color",
"colorScroll": "Scroll Color",
"colorTab": "Tab Color",
"colorTip": "Tooltip Color",
"--b3-theme-primary": "Primary",
"--b3-theme-primary-light": "Primary - Light",
"--b3-theme-primary-lighter": "Primary - Lighter",
"--b3-theme-primary-lightest": "Primary - Lightest",
"--b3-theme-secondary": "Secondary",
"--b3-theme-background": "Background",
"--b3-theme-surface": "Surface",
"--b3-theme-error": "Error",
"--b3-theme-on-primary": "Font Color On Primary",
"--b3-theme-on-secondary": "Font Color On Secondary",
"--b3-theme-on-background": "Font Color On Background",
"--b3-theme-on-surface": "Font Color On Surface",
"--b3-theme-on-error": "Font Color On Error",
"--b3-border-color": "Border",
"--b3-scroll-color": "Scroll",
"--b3-list-hover": "List Hover Color",
"--b3-tab-background": "Tab Background",
"--b3-tooltips-color": "Tooltip Background",
"--b3-graph-p-point": "Paragraph Point",
"--b3-graph-heading-point": "Title Point",
"--b3-graph-math-point": "Math Point",
"--b3-graph-code-point": "Code Point",
"--b3-graph-table-point": "Table Point",
"--b3-graph-list-point": "List Point",
"--b3-graph-todo-point": "Task list Point",
"--b3-graph-olist-point": "Order list Point",
"--b3-graph-listitem-point": "List item Point",
"--b3-graph-bq-point": "Blockquote Point",
"--b3-graph-super-point": "Super Point",
"--b3-graph-doc-point": "Document Point",
"--b3-graph-tag-point": "Tag Point",
"--b3-graph-asset-point": "Asset Point",
"--b3-graph-line": "Line",
"--b3-graph-ref-line": "Line between link",
"--b3-graph-tag-line": "Line between tag and node",
"--b3-graph-tag-tag-line": "Line between tag and tag",
"--b3-graph-asset-line": "Line between asset and node",
"--b3-graph-hl-point": "Choose Point",
"--b3-graph-hl-line": "Choose Line",
"--b3-protyle-inline-strong-color": "Bold",
"--b3-protyle-inline-em-color": "italic",
"--b3-protyle-inline-s-color": "strike",
"--b3-protyle-inline-link-color": "Link",
"--b3-protyle-inline-mark-background": "Mark Background",
"--b3-protyle-inline-mark-color": "Mark",
"--b3-protyle-inline-tag-color": "Tag",
"--b3-protyle-inline-blockref-color": "Block Ref",
"sync": "Sync",
"syncNow": "Sync now",
"waitSync": "The editing data has not been synchronized to the cloud",
@@ -758,8 +709,6 @@
"blockRef": "Ref Block",
"theme11": "Use theme in light mode",
"theme12": "Use theme in dark mode",
"theme13": "Customize the current theme",
"theme14": "After enabling, the customized theme will be used, and after closing, the original theme will be used",
"theme2": "Select the icons used in the user interface",
"language1": "Select the display language of the user interface",
"summary": "Summary",
65 changes: 7 additions & 58 deletions app/appearance/langs/es_ES.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"ocrResult": "Texto de resultado de OCR",
"reOCR": "Re-OCR",
"continueReview1": "Continuar revisión",
"continueReview2": "Todavía hay tarjetas <code class='fn__code'>${count}</code> para revisar, ¿continuar?",
"whatsNewInSiYuan": "Novedades en SiYuan",
"returnDesktop": "Presiona volver de nuevo al escritorio",
"enterNew": "Ingresar para crear",
@@ -33,7 +37,7 @@
"apiBaseURL": "URL base de la API",
"apiBaseURLTip": "La dirección base de la solicitud, como <code class='fn__code'>https://api.openai.com/v1</code>",
"skip": "barco",
"reboot": "Reiniciar",
"nextRound": "Siguiente ronda",
"save": "Ahorrar",
"ai": "Inteligencia Artificial",
"aiContinueWrite": "Continuar escribiendo",
@@ -537,7 +541,7 @@
"download": "Descargar",
"uninstall": "Desinstalar",
"all": "Todo",
"bazaar": "Bazar",
"bazaar": "Mercado",
"revolve": "Girar",
"useDefault": "Abrir con el programa por defecto",
"previous": "Anterior",
@@ -546,7 +550,7 @@
"kernelFault1": "Verifique si la conexión de red y los procesos del kernel son normales",
"kernelFault2": "Si el problema sigue produciéndose después de reiniciar, comuníquelo a través de <a href=\"https://github.com/siyuan-note/siyuan/issues\" target=\"_blank\">Problemas en GitHub</a>",
"fontSize": "Tamaño de la fuente",
"fontSizeTip": "El tamaño de la fuente por defecto es de 16px, este ajuste sólo afecta a la visualización del tamaño de la fuente en el editor",
"fontSizeTip": "El tamaño de fuente predeterminado es 16px, esta configuración afecta el editor y la visualización del tamaño de fuente PDF/HTML exportado",
"font1": "Este ajuste sólo afecta a la visualización de la familia de fuentes en el editor, elija <code class='fn__code'>Por defecto</code> para utilizar la familia de fuentes del tema",
"newNameFile": "El nombre del nuevo subdocumento es",
"newNameSettingFile": "El nombre del nuevo documento es",
@@ -589,61 +593,8 @@
"pasteEmbed": "Pegar bloque incrustado",
"cut": "Cortar",
"mentions": "Menciones",
"colorBorder": "Color del borde",
"colorFont": "Color de la fuente",
"colorGraph": "Color del gráfico",
"colorInline": "Color del documento en línea",
"colorPrimary": "Color de fondo",
"colorScroll": "Color de desplazamiento",
"colorTab": "Color de la pestaña",
"colorTip": "Color de la información sobre la herramienta",
"--b3-theme-primary": "Primario",
"--b3-theme-primary-light": "Primario - ligero",
"--b3-theme-primary-lighter": "Primario - Poco ligero",
"--b3-theme-primary-lightest": "Primario - Más ligero",
"--b3-theme-secondary": "Secundario",
"--b3-theme-background": "Fondo",
"--b3-theme-surface": "Superficie",
"--b3-theme-error": "Error",
"--b3-theme-on-primary": "Color de la fuente en el primario",
"--b3-theme-on-secondary": "Color de la fuente en el secundario",
"--b3-theme-on-background": "Color de fuente en el fondo",
"--b3-theme-on-surface": "Color de la fuente en la superficie",
"--b3-theme-on-error": "Color de la fuente en caso de error",
"--b3-border-color": "Borde",
"--b3-scroll-color": "Desplazar",
"--b3-list-hover": "Color de la Lista por encima",
"--b3-tab-background": "Fondo de la pestaña",
"--b3-tooltips-color": "Fondo de la información sobre",
"--b3-graph-p-point": "Punto de párrafo",
"--b3-graph-heading-point": "Punto de título",
"--b3-graph-math-point": "Punto de Matemáticas",
"--b3-graph-code-point": "Punto de código",
"--b3-graph-table-point": "Punto de tabla",
"--b3-graph-list-point": "Punto de lista",
"--b3-graph-todo-point": "Punto de lista de tareas",
"--b3-graph-olist-point": "Punto de lista de órdenes",
"--b3-graph-listitem-point": "Punto de la lista de elementos",
"--b3-graph-bq-point": "Punto de la lista de bloques",
"--b3-graph-super-point": "Super punto",
"--b3-graph-doc-point": "Punto de documento",
"--b3-graph-tag-point": "Punto de etiqueta",
"--b3-graph-asset-point": "Punto de Activo",
"--b3-graph-line": "Línea ",
"--b3-graph-ref-line": "Línea entre enlace",
"--b3-graph-tag-line": "Línea entre etiqueta y nodo",
"--b3-graph-tag-tag-line": "Línea entre etiqueta y etiqueta",
"--b3-graph-asset-line": "Línea entre activo y nodo",
"--b3-graph-hl-point": "Elegir punto",
"--b3-graph-hl-line": "Elegir línea",
"--b3-protyle-inline-strong-color": "Negrita",
"--b3-protyle-inline-em-color": "cursiva",
"--b3-protyle-inline-s-color": "strike",
"--b3-protyle-inline-link-color": "Enlace",
"--b3-protyle-inline-mark-background": "Fondo de marca",
"--b3-protyle-inline-mark-color": "Marca",
"--b3-protyle-inline-tag-color": "Etiqueta",
"--b3-protyle-inline-blockref-color": "Bloque Ref",
"sync": "Sincronización",
"syncNow": "Sincronizar ahora",
"waitSync": "Los datos de edición no se han sincronizado con la nube",
@@ -758,8 +709,6 @@
"blockRef": "Bloque de referencia",
"theme11": "Usar tema en modo claro",
"theme12": "Usar tema en modo oscuro",
"theme13": "Personalizar el tema actual",
"theme14": "Después de habilitarlo, se utilizará el tema personalizado, y después de cerrarlo, se utilizará el tema original",
"theme2": "Selecciona los iconos utilizados en la interfaz de usuario",
"language1": "Seleccionar el idioma de visualización de la interfaz de usuario",
"summary": "Resumen",
Loading