Skip to content

Commit

Permalink
Merge pull request #13 from TCOTC/dev
Browse files Browse the repository at this point in the history
1
  • Loading branch information
TCOTC authored May 29, 2024
2 parents 63f356b + 3bf2256 commit acb1652
Show file tree
Hide file tree
Showing 60 changed files with 703 additions and 857 deletions.
14 changes: 0 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@
* [Does it support data synchronization through a third-party sync disk?](#does-it-support-data-synchronization-through-a-third-party-sync-disk)
* [Is SiYuan open source?](#is-siyuan-open-source)
* [How to upgrade to a new version?](#how-to-upgrade-to-a-new-version)
* [How can I just wrap and not start a new paragraph?](#how-can-i-just-wrap-and-not-start-a-new-paragraph)
* [What if some blocks (such as paragraph blocks in list items) cannot find the block icon?](#what-if-some-blocks-such-as-paragraph-blocks-in-list-items-cannot-find-the-block-icon)
* [How to share notes?](#how-to-share-notes)
* [What should I do if the data repo key is lost?](#what-should-i-do-if-the-data-repo-key-is-lost)
* [Do I need to pay for it?](#do-i-need-to-pay-for-it)
* [🙏 Acknowledgement](#-acknowledgement)
Expand Down Expand Up @@ -321,22 +319,10 @@ For more details, please refer to [Development Guide](https://github.com/siyuan-

You can <kbd>Check update</kbd> in <kbd>Settings</kbd> - <kbd>About</kbd> - <kbd>Current Version</kbd>, or pay attention to [Official Download](https://b3log.org/siyuan/en/download.html) or [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) to get the new version.

### How can I just wrap and not start a new paragraph?

Please use <kbd>Shift+Enter</kbd>.

### What if some blocks (such as paragraph blocks in list items) cannot find the block icon?

The first sub-block under the list item is the block icon omitted. You can move the cursor into this block and trigger its block menu with <kbd>Ctrl+/</kbd> .

### How to share notes?

* Share document to Liandi
* Export and import `.sy.zip` package
* Via network hosting
* Export and import Markdown
* <kbd>Export Preview</kbd> to copy to third-party online services

### What should I do if the data repo key is lost?

* If the data repo key is correctly initialized on multiple devices before, the key is the same on all devices and can be set in <kbd>Settings</kbd> - <kbd>About</kbd> - <kbd>Data repo key</kbd> - <kbd>Copy key string</kbd> retrieve
Expand Down
14 changes: 0 additions & 14 deletions README_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@
* [支持通过第三方同步盘进行数据同步吗?](#支持通过第三方同步盘进行数据同步吗)
* [思源是开源的吗?](#思源是开源的吗)
* [如何升级到新版本?](#如何升级到新版本)
* [如何才能只换行不新起段落?](#如何才能只换行不新起段落)
* [有的块(比如在列表项中的段落块)找不到块标怎么办?](#有的块比如在列表项中的段落块找不到块标怎么办)
* [如何分享笔记?](#如何分享笔记)
* [数据仓库密钥遗失怎么办?](#数据仓库密钥遗失怎么办)
* [使用需要付费吗?](#使用需要付费吗)
* [🙏 鸣谢](#-鸣谢)
Expand Down Expand Up @@ -326,22 +324,10 @@ Publish parameters: --accessAuthCode=******(访问授权码)

**注意**:切勿将工作空间放置于安装目录下,因为更新版本会清空安装目录下的所有文件

### 如何才能只换行不新起段落?

请使用 <kbd>Shift+Enter</kbd>。

### 有的块(比如在列表项中的段落块)找不到块标怎么办?

在列表项下的第一个子块是省略块标的。可以将光标移到这个块中,然后通过 <kbd>Ctrl+/</kbd> 触发它的块标菜单。

### 如何分享笔记?

* 分享文档到链滴
* 导出导入 `.sy.zip` 数据包
* 通过网络伺服
* 导出导入 Markdown
* <kbd>导出预览</kbd> 中复制到第三方在线服务

### 数据仓库密钥遗失怎么办?

* 如果之前在多个设备上正确初始化过数据仓库密钥的话,那么该密钥在所有设备上都是相同的,可以在 <kbd>设置</kbd> - <kbd>关于</kbd> - <kbd>数据仓库密钥</kbd> - <kbd>复制密钥字符串</kbd> 找回
Expand Down
2 changes: 1 addition & 1 deletion app/appx/AppxManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Identity Name="89C2A984.SiYuan"
ProcessorArchitecture="x64"
Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
Version="3.0.15.0"/>
Version="3.0.16.0"/>
<Properties>
<DisplayName>SiYuan</DisplayName>
<PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>
Expand Down
59 changes: 59 additions & 0 deletions app/changelogs/v3.0.16/v3.0.16.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
## Overview

This version improves web page clipping, fixes some bugs and improves a lot of details.

## Changelogs

Below are the detailed changes in this version.

### Enhancement

* [Expand the judgment area for dragging split screen](https://github.com/siyuan-note/siyuan/issues/11014)
* [Document floating window supports `Open in New Tab`](https://github.com/siyuan-note/siyuan/issues/11127)
* [Improve marketplace UI](https://github.com/siyuan-note/siyuan/issues/11216)
* [Improve browser extension clipping for Zhihu answer](https://github.com/siyuan-note/siyuan/issues/11330)
* [Improve the caret position after pressing Backspace in the list](https://github.com/siyuan-note/siyuan/issues/11366)
* [Font Size and Code Tab Spaces setting changed to select on the mobile](https://github.com/siyuan-note/siyuan/issues/11415)
* [Improve the direction of text, table columns, and horizontal overflow](https://github.com/siyuan-note/siyuan/issues/11455)
* [Improve copying database block](https://github.com/siyuan-note/siyuan/issues/11460)
* [Improve HTML a and img clipping](https://github.com/siyuan-note/siyuan/issues/11485)
* [Export the binding block docs when exporting the doc where the database is located](https://github.com/siyuan-note/siyuan/issues/11486)
* [Support database asset image copy-pasting](https://github.com/siyuan-note/siyuan/issues/11487)
* [Improve database text, email, url and phone field content escaping](https://github.com/siyuan-note/siyuan/issues/11489)
* [Use real theme style value replace var in preview mode](https://github.com/siyuan-note/siyuan/issues/11490)
* [Support triggering tag selection via `#`](https://github.com/siyuan-note/siyuan/issues/11494)
* [Improve kernel stability](https://github.com/siyuan-note/siyuan/issues/11497)
* [Improve inline memo export](https://github.com/siyuan-note/siyuan/issues/11503)
* [Supports configuring `Unsplit` and `Unsplit All` hotkeys](https://github.com/siyuan-note/siyuan/issues/11510)
* [Improve keymaps searching](https://github.com/siyuan-note/siyuan/issues/11511)
* [Refresh the read-only status of a single doc after data synchronization](https://github.com/siyuan-note/siyuan/issues/11517)
* [Improve HTML strong clipping](https://github.com/siyuan-note/siyuan/issues/11526)
* [Improv drag and drop in outline panel](https://github.com/siyuan-note/siyuan/issues/11529)
* [Improve code snippet searching](https://github.com/siyuan-note/siyuan/issues/11534)
* [The keyword search logic in-database is changed from OR to AND](https://github.com/siyuan-note/siyuan/issues/11535)
* [Improve global search type sorting](https://github.com/siyuan-note/siyuan/issues/11537)
* [Improve floating link tip style](https://github.com/siyuan-note/siyuan/issues/11539)
* [Improve HTML code block clipping](https://github.com/siyuan-note/siyuan/issues/11540)
* [Improve browser extension HTML img clipping](https://github.com/siyuan-note/siyuan/issues/11541)
* [Briefly highlight the target block after a block reference jump](https://github.com/siyuan-note/siyuan/issues/11542)
* [Improve Ctrl+F to open search dialog](https://github.com/siyuan-note/siyuan/issues/11543)
* [Improve database relation field filtering](https://github.com/siyuan-note/siyuan/issues/11547)

### Abolishment

* [Opening the user guide is no longer supported on iOS](https://github.com/siyuan-note/siyuan/issues/11492)
* [Macro definitions are no longer expanded when exporting formulas](https://github.com/siyuan-note/siyuan/issues/11500)
* [The Microsoft Store version no longer supports in-app updates checking](https://github.com/siyuan-note/siyuan/issues/11505)

### Bugfix

* [The compressed package exported from the cloud configuration cannot be imported after being renamed](https://github.com/siyuan-note/siyuan/issues/11491)
* [HTML block content escaping is incorrect](https://github.com/siyuan-note/siyuan/issues/11499)
* [Inline code rendering error when creating ref doc by `F3`](https://github.com/siyuan-note/siyuan/issues/11538)
* [The database last row misaligned after adding line number field](https://github.com/siyuan-note/siyuan/issues/11545)
* [Document exception after focus dragging](https://github.com/siyuan-note/siyuan/issues/11555)

## Download

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

這個版本改進了網頁剪藏、修復了一些缺陷並改進了許多細節。

## 變更記錄

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

### 改進功能

* [擴大拖曳分割畫面的判斷區域](https://github.com/siyuan-note/siyuan/issues/11014)
* [文件浮窗支援 `在新頁籤中開啟`](https://github.com/siyuan-note/siyuan/issues/11127)
* [改進市集介面](https://github.com/siyuan-note/siyuan/issues/11216)
* [改進知乎回答的瀏覽器擴充功能片段](https://github.com/siyuan-note/siyuan/issues/11330)
* [改進在清單中按退格鍵後的遊標位置](https://github.com/siyuan-note/siyuan/issues/11366)
* [字體大小和代碼 Tab 空格設定在行動裝置上改為選擇](https://github.com/siyuan-note/siyuan/issues/11415)
* [改進文字、表格列和水平佈局的方向](https://github.com/siyuan-note/siyuan/issues/11455)
* [改進複製資料庫區塊](https://github.com/siyuan-note/siyuan/issues/11460)
* [改良 HTML a 與 img 剪藏](https://github.com/siyuan-note/siyuan/issues/11485)
* [匯出資料庫所在文件時匯出綁定區塊文件](https://github.com/siyuan-note/siyuan/issues/11486)
* [支援資料庫資源圖片複製貼上](https://github.com/siyuan-note/siyuan/issues/11487)
* [改進資料庫文字、郵件、URL 和電話欄位內容的轉義](https://github.com/siyuan-note/siyuan/issues/11489)
* [在預覽模式下使用真實主題樣式值替換變數](https://github.com/siyuan-note/siyuan/issues/11490)
* [支援透過 `#` 觸發標籤選擇](https://github.com/siyuan-note/siyuan/issues/11494)
* [改進內核穩定性](https://github.com/siyuan-note/siyuan/issues/11497)
* [改為級備註導出](https://github.com/siyuan-note/siyuan/issues/11503)
* [支援設定 `取消分割畫面``取消全部分螢幕` 快速鍵](https://github.com/siyuan-note/siyuan/issues/11510)
* [改進快捷鍵搜尋](https://github.com/siyuan-note/siyuan/issues/11511)
* [資料同步後刷新單一文件的唯讀狀態](https://github.com/siyuan-note/siyuan/issues/11517)
* [改進 HTML strong 剪藏](https://github.com/siyuan-note/siyuan/issues/11526)
* [改進大綱面板中的拖曳](https://github.com/siyuan-note/siyuan/issues/11529)
* [改進程式碼片段搜尋](https://github.com/siyuan-note/siyuan/issues/11534)
* [資料庫中的關鍵字搜尋邏輯從 OR 改為 AND](https://github.com/siyuan-note/siyuan/issues/11535)
* [改進全域搜尋類型排序](https://github.com/siyuan-note/siyuan/issues/11537)
* [改進連結懸浮提示樣式](https://github.com/siyuan-note/siyuan/issues/11539)
* [改進 HTML 程式碼區塊剪藏](https://github.com/siyuan-note/siyuan/issues/11540)
* [改進瀏覽器擴充 HTML img 剪藏](https://github.com/siyuan-note/siyuan/issues/11541)
* [區塊引用跳轉後短暫高亮目標區塊](https://github.com/siyuan-note/siyuan/issues/11542)
* [改進 Ctrl+F 開啟搜尋對話方塊](https://github.com/siyuan-note/siyuan/issues/11543)
* [改進資料庫關聯欄位過濾](https://github.com/siyuan-note/siyuan/issues/11547)

### 移除功能

* [iOS 上不再支援開啟使用者指南](https://github.com/siyuan-note/siyuan/issues/11492)
* [匯出公式時不再展開巨集定義](https://github.com/siyuan-note/siyuan/issues/11500)
* [微軟商店版不再支援應用程式內更新檢查](https://github.com/siyuan-note/siyuan/issues/11505)

### 修復缺陷

* [雲端設定匯出的壓縮套件在重新命名後無法匯入](https://github.com/siyuan-note/siyuan/issues/11491)
* [HTML 區塊內容轉義不正確](https://github.com/siyuan-note/siyuan/issues/11499)
* [使用 `F3` 建立引用文件時行級程式碼渲染錯誤](https://github.com/siyuan-note/siyuan/issues/11538)
* [新增行號欄位後資料庫最後一行未對齊](https://github.com/siyuan-note/siyuan/issues/11545)
* [聚焦後拖曳文件異常](https://github.com/siyuan-note/siyuan/issues/11555)

## 下載

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

该版本改进了网页剪藏、修复了一些缺陷并改进了很多细节。

## 变更记录

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

### 改进功能

* [扩大拖拽分屏的判断区域](https://github.com/siyuan-note/siyuan/issues/11014)
* [文档浮窗支持 `在新页签中打开`](https://github.com/siyuan-note/siyuan/issues/11127)
* [改进集市界面](https://github.com/siyuan-note/siyuan/issues/11216)
* [改进知乎回答的浏览器扩展剪藏](https://github.com/siyuan-note/siyuan/issues/11330)
* [改进在列表中按退格键后的光标位置](https://github.com/siyuan-note/siyuan/issues/11366)
* [字体大小和代码 Tab 空格设置在移动设备上改为选择](https://github.com/siyuan-note/siyuan/issues/11415)
* [改进文本、表格列和水平布局的方向](https://github.com/siyuan-note/siyuan/issues/11455)
* [改进复制数据库块](https://github.com/siyuan-note/siyuan/issues/11460)
* [改进 HTML a 和 img 剪藏](https://github.com/siyuan-note/siyuan/issues/11485)
* [导出数据库所在文档时导出绑定块文档](https://github.com/siyuan-note/siyuan/issues/11486)
* [支持数据库资源图片复制粘贴](https://github.com/siyuan-note/siyuan/issues/11487)
* [改进数据库文本、邮件、URL 和电话字段内容的转义](https://github.com/siyuan-note/siyuan/issues/11489)
* [在预览模式下使用真实主题样式值替换变量](https://github.com/siyuan-note/siyuan/issues/11490)
* [支持通过 `#` 触发标签选择](https://github.com/siyuan-note/siyuan/issues/11494)
* [改进内核稳定性](https://github.com/siyuan-note/siyuan/issues/11497)
* [改进行级备注导出](https://github.com/siyuan-note/siyuan/issues/11503)
* [支持配置 `取消分屏``取消全部分屏` 快捷键](https://github.com/siyuan-note/siyuan/issues/11510)
* [改进快捷键搜索](https://github.com/siyuan-note/siyuan/issues/11511)
* [数据同步后刷新单个文档的只读状态](https://github.com/siyuan-note/siyuan/issues/11517)
* [改进 HTML strong 剪藏](https://github.com/siyuan-note/siyuan/issues/11526)
* [改进大纲面板中的拖拽](https://github.com/siyuan-note/siyuan/issues/11529)
* [改进代码片段搜索](https://github.com/siyuan-note/siyuan/issues/11534)
* [数据库中的关键字搜索逻辑从 OR 改为 AND](https://github.com/siyuan-note/siyuan/issues/11535)
* [改进全局搜索类型排序](https://github.com/siyuan-note/siyuan/issues/11537)
* [改进链接悬浮提示样式](https://github.com/siyuan-note/siyuan/issues/11539)
* [改进 HTML 代码块剪藏](https://github.com/siyuan-note/siyuan/issues/11540)
* [改进浏览器扩展 HTML img 剪藏](https://github.com/siyuan-note/siyuan/issues/11541)
* [块引用跳转后短暂高亮目标块](https://github.com/siyuan-note/siyuan/issues/11542)
* [改进 Ctrl+F 打开搜索对话框](https://github.com/siyuan-note/siyuan/issues/11543)
* [改进数据库关联字段过滤](https://github.com/siyuan-note/siyuan/issues/11547)

### 移除功能

* [iOS 上不再支持打开用户指南](https://github.com/siyuan-note/siyuan/issues/11492)
* [导出公式时不再展开宏定义](https://github.com/siyuan-note/siyuan/issues/11500)
* [微软商店版不再支持应用内更新检查](https://github.com/siyuan-note/siyuan/issues/11505)

### 修复缺陷

* [云端配置导出的压缩包在重命名后无法导入](https://github.com/siyuan-note/siyuan/issues/11491)
* [HTML 块内容转义不正确](https://github.com/siyuan-note/siyuan/issues/11499)
* [使用 `F3` 创建引用文档时行级代码渲染错误](https://github.com/siyuan-note/siyuan/issues/11538)
* [添加行号字段后数据库最后一行未对齐](https://github.com/siyuan-note/siyuan/issues/11545)
* [聚焦后拖拽文档异常](https://github.com/siyuan-note/siyuan/issues/11555)

## 下载

* [B3log](https://b3log.org/siyuan/download.html)
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
75 changes: 75 additions & 0 deletions app/electron-builder-arm64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
productName: "SiYuan"
appId: "org.b3log.siyuan"
asar: false
compression: "store"
copyright: "© 2024 Yunnan Liandi Technology Co., Ltd."
artifactName: "siyuan-${version}-${os}-arm64.${ext}"
extraMetadata:
main: "electron/main.js"
directories:
output: "build"
files:
- "electron"
extraFiles:
- from: "../LICENSE"
to: "LICENSE"
win:
icon: "src/assets/icon.ico"
extraResources:
- from: "kernel-arm64"
to: "kernel"
requestedExecutionLevel: "asInvoker"
# certificateSubjectName: "Yunnan Liandi Technology Co., Ltd."
signingHashAlgorithms: [ 'sha256' ]
#rfc3161TimeStampServer: "http://sha256timestamp.ws.symantec.com/sha256/timestamp"
#rfc3161TimeStampServer: "http://time.certum.pl"
rfc3161TimeStampServer: "http://timestamp.entrust.net/TSS/RFC3161sha2TS"
target:
- target: "nsis"
arch: "arm64"
nsis:
oneClick: false
perMachine: false
allowToChangeInstallationDirectory: true
allowElevation: true
deleteAppDataOnUninstall: true
createDesktopShortcut: true
createStartMenuShortcut: true
shortcutName: "SiYuan"
license: "../LICENSE"
include: "nsis/installer.nsh"
warningsAsErrors: false
installerSidebar: "nsis/installerSidebar.bmp"
uninstallerSidebar: "nsis/uninstallerSidebar.bmp"

extraResources:
- from: "changelogs"
to: "changelogs"
- from: "stage"
to: "stage"
- from: "guide"
to: "guide"
filter: "!**/{.DS_Store,.git,.gitignore,.idea}"
- from: "appearance/boot"
to: "appearance/boot"
filter: "!**/{.DS_Store}"
- from: "appearance/icons"
to: "appearance/icons"
filter: "!**/{.DS_Store}"
- from: "appearance/langs"
to: "appearance/langs"
filter: "!**/{.DS_Store}"
- from: "appearance/emojis"
to: "appearance/emojis"
filter: "!**/{.DS_Store}"
- from: "appearance/themes/midnight"
to: "appearance/themes/midnight"
filter: "!**/{.DS_Store,custom.css}"
- from: "appearance/themes/daylight"
to: "appearance/themes/daylight"
filter: "!**/{.DS_Store,custom.css}"
- from: "src/assets/fonts"
to: "appearance/fonts"
filter: "!**/{.DS_Store}"
- from: "pandoc/pandoc-windows-amd64.zip"
to: "pandoc.zip"
Loading

0 comments on commit acb1652

Please sign in to comment.