Skip to content

Commit

Permalink
Merge remote-tracking branch 'fork-siyuan/dev' into v0.28
Browse files Browse the repository at this point in the history
  • Loading branch information
Soltus committed Apr 1, 2024
2 parents af1dda0 + 5a24658 commit dab0f4f
Show file tree
Hide file tree
Showing 70 changed files with 1,348 additions and 429 deletions.
14 changes: 12 additions & 2 deletions app/appearance/langs/en_US.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"updateLayout": "Update layout",
"dndFolderTip": "Please note that ${x} only inserts the file:// hyperlink and does not copy the file",
"removeCol": "Are you sure you want to delete the ${x} column in the database?",
"video": "Video",
"audio": "Audio",
Expand Down Expand Up @@ -434,6 +436,13 @@
"autoDownloadUpdatePkgTip": "After enabling, it will automatically check the version update every two hours. If there is an updated version, it will automatically download the installation package and prompt for installation",
"downloaded": "Downloaded",
"allOp": "All operations",
"allNotebooks": "All Notebooks",
"historyClean": "clean",
"historyUpdate": "update",
"historyDelete": "delete",
"historyFormat": "format",
"historySync": "sync",
"historyReplace": "replace",
"htmlBlockError": "The execution of the following script will affect the interface display, and the script has stopped running",
"fileHistory": "File history",
"htmlBlockTip": "Multiple HTML blocks are formed. To prevent data loss, please use <code class='fn__code'>&lt;div&gt;</code> tags to wrap and remove blank lines",
Expand Down Expand Up @@ -1079,7 +1088,7 @@
"about11": "Network serving",
"about12": "After enabling, other devices in the same LAN will be allowed to access. The application will be closed automatically after modification, please restart manually",
"about13": "API token",
"about14": "The token needs to be authenticated when calling the API",
"about14": "The token needs to be authenticated when calling the API<br>HTTP request header <code class=\"fn__code\">Authorization: token ${token}</code>",
"about17": "Do not enable proxy when set to <code class='fn__code'>Direct connection</code>",
"about18": "When using a non-loopback address (<code class=\"fn__code\">127.0.0.1</code>/<code class=\"fn__code\">[::1]</code>) please set the Access authorization code first",
"checkUpdate": "Check update",
Expand Down Expand Up @@ -1451,6 +1460,7 @@
"235": "[%d/%d] is updating the marketplace package...",
"236": "[%d/%d] is updating the marketplace package [%s]...",
"237": "[%d] marketplace packages have all been updated successfully",
"238": "Marketplace package [%s] update failed, please try again later"
"238": "Marketplace package [%s] update failed, please try again later",
"239": "Related operations are being processed, please try again later"
}
}
14 changes: 12 additions & 2 deletions app/appearance/langs/es_ES.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"updateLayout": "Actualizar diseño",
"dndFolderTip": "Tenga en cuenta que ${x} solo inserta el hipervínculo file:// y no copia el archivo",
"removeCol": "¿Está seguro de que desea eliminar la columna ${x} en la base de datos?",
"vídeo": "Vídeo",
"audio": "Audio",
Expand Down Expand Up @@ -434,6 +436,13 @@
"autoDownloadUpdatePkgTip": "Después de abrir, verificará automáticamente la actualización de la versión cada dos horas. Si hay una versión actualizada, descargará automáticamente el paquete de instalación y solicitará la instalación",
"downloaded": "Descargado",
"allOp": "Todas las operaciones",
"allNotebooks": "Todos los cuadernos",
"historyClean": "limpiar (clean)",
"historyUpdate": "actualizar (update)",
"historyDelete": "eliminar (delete)",
"historyFormat": "formatear (format)",
"historySync": "sincronizar (sync)",
"historyReplace": "reemplazar (replace)",
"htmlBlockError": "La ejecución del siguiente script afectará la visualización de la interfaz y el script ha dejado de ejecutarse",
"fileHistory": "Historial de archivos",
"htmlBlockTip": "Se forman varios bloques HTML. Para evitar la pérdida de datos, utilice etiquetas <code class='fn__code'>&lt;div&gt;</code> para ajustar y eliminar líneas en blanco",
Expand Down Expand Up @@ -1079,7 +1088,7 @@
"about11": "Red de servicio",
"about12": "Después de habilitarlo, se permitirá el acceso a otros dispositivos de la misma LAN. La aplicación se cerrará automáticamente después de la modificación, por favor reinicie manualmente",
"about13": "Token API",
"about14": "El token debe ser autentificado al llamar a la API",
"about14": "El token debe ser autentificado al llamar a la API<br>Encabezado de solicitud HTTP <code class=\"fn__code\">Authorization: token ${token}</code>",
"about17": "No habilite el proxy cuando esté configurado como <code class='fn__code'>Conexión directa</code>",
"about18": "Cuando se utiliza una dirección sin bucle invertido (<code class=\"fn__code\">127.0.0.1</code>/<code class=\"fn__code\">[::1]</code> ) Primero configure el Código de autorización de acceso",
"checkUpdate": "Comprobar actualización",
Expand Down Expand Up @@ -1451,6 +1460,7 @@
"235": "[%d/%d] está actualizando el paquete del mercado...",
"236": "[%d/%d] está actualizando el paquete del mercado [%s]...",
"237": "[%d] todos los paquetes del mercado se han actualizado correctamente",
"238": "Error en la actualización del paquete Marketplace [%s], inténtalo de nuevo más tarde"
"238": "Error en la actualización del paquete Marketplace [%s], inténtalo de nuevo más tarde",
"239": "Las operaciones relacionadas se están procesando, inténtalo de nuevo más tarde"
}
}
14 changes: 12 additions & 2 deletions app/appearance/langs/fr_FR.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"updateLayout": "Mettre à jour la mise en page",
"dndFolderTip": "Veuillez noter que ${x} insère uniquement le lien hypertexte file:// et ne copie pas le fichier",
"removeCol": "Êtes-vous sûr de vouloir supprimer la colonne ${x} de la base de données ?",
"video": "Vidéo",
"audio": "Audio",
Expand Down Expand Up @@ -434,6 +436,13 @@
"autoDownloadUpdatePkgTip": "Après l'ouverture, il vérifiera automatiquement la mise à jour de la version toutes les deux heures. S'il existe une version mise à jour, il téléchargera automatiquement le package d'installation et demandera l'installation",
"downloaded": "Téléchargé",
"allOp": "Toutes les opérations",
"allNotebooks": "Tous les cahiers",
"historyClean": "nettoyer (clean)",
"historyUpdate": "mettre à jour (update)",
"historyDelete": "supprimer (delete)",
"historyFormat": "formater (format)",
"historySync": "synchroniser (sync)",
"historyReplace": "remplacer (replace)",
"htmlBlockError": "L'exécution du script suivant affectera l'affichage de l'interface et le script a cessé de s'exécuter",
"fileHistory": "Historique des fichiers",
"htmlBlockTip": "Plusieurs blocs HTML sont formés. Pour éviter la perte de données, veuillez utiliser les balises <code class='fn__code'>&lt;div&gt;</code> pour envelopper et supprimer les lignes vides",
Expand Down Expand Up @@ -1079,7 +1088,7 @@
"about11": "Service de réseau",
"about12": "Après l'activation, les autres appareils du même réseau local seront autorisés à accéder. L'application sera fermée automatiquement après modification, veuillez la redémarrer manuellement.",
"about13": "API token",
"about14": "Le token doit être authentifié lors de l'appel de l'API.",
"about14": "Le token doit être authentifié lors de l'appel de l'API<br>En-tête de requête HTTP <code class=\"fn__code\">Authorization: token ${token}</code>",
"about17": "N'activez pas le proxy lorsqu'il est défini sur <code class='fn__code'>Connexion directe</code>.",
"about18": "Lors de l'utilisation d'une adresse sans bouclage (<code class=\"fn__code\">127.0.0.1</code>/<code class=\"fn__code\">[::1]</code> ) Veuillez d'abord définir le Accès code d'autorisation",
"checkUpdate": "Vérifier la mise à jour",
Expand Down Expand Up @@ -1451,6 +1460,7 @@
"235": "[%d/%d] met à jour le package Marketplace...",
"236": "[%d/%d] met à jour le package Marketplace [%s]...",
"237": "[%d] packages Marketplace ont tous été mis à jour avec succès",
"238": "La mise à jour du package Marketplace [%s] a échoué, veuillez réessayer plus tard"
"238": "La mise à jour du package Marketplace [%s] a échoué, veuillez réessayer plus tard",
"239": "Les opérations associées sont en cours de traitement, veuillez réessayer plus tard"
}
}
14 changes: 12 additions & 2 deletions app/appearance/langs/zh_CHT.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"updateLayout": "更新版面配置",
"dndFolderTip": "請注意 ${x} 僅插入 file:// 超鏈接,不複製檔案",
"removeCol": "確定刪除資料庫中的 ${x} 欄位?",
"video": "影片",
"audio": "音訊",
Expand Down Expand Up @@ -434,6 +436,13 @@
"autoDownloadUpdatePkgTip": "啟用後會每隔兩小時自動檢查版本更新,如果有更新版本則自動下載安裝檔並提示安裝",
"downloaded": "已下載",
"allOp": "所有操作",
"allNotebooks": "所有筆記本",
"historyClean": "清理  (clean)",
"historyUpdate": "更新  (update)",
"historyDelete": "刪除  (delete)",
"historyFormat": "格式化 (format)",
"historySync": "同步  (sync)",
"historyReplace": "替換  (replace)",
"htmlBlockError": "以下 script 執行會影響界面顯示,已經停止運行該腳本",
"fileHistory": "文件歷史",
"htmlBlockTip": "形成了多個 HTML 塊,為防止資料丟失請使用 <code class='fn__code'>&lt;div&gt;</code> 標籤包裹並去掉空行",
Expand Down Expand Up @@ -1079,7 +1088,7 @@
"about11": "網路伺服",
"about12": "啟用後將允許同一區域網內的其他設備進行存取。修改後會自動關閉應用,請手動重啟",
"about13": "API token",
"about14": "調用 API 時需要通過該 token 進行鑒權",
"about14": "調用 API 時需要通過該 token 進行鑒權<br>HTTP 請求標頭 <code class=\"fn__code\">Authorization: token ${token}</code>",
"about17": "設置為 <code class='fn__code'>直接連接</code> 時不啟用代理",
"about18": "使用非環回地址(<code class=\"fn__code\">127.0.0.1</code>/<code class=\"fn__code\">[::1]</code>)時請先設置訪問授權碼",
"checkUpdate": "檢查更新",
Expand Down Expand Up @@ -1451,6 +1460,7 @@
"235": "[%d/%d] 正在更新市集包...",
"236": "[%d/%d] 正在更新市集包 [%s]...",
"237": "[%d] 個市集包已經全部更新成功",
"238": "市集包 [%s] 更新失敗,請稍後再試"
"238": "市集包 [%s] 更新失敗,請稍後再試",
"239": "相關操作正在處理中,請稍後再試"
}
}
14 changes: 12 additions & 2 deletions app/appearance/langs/zh_CN.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"updateLayout": "更新布局",
"dndFolderTip": "请注意 ${x} 仅插入 file:// 超链接,不复制文件",
"removeCol": "确定删除数据库中的 ${x} 列?",
"video": "视频",
"audio": "音频",
Expand Down Expand Up @@ -435,6 +437,13 @@
"autoDownloadUpdatePkgTip": "启用后会每隔两小时自动检查版本更新,如果有更新版本则自动下载安装包并提示安装",
"downloaded": "已下载",
"allOp": "所有操作",
"allNotebooks": "所有笔记本",
"historyClean": "清理  (clean)",
"historyUpdate": "更新  (update)",
"historyDelete": "删除  (delete)",
"historyFormat": "格式化 (format)",
"historySync": "同步  (sync)",
"historyReplace": "替换  (replace)",
"htmlBlockError": "以下 script 执行会影响界面显示,已经停止运行该脚本",
"fileHistory": "文件历史",
"htmlBlockTip": "形成了多个 HTML 块,为防止数据丢失请使用 <code class='fn__code'>&lt;div&gt;</code> 标签包裹并去掉空行",
Expand Down Expand Up @@ -1080,7 +1089,7 @@
"about11": "网络伺服",
"about12": "启用后将允许同一局域网内的其他设备进行访问。修改后不会自动关闭应用,请手动重启",
"about13": "API token",
"about14": "调用 API 时需要通过该 token 进行鉴权",
"about14": "调用 API 时需要通过该 token 进行鉴权<br>HTTP 请求标头 <code class=\"fn__code\">Authorization: token ${token}</code>",
"about17": "设置为 <code class='fn__code'>直接连接</code> 时不启用代理",
"about18": "未设置访问授权码时仅可通过环回地址(<code class=\"fn__code\">127.0.0.1</code>/<code class=\"fn__code\">[::1]</code>)访问",
"checkUpdate": "检查更新",
Expand Down Expand Up @@ -1453,6 +1462,7 @@
"235": "[%d/%d] 正在更新集市包...",
"236": "[%d/%d] 正在更新集市包 [%s]...",
"237": "[%d] 个集市包已经全部更新成功",
"238": "集市包 [%s] 更新失败,请稍后再试"
"238": "集市包 [%s] 更新失败,请稍后再试",
"239": "相关操作正在处理中,请稍后再试"
}
}
64 changes: 64 additions & 0 deletions app/changelogs/v3.0.6/v3.0.6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
## Overview

This version supports dragging and dropping to adjust the level and position of outline items in the outline panel.

## Changelogs

Below are the detailed changes in this version.

### Enhancement

* [The outline item in the outline panel supports dragging to adjust the level and position](https://github.com/siyuan-note/siyuan/issues/7957)
* [Improve image click interaction on the mobile](https://github.com/siyuan-note/siyuan/issues/10646)
* [Database table view primary key supports pasting reference block](https://github.com/siyuan-note/siyuan/issues/10690)
* [Leave two lines space to connect when turning pages up and down](https://github.com/siyuan-note/siyuan/issues/10702)
* [Improve database table view URL field display](https://github.com/siyuan-note/siyuan/issues/10712)
* [No longer prompts "Don't panic... scroll up and down to load more" when opening a doc and the first block has been loaded](https://github.com/siyuan-note/siyuan/issues/10716)
* [When not focused in SiYuan window, the left option of Database row is hard to select](https://github.com/siyuan-note/siyuan/issues/10731)
* [Improved tab menu shake issue](https://github.com/siyuan-note/siyuan/issues/10737)
* [Improve database table view multi-select interaction](https://github.com/siyuan-note/siyuan/issues/10738)
* [Support search code snippets](https://github.com/siyuan-note/siyuan/issues/10739)
* [Improve exit focus positioning](https://github.com/siyuan-note/siyuan/issues/10746)
* [`Hide/Show Window` supports configuration `Alt+Fn`](https://github.com/siyuan-note/siyuan/issues/10754)
* [`Hide/Show Window` is only for workspaces](https://github.com/siyuan-note/siyuan/issues/10755)
* [Improve the handling of empty values in database multi-field sorting](https://github.com/siyuan-note/siyuan/issues/10758)
* [Improve marketplace package UI](https://github.com/siyuan-note/siyuan/pull/10760)
* [Click to add row in database table view row menu](https://github.com/siyuan-note/siyuan/issues/10763)
* [Automatically loads and indexes from the file system when a block is not found](https://github.com/siyuan-note/siyuan/issues/10772)
* [Add `Open with New Window` to flashcard menu](https://github.com/siyuan-note/siyuan/issues/10773)
* [Prompt when dragging and inserting a folder](https://github.com/siyuan-note/siyuan/issues/10779)
* [Support editing saved layouts](https://github.com/siyuan-note/siyuan/issues/10783)
* [Improve data sync conflict generation](https://github.com/siyuan-note/siyuan/issues/10784)
* [Data history supports querying in all notebooks](https://github.com/siyuan-note/siyuan/issues/10788)
* [Improve i18n for Data History](https://github.com/siyuan-note/siyuan/pull/10793)
* [Database rollup supports numeric calculation](https://github.com/siyuan-note/siyuan/issues/10796)
* [Improve web clip table parsing](https://github.com/siyuan-note/siyuan/issues/10799)
* [`Ctrl+Home` doesn't work when document is in read-only mode](https://github.com/siyuan-note/siyuan/issues/10806)
* [Hyperlink should not open when selecting text on it](https://github.com/siyuan-note/siyuan/issues/10808)
* [Datbase template supports numerical calculations when using rollup](https://github.com/siyuan-note/siyuan/issues/10810)
* [Improve cursor style for ref and pdf ref in read-only mode](https://github.com/siyuan-note/siyuan/issues/10813)
* [Improve copying plain text](https://github.com/siyuan-note/siyuan/issues/10816)
* [Improve database rollup number calculation](https://github.com/siyuan-note/siyuan/issues/10822)

### Bugfix

* [Disable right-click menu in database table view column in read-only mode](https://github.com/siyuan-note/siyuan/issues/10750)
* [Inline-level formulas cannot be displayed after pressing Enter](https://github.com/siyuan-note/siyuan/issues/10751)
* [Breadcrumb XSS](https://github.com/siyuan-note/siyuan/issues/10753)
* [Editor parsing exception after enter /```](https://github.com/siyuan-note/siyuan/issues/10759)
* [Index fixing should not be performed before data synchronization](https://github.com/siyuan-note/siyuan/issues/10761)
* [Flash card in new window full screen, buttons cannot be clicked](https://github.com/siyuan-note/siyuan/issues/10765)
* [Floating window `Enter` error from embedded block](https://github.com/siyuan-note/siyuan/issues/10805)
* [Attribute panel - Database template custom attributes not shown](https://github.com/siyuan-note/siyuan/issues/10812)
* [Export PDF error when containing HTML block](https://github.com/siyuan-note/siyuan/issues/10814)
* [Copy text * error for database block](https://github.com/siyuan-note/siyuan/issues/10817)

### Development

* [Plugin eventbus for `switch-protyle` on the mobile](https://github.com/siyuan-note/siyuan/issues/10766)
* [Improve kernel API token authentication](https://github.com/siyuan-note/siyuan/issues/10792)

## Download

* [B3log](https://b3log.org/siyuan/en/download.html)
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
Loading

0 comments on commit dab0f4f

Please sign in to comment.