Skip to content

Commit

Permalink
Merge pull request #598 from Hi-Windom/huge_merge
Browse files Browse the repository at this point in the history
Huge merge
  • Loading branch information
Soltus authored Mar 25, 2024
2 parents c7bce17 + da564cf commit 22e92ab
Show file tree
Hide file tree
Showing 159 changed files with 6,135 additions and 895 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
# 运行预发行镜像而无需合并到主分支,例如 v0.13.3rc1
inputs:
image_tag:
description: '镜像标签( 无论 tag 是什么,都会附加 latest , -sillot 会自动补全因此无需输入 ) '
description: '镜像标签( -sillot 会自动补全因此禁止输入 ) 完整输入示例:v0.27.25 '
required: true
default: 'v0.'

Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Checkout repository and submodules
uses: actions/checkout@v4
with:
ref: dev
ref: ${{ github.event.ref }}
submodules: recursive

- name: Set up QEMU
Expand Down
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"shardulm94.trailing-spaces",
"xboxyan.tree-generator",
"unifiedjs.vscode-mdx",
"astro-build.astro-vscode"
"astro-build.astro-vscode",
"golang.go"
],
"unwantedRecommendations": []
}
7 changes: 5 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"vue.features.codeActions.enable": false
}
"vue.features.codeActions.enable": false,
"files.associations": {
"*.sy": "json"
}
}
6 changes: 4 additions & 2 deletions app/appearance/langs/en_US.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"removeCol": "Are you sure you want to delete the ${x} column in the database?",
"video": "Video",
"audio": "Audio",
"updateAll": "Update all",
Expand Down Expand Up @@ -1208,7 +1209,8 @@
},
"_attrView": {
"table": "Table",
"key": "Primary Key"
"key": "Primary Key",
"select": "Select"
},
"_kernel": {
"0": "Query notebook failed",
Expand Down Expand Up @@ -1316,7 +1318,7 @@
"102": "Processing completed",
"103": "The update installation package has been automatically downloaded in the background. When exiting, you will be asked whether to install the new version",
"104": "The update installation package failed to download, please check the network connection",
"105": "TODO",
"105": "Untitled",
"106": "Maximum length is limited to 512 characters",
"107": "Moved document [%s]",
"108": "Data sync found conflicts, you can view the generated conflict content in [Data History]",
Expand Down
6 changes: 4 additions & 2 deletions app/appearance/langs/es_ES.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"removeCol": "¿Está seguro de que desea eliminar la columna ${x} en la base de datos?",
"vídeo": "Vídeo",
"audio": "Audio",
"updateAll": "Actualizar todo",
Expand Down Expand Up @@ -1208,7 +1209,8 @@
},
"_attrView": {
"tabla": "Tabla",
"clave": "Clave principal"
"key": "Clave principal",
"select": "Selección"
},
"_kernel": {
"0": "Consulta al cuaderno de notas fallido",
Expand Down Expand Up @@ -1316,7 +1318,7 @@
"102": "Procesamiento completado",
"103": "El paquete de instalación de la actualización se ha descargado automáticamente en segundo plano. Al salir, se le preguntará si desea instalar la nueva versión",
"104": "El paquete de instalación de la actualización no se pudo descargar, verifique la conexión de red",
"105": "TODO",
"105": "Sin título",
"106": "La longitud máxima está limitada a 512 caracteres",
"107": "Documento movido [%s]",
"108": "La sincronizaci\u00f3n de datos encontr\u00f3 en conflictos, puede ver el contenido del conflicto generado en [Historial de datos]",
Expand Down
6 changes: 4 additions & 2 deletions app/appearance/langs/fr_FR.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"removeCol": "Êtes-vous sûr de vouloir supprimer la colonne ${x} de la base de données ?",
"video": "Vidéo",
"audio": "Audio",
"updateAll": "Tout mettre à jour",
Expand Down Expand Up @@ -1208,7 +1209,8 @@
},
"_attrView": {
"table": "Tableau",
"key": "Clé primaire"
"key": "Clé primaire",
"select": "Sélectionner"
},
"_kernel": {
"0": "Échec du cahier de requêtes",
Expand Down Expand Up @@ -1316,7 +1318,7 @@
"102": "Traitement terminé",
"103": "Le package d'installation de la mise à jour a été automatiquement téléchargé en arrière-plan. En quittant, il vous sera demandé si vous souhaitez installer la nouvelle version",
"104": "Le package d'installation de la mise à jour n'a pas pu être téléchargé, veuillez vérifier la connexion réseau",
"105": "TODO",
"105": "Sans titre",
"106": "La longueur maximale est limitée à 512 caractères",
"107": "Document déplacé [%s]",
"108": "La synchronisation des données a trouvé des conflits, vous pouvez afficher le contenu du conflit généré dans [Historique des données]",
Expand Down
8 changes: 5 additions & 3 deletions app/appearance/langs/zh_CHT.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"removeCol": "確定刪除資料庫中的 ${x} 欄位?",
"video": "影片",
"audio": "音訊",
"updateAll": "全部更新",
Expand Down Expand Up @@ -648,7 +649,7 @@
"changeIcon": "修改圖示",
"randomIcon": "隨機圖標",
"includeSubFile": "\n包含 x 個子文檔",
"untitled": "新文檔",
"untitled": "未命名",
"lockScreen": "鎖定畫面",
"cloudIntro1": "端到端加密資料同步",
"cloudIntro2": "加密和解密過程完全在本地設備上進行",
Expand Down Expand Up @@ -1208,7 +1209,8 @@
},
"_attrView": {
"table": "表格",
"key": "主鍵"
"key": "主鍵",
"select": "單選"
},
"_kernel": {
"0": "查詢筆記本失敗",
Expand Down Expand Up @@ -1316,7 +1318,7 @@
"102": "處理完畢",
"103": "已經在後台開始自動下載更新安裝檔,退出時將詢問是否安裝新版本",
"104": "更新安裝檔下載失敗,請檢查網絡連接",
"105": "TODO",
"105": "未命名",
"106": "最大長度限制為 512 字元",
"107": "已經移動文檔 [%s]",
"108": "資料同步發現衝突,可在 [資料歷史] 中查看生成的衝突內容",
Expand Down
8 changes: 5 additions & 3 deletions app/appearance/langs/zh_CN.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"removeCol": "确定删除数据库中的 ${x} 列?",
"video": "视频",
"audio": "音频",
"updateAll": "全部更新",
Expand Down Expand Up @@ -649,7 +650,7 @@
"changeIcon": "修改图标",
"randomIcon": "随机图标",
"includeSubFile": "\n包含 x 个子文档",
"untitled": "新文档",
"untitled": "未命名",
"lockScreen": "锁定",
"cloudIntro1": "端到端加密数据同步",
"cloudIntro2": "加密和解密过程完全在本地设备上进行",
Expand Down Expand Up @@ -1210,7 +1211,8 @@
},
"_attrView": {
"table": "表格",
"key": "主键"
"key": "主键",
"select": "单选"
},
"_kernel": {
"0": "查询笔记本失败",
Expand Down Expand Up @@ -1318,7 +1320,7 @@
"102": "处理完毕",
"103": "已经在后台开始自动下载更新安装包,退出时将询问是否安装新版本",
"104": "更新安装包下载失败,请检查网络连接",
"105": "TODO",
"105": "未命名",
"106": "最大长度限制为 512 字符",
"107": "已经移动文档 [%s]",
"108": "数据同步发现冲突,可在 [数据历史] 中查看生成的冲突内容",
Expand Down
64 changes: 64 additions & 0 deletions app/changelogs/v3.0.5/v3.0.5.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
## Overview

This version supports one-click upgrade of downloaded marketplace packages.

## Changelogs

Below are the detailed changes in this version.

### Enhancement

* [One-click upgrade of downloaded marketplace packages](https://github.com/siyuan-note/siyuan/issues/8390)
* [Optimize document moving and renaming performance](https://github.com/siyuan-note/siyuan/issues/10560)
* [Search type filtering supports Audio, Video, IFrame and Widget block](https://github.com/siyuan-note/siyuan/issues/10645)
* [Improve focus export conversion of block refs to footnotes](https://github.com/siyuan-note/siyuan/issues/10647)
* [Clicking on the asset should open with the default program](https://github.com/siyuan-note/siyuan/issues/10650)
* [Unable to enter after `---`](https://github.com/siyuan-note/siyuan/issues/10653)
* [Support opening assets through other apps on the Android](https://github.com/siyuan-note/siyuan/issues/10657)
* [AI supports configuration randomness and context number](https://github.com/siyuan-note/siyuan/issues/10660)
* [Improve database table view in read-only mode](https://github.com/siyuan-note/siyuan/issues/10661)
* [Database select field supports sorting by option order](https://github.com/siyuan-note/siyuan/issues/10665)
* [No longer upload image repeatedly when copying PDF rectangle annotation](https://github.com/siyuan-note/siyuan/issues/10666)
* [Support adding multiple rows in database table view](https://github.com/siyuan-note/siyuan/issues/10667)
* [Remove translation part to simplify block AI menu](https://github.com/siyuan-note/siyuan/issues/10669)
* [Disable selection of breadcrumb blocks in backlinks](https://github.com/siyuan-note/siyuan/issues/10674)
* [`Unreferenced assets` support copy file name](https://github.com/siyuan-note/siyuan/issues/10676)
* [Improve drag fill of database table view](https://github.com/siyuan-note/siyuan/issues/10685)
* [Improve go back when dynamically loading document](https://github.com/siyuan-note/siyuan/issues/10692)
* [Cursor lost after `Copy plain text` of block](https://github.com/siyuan-note/siyuan/issues/10694)
* [Support pasting table into database table view](https://github.com/siyuan-note/siyuan/issues/10695)
* [Creating a dailynote template supports doc attributes](https://github.com/siyuan-note/siyuan/issues/10698)
* [Search result content snippet returns more text](https://github.com/siyuan-note/siyuan/issues/10707)
* [Improve export PDF window](https://github.com/siyuan-note/siyuan/issues/10711)
* [Improve database table view asset column UI](https://github.com/siyuan-note/siyuan/issues/10713)
* [Asset link element prompt shows more information](https://github.com/siyuan-note/siyuan/issues/10714)
* [Title localization when creating a document](https://github.com/siyuan-note/siyuan/issues/10719)
* [Select field is added by default when creating a database](https://github.com/siyuan-note/siyuan/issues/10720)
* [Improve the Attribute Panel - Database editing cursor style](https://github.com/siyuan-note/siyuan/issues/10721)
* [Update cursor style when drag document content](https://github.com/siyuan-note/siyuan/issues/10727)
* [A prompt pops up when deleting a column in the Attribute Panel - Database](https://github.com/siyuan-note/siyuan/issues/10729)
* [Improve flashcard more menu UI](https://github.com/siyuan-note/siyuan/issues/10735)

### Bugfix

* [Can't switch workspaces on mobile app](https://github.com/siyuan-note/siyuan/issues/10654)
* [Duplicate relation values in the Attribute Panel - Database](https://github.com/siyuan-note/siyuan/issues/10670)
* [Unable to search replace hyperlink anchor text](https://github.com/siyuan-note/siyuan/issues/10689)
* [Unable to replace `{{foo}}` in code block](https://github.com/siyuan-note/siyuan/issues/10706)
* [Line break lost after soft break of end-of-line element](https://github.com/siyuan-note/siyuan/issues/10718)
* [`<foo>` turn into `&lt;foo&gt;` when cut from a md code block to another code block](https://github.com/siyuan-note/siyuan/issues/10722)

### Refactor

* [Refactor block fold attribute](https://github.com/siyuan-note/siyuan/pull/10717)

### Development

* [Support plugin.docks configuration hotkeys](https://github.com/siyuan-note/siyuan/issues/10603)
* [Improve the type definition of `siyuan.config`](https://github.com/siyuan-note/siyuan/pull/10697)
* [Add `FormData` type for `data` in `fetchSyncPost`](https://github.com/siyuan-note/siyuan/issues/10715)

## Download

* [B3log](https://b3log.org/siyuan/en/download.html)
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
64 changes: 64 additions & 0 deletions app/changelogs/v3.0.5/v3.0.5_zh_CHT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
## 概述

此版本支援一鍵升級已下載的市集包。

## 變更記錄

以下是此版本中的詳細變更。

### 改進功能

* [支援一鍵升級已下載的市集包](https://github.com/siyuan-note/siyuan/issues/8390)
* [最佳化文件移動與重新命名效能](https://github.com/siyuan-note/siyuan/issues/10560)
* [搜尋類型過濾支援音訊、視訊、掛飾和 IFrame 區塊](https://github.com/siyuan-note/siyuan/issues/10645)
* [改進聚焦區塊匯出時引用轉換註腳](https://github.com/siyuan-note/siyuan/issues/10647)
* [點擊資源檔案時使用預設程式開啟](https://github.com/siyuan-note/siyuan/issues/10650)
* [無法在 `---` 後回車](https://github.com/siyuan-note/siyuan/issues/10653)
* [Android 端支援使用其他應用程式開啟資源檔案](https://github.com/siyuan-note/siyuan/issues/10657)
* [AI 支援配置隨機性與上下文數](https://github.com/siyuan-note/siyuan/issues/10660)
* [改進唯讀模式下資料庫表格檢視](https://github.com/siyuan-note/siyuan/issues/10661)
* [資料庫單選欄位依選項設定順序排序](https://github.com/siyuan-note/siyuan/issues/10665)
* [複製 PDF 矩形註解時不再重複插入圖片](https://github.com/siyuan-note/siyuan/issues/10666)
* [資料庫表格檢視支援一次新增多行](https://github.com/siyuan-note/siyuan/issues/10667)
* [移除 AI 選單中的翻譯部分以簡化選單](https://github.com/siyuan-note/siyuan/issues/10669)
* [反鏈面板中不再會選擇到麵包屑](https://github.com/siyuan-note/siyuan/issues/10674)
* [`未引用資源` 支援複製檔名](https://github.com/siyuan-note/siyuan/issues/10676)
* [改進資料庫表格視圖拖曳填充](https://github.com/siyuan-note/siyuan/issues/10685)
* [改進動態載入文件後的回傳操作](https://github.com/siyuan-note/siyuan/issues/10692)
* [區塊 `複製純文字` 後遊標遺失](https://github.com/siyuan-note/siyuan/issues/10694)
* [支援複製表格到資料庫表格檢視中](https://github.com/siyuan-note/siyuan/issues/10695)
* [建立日記範本支援設定文件屬性](https://github.com/siyuan-note/siyuan/issues/10698)
* [搜尋結果內容片段返回更多文字](https://github.com/siyuan-note/siyuan/issues/10707)
* [改進匯出 PDF 視窗](https://github.com/siyuan-note/siyuan/issues/10711)
* [改進資料庫表格視圖資源欄位介面](https://github.com/siyuan-note/siyuan/issues/10713)
* [資源檔案連結元素遊標懸浮提示更多資訊](https://github.com/siyuan-note/siyuan/issues/10714)
* [建立文件時在地化標題](https://github.com/siyuan-note/siyuan/issues/10719)
* [建立資料庫後預設新增單選欄位](https://github.com/siyuan-note/siyuan/issues/10720)
* [改進屬性面板 - 資料庫 編輯遊標樣式](https://github.com/siyuan-note/siyuan/issues/10721)
* [改進拖曳文件內容時的遊標樣式](https://github.com/siyuan-note/siyuan/issues/10727)
* [在屬性面板 - 資料庫 中刪除欄位時進行提示](https://github.com/siyuan-note/siyuan/issues/10729)
* [改進閃卡更多選單介面](https://github.com/siyuan-note/siyuan/issues/10735)

### 修復缺陷

* [行動端無法切換工作空間](https://github.com/siyuan-note/siyuan/issues/10654)
* [屬性面板 - 資料庫 中出現重複的關聯值](https://github.com/siyuan-note/siyuan/issues/10670)
* [無法搜尋替換超連結錨文本](https://github.com/siyuan-note/siyuan/issues/10689)
* [無法搜尋替換程式碼區塊中的 `{{foo}}`](https://github.com/siyuan-note/siyuan/issues/10706)
* [行尾元素後軟換行會遺失換行](https://github.com/siyuan-note/siyuan/issues/10718)
* [md 程式碼區塊中剪切時將 `<foo>` 誤轉換為 `&lt;foo&gt;`](https://github.com/siyuan-note/siyuan/issues/10722)

### 開發重構

* [重構塊折疊屬性](https://github.com/siyuan-note/siyuan/pull/10717)

### 開發者

* [支援 plugin.docks 配置快捷鍵](https://github.com/siyuan-note/siyuan/issues/10603)
* [改進類型定義 `siyuan.config`](https://github.com/siyuan-note/siyuan/pull/10697)
* [為 API `fetchSyncPost``data` 新增 `FormData` 類型](https://github.com/siyuan-note/siyuan/issues/10715)

## 下載

* [B3log](https://b3log.org/siyuan/download.html)
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
64 changes: 64 additions & 0 deletions app/changelogs/v3.0.5/v3.0.5_zh_CN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
## 概述

该版本支持一键升级已下载的集市包。

## 变更记录

以下是此版本中的详细变更。

### 改进功能

* [支持一键升级已下载的集市包](https://github.com/siyuan-note/siyuan/issues/8390)
* [优化文档移动和重命名性能](https://github.com/siyuan-note/siyuan/issues/10560)
* [搜索类型过滤支持音频、视频、挂件和 IFrame 块](https://github.com/siyuan-note/siyuan/issues/10645)
* [改进聚焦块导出时引用转换脚注](https://github.com/siyuan-note/siyuan/issues/10647)
* [单击资源文件时使用默认程序打开](https://github.com/siyuan-note/siyuan/issues/10650)
* [无法在 `---` 后回车](https://github.com/siyuan-note/siyuan/issues/10653)
* [Android 端支持使用其他应用打开资源文件](https://github.com/siyuan-note/siyuan/issues/10657)
* [AI 支持配置随机性和上下文数](https://github.com/siyuan-note/siyuan/issues/10660)
* [改进只读模式下数据库表格视图](https://github.com/siyuan-note/siyuan/issues/10661)
* [数据库单选字段按选项设置顺序排序](https://github.com/siyuan-note/siyuan/issues/10665)
* [复制 PDF 矩形注解时不再重复插入图片](https://github.com/siyuan-note/siyuan/issues/10666)
* [数据库表格视图支持一次性添加多行](https://github.com/siyuan-note/siyuan/issues/10667)
* [移除 AI 菜单中的翻译部分以简化菜单](https://github.com/siyuan-note/siyuan/issues/10669)
* [反链面板中不再会选择到面包屑](https://github.com/siyuan-note/siyuan/issues/10674)
* [`未引用资源` 支持复制文件名](https://github.com/siyuan-note/siyuan/issues/10676)
* [改进数据库表格视图拖拽填充](https://github.com/siyuan-note/siyuan/issues/10685)
* [改进动态加载文档后的返回操作](https://github.com/siyuan-note/siyuan/issues/10692)
* [`复制纯文本` 后光标丢失](https://github.com/siyuan-note/siyuan/issues/10694)
* [支持复制表格到数据库表格视图中](https://github.com/siyuan-note/siyuan/issues/10695)
* [创建日记模板支持设置文档属性](https://github.com/siyuan-note/siyuan/issues/10698)
* [搜索结果内容片段返回更多文本](https://github.com/siyuan-note/siyuan/issues/10707)
* [改进导出 PDF 窗口](https://github.com/siyuan-note/siyuan/issues/10711)
* [改进数据库表格视图资源字段界面](https://github.com/siyuan-note/siyuan/issues/10713)
* [资源文件链接元素光标悬浮提示更多信息](https://github.com/siyuan-note/siyuan/issues/10714)
* [创建文档时本地化标题](https://github.com/siyuan-note/siyuan/issues/10719)
* [创建数据库后默认添加单选字段](https://github.com/siyuan-note/siyuan/issues/10720)
* [改进属性面板 - 数据库 编辑光标样式](https://github.com/siyuan-note/siyuan/issues/10721)
* [改进拖拽文档内容时的光标样式](https://github.com/siyuan-note/siyuan/issues/10727)
* [在属性面板 - 数据库 中删除字段时进行提示](https://github.com/siyuan-note/siyuan/issues/10729)
* [改进闪卡更多菜单界面](https://github.com/siyuan-note/siyuan/issues/10735)

### 修复缺陷

* [移动端无法切换工作空间](https://github.com/siyuan-note/siyuan/issues/10654)
* [属性面板 - 数据库 中出现重复的关联值](https://github.com/siyuan-note/siyuan/issues/10670)
* [无法搜索替换超链接锚文本](https://github.com/siyuan-note/siyuan/issues/10689)
* [无法搜索替换代码块中的 `{{foo}}`](https://github.com/siyuan-note/siyuan/issues/10706)
* [行尾元素后软换行会丢失换行](https://github.com/siyuan-note/siyuan/issues/10718)
* [md 代码块中剪切时将 `<foo>` 误转换为 `&lt;foo&gt;`](https://github.com/siyuan-note/siyuan/issues/10722)

### 开发重构

* [重构块折叠属性](https://github.com/siyuan-note/siyuan/pull/10717)

### 开发者

* [支持 plugin.docks 配置快捷键](https://github.com/siyuan-note/siyuan/issues/10603)
* [改进类型定义 `siyuan.config`](https://github.com/siyuan-note/siyuan/pull/10697)
* [为 API `fetchSyncPost``data` 添加 `FormData` 类型](https://github.com/siyuan-note/siyuan/issues/10715)

## 下载

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

0 comments on commit 22e92ab

Please sign in to comment.