diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index ca9e11697..000000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,63 +0,0 @@ -[中文](CONTRIBUTING_zh_CN.md) - -## Get the source code - -* `git clone --depth=1 git@github.com:siyuan-note/siyuan.git` -* switch to dev branch `git checkout dev` - -Note: `app/stage/protyle/**` is managed by git lfs, and you don't need to pay attention to it under normal circumstances, related to [#9253](https://github.com/siyuan-note/siyuan/issues/9253). - -## User Interface - -Install pnpm: `npm install -g pnpm` - -
-For China mainland - -Set the Electron mirror environment variable and install Electron: - -* macOS/Linux: `ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/ pnpm install electron@28.1.4 -D` -* Windows: - * `SET ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/` - * `pnpm install electron@28.1.4 -D` - -NPM mirror: - -* Use npmmirror China mirror repository `pnpm --registry https://registry.npmmirror.com/ i` -* Revert to using official repository `pnpm --registry https://registry.npmmirror.com i` - -
- -On the desktop, go to the app folder to run: - -* `pnpm install electron@28.1.4 -D` -* `pnpm run dev` -* `pnpm run start` - -Note: In the development environment, the kernel process will not be automatically started, and you need to manually start the kernel process first. - -## Kernel - -1. Install the latest version of [golang](https://go.dev/) -2. Open CGO support, that is, configure the environment variable `CGO_ENABLED=1` - -### Desktop - -* `cd kernel` -* `go build --tags "fts5" -o "../app/kernel/SiYuan-Kernel.exe"` -* `cd ../app/kernel` -* `./SiYuan-Kernel.exe --wd=.. --mode=dev` - -### iOS - -* `cd kernel` -* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o ./ios/iosk.xcframework -target=ios ./mobile/` -* https://github.com/siyuan-note/siyuan-ios - -### Android - -* `cd kernel` -* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' -androidapi 24 ./mobile/` -* https://github.com/siyuan-note/siyuan-android - -For the mobile-end, please refer to the corresponding project repository. diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md deleted file mode 100644 index e095b1003..000000000 --- a/.github/CONTRIBUTING_zh_CN.md +++ /dev/null @@ -1,65 +0,0 @@ -[English](CONTRIBUTING.md) - -## 获取源码 - -* `git clone --depth=1 git@github.com:siyuan-note/siyuan.git` -* 切换到 dev 分支 `git checkout dev` - -备注：`app/stage/protyle/**` 使用 git lfs 管理，正常情况下无需关注，关联 [#9253](https://github.com/siyuan-note/siyuan/issues/9253)。 - -## NPM 依赖 - -安装 pnpm：`npm install -g pnpm` - -
-适用于中国大陆 - -设置 Electron 镜像环境变量并安装 Electron： - -* macOS/Linux: - ``` - ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/ pnpm install electron@28.1.4 -D - ``` -* Windows: - * `SET ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/` - * `pnpm install electron@28.1.4 -D` - -NPM 镜像： - -* 使用 npmmirror 中国镜像仓库 `pnpm --registry https://registry.npmmirror.com/ i` -* 恢复使用官方仓库 `pnpm --registry https://registry.npmmirror.com i` -
- -桌面端进入 app 文件夹运行： - -* `pnpm install electron@28.1.4 -D` -* `pnpm run dev` -* `pnpm run start` - -注意：在开发环境下不会自动拉起内核进程，需要先手动拉起内核进程。 - -## 内核 - -1. 安装最新版 [golang](https://go.dev/) -2. 打开 CGO 支持，即配置环境变量 `CGO_ENABLED=1` - -### 桌面端 - -* `cd kernel` -* `go build --tags "fts5" -o "../app/kernel/SiYuan-Kernel.exe"` -* `cd ../app/kernel` -* `./SiYuan-Kernel.exe --wd=.. --mode=dev` - -### iOS - -* `cd kernel` -* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o ./ios/iosk.xcframework -target=ios ./mobile/` -* https://github.com/siyuan-note/siyuan-ios - -### Android - -* `cd kernel` -* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' -androidapi 24 ./mobile/` -* https://github.com/siyuan-note/siyuan-android - -移动端请参考对应项目仓库。 diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml deleted file mode 100644 index 238bea1af..000000000 --- a/.github/workflows/dockerimage.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Release Docker Image - -on: - workflow_dispatch: - push: - branches: - - master - -jobs: - build: - name: build - runs-on: ubuntu-latest - - permissions: - packages: write - contents: read - - steps: - - name: Free Disk Space (Ubuntu) - uses: jlumbroso/free-disk-space@main - with: - # this might remove tools that are actually needed, - # if set to "true" but frees about 6 GB - tool-cache: false - - # all of these default to true, but feel free to set to - # "false" if necessary for your workflow - android: true - dotnet: true - haskell: true - large-packages: true - docker-images: true - swap-storage: true - - - name: Check out the repo - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Setup Docker buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_HUB_USER }} - password: ${{ secrets.DOCKER_HUB_PWD }} - - - 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.12.5 . diff --git a/README.md b/README.md index 343fbdb68..ec47a8ebf 100644 --- a/README.md +++ b/README.md @@ -218,7 +218,7 @@ services: ### 安装包 -* [B3log](https://b3log.org/siyuan/download.html) +* [B3log](https://github.com/appdev/siyuan-unlock/releases) * [GitHub](https://github.com/siyuan-note/siyuan/releases) ### 内部预览版 @@ -279,7 +279,7 @@ services: * 如果是桌面端通过安装包安装的，可打开 设置 - 关于 - 自动下载更新安装包 选项，这样思源会自动下载最新版安装包并提示安装 * 如果是通过手动安装包安装的，请再次下载安装包安装 -可在 设置 - 关于 - 当前版本 中 检查更新，也可以通过关注[官方下载](https://b3log.org/siyuan/download.html)或者 [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) 来获取新版本。 +可在 设置 - 关于 - 当前版本 中 检查更新，也可以通过关注[官方下载](https://github.com/appdev/siyuan-unlock/releases)或者 [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) 来获取新版本。 **注意**：切勿将工作空间放置于安装目录下，因为更新版本会清空安装目录下的所有文件 diff --git a/README_zh_CN.md b/README_zh_CN.md index 1ef1004a2..be46c9363 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -198,7 +198,7 @@ services: ### 安装包 -* [B3log](https://b3log.org/siyuan/download.html) +* [B3log](https://github.com/appdev/siyuan-unlock/releases) * [GitHub](https://github.com/siyuan-note/siyuan/releases) ### 内部预览版 @@ -259,7 +259,7 @@ services: * 如果是桌面端通过安装包安装的，可打开 设置 - 关于 - 自动下载更新安装包 选项，这样思源会自动下载最新版安装包并提示安装 * 如果是通过手动安装包安装的，请再次下载安装包安装 -可在 设置 - 关于 - 当前版本 中 检查更新，也可以通过关注[官方下载](https://b3log.org/siyuan/download.html)或者 [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) 来获取新版本。 +可在 设置 - 关于 - 当前版本 中 检查更新，也可以通过关注[官方下载](https://github.com/appdev/siyuan-unlock/releases)或者 [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) 来获取新版本。 **注意**：切勿将工作空间放置于安装目录下，因为更新版本会清空安装目录下的所有文件 diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 742a365ee..5700e46e1 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1041,7 +1041,7 @@ "about18": "Cuando se utiliza una dirección sin bucle invertido (127.0.0.1/[::1] ) Primero configure el Código de autorización de acceso", "checkUpdate": "Comprobar actualización", "currentVer": "Versión actual", - "downloadLatestVer": "Descargar la última versión", + "downloadLatestVer": "Descargar la última versión", "themeLight": "Claro", "themeDark": "Oscuro", "themeOS": "Sigue el sistema", @@ -1404,4 +1404,4 @@ "231": "Eliminar objetos de datos no referenciados en el almacenamiento en la nube...", "232": "Se ha eliminado el almacenamiento de datos en la nube. Se han eliminado [%d] instantáneas y [%d] objetos de datos, y se ha liberado un total de [%s] espacio en disco" } -} +} \ No newline at end of file diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 972226591..661ad8143 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1041,7 +1041,7 @@ "about18": "使用非環回地址（127.0.0.1/[::1]）時請先設置訪問授權碼", "checkUpdate": "檢查更新", "currentVer": "當前版本", - "downloadLatestVer": "下載最新版", + "downloadLatestVer": "下載最新版", "themeLight": "淺色", "themeDark": "深色", "themeOS": "跟隨系統", @@ -1404,4 +1404,4 @@ "231": "正在刪除雲端儲存未引用資料物件...", "232": "雲端資料儲存清理完畢，已刪除 [%d] 個快照和 [%d] 個資料對象，共釋放 [%s] 磁碟空間" } -} +} \ No newline at end of file diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index deafe53ad..4b95535f9 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1041,7 +1041,7 @@ "about18": "使用非环回地址（127.0.0.1/[::1]）时请先设置 访问授权码", "checkUpdate": "检查更新", "currentVer": "当前版本", - "downloadLatestVer": "下载最新版", + "downloadLatestVer": "下载最新版", "themeLight": "明亮", "themeDark": "暗黑", "themeOS": "跟随系统", @@ -1404,4 +1404,4 @@ "231": "正在删除云端存储未引用数据对象...", "232": "云端数据存储清理完毕，已删除 [%d] 个快照和 [%d] 个数据对象，共释放 [%s] 磁盘空间" } -} +} \ No newline at end of file diff --git a/app/electron/error.html b/app/electron/error.html index 0f7e4285a..f5fc5c3fc 100644 --- a/app/electron/error.html +++ b/app/electron/error.html @@ -1,5 +1,6 @@ + Error - SiYuan @@ -131,64 +132,72 @@ } + -
-
-

-
-
-
-
- 求助反馈建议 - 下载最新版 +
+
+

+
+
+
+ + +
- -
-
- - - - - - - -
- + + document.getElementById('close').addEventListener('click', () => { + const { ipcRenderer } = require('electron') + ipcRenderer.send("siyuan-cmd", "destroy"); + }) + document.getElementById('min').addEventListener('click', () => { + const { ipcRenderer } = require('electron') + ipcRenderer.send("siyuan-cmd", "minimize"); + }) + - + + \ No newline at end of file diff --git a/app/electron/init.html b/app/electron/init.html index 8624ebda6..b913234ab 100644 --- a/app/electron/init.html +++ b/app/electron/init.html @@ -1,5 +1,6 @@ + SiYuan @@ -72,7 +73,8 @@ width: 96px; } - .b3-button:hover, .b3-button:focus { + .b3-button:hover, + .b3-button:focus { text-decoration: none; background-color: #0969da; box-shadow: 0px 2px 4px -1px rgba(0, 0, 0, 0.2), 0px 4px 5px 0px rgba(0, 0, 0, 0.14), 0px 1px 10px 0px rgba(0, 0, 0, 0.12) @@ -190,310 +192,321 @@ } + -
-
- -

思源笔记

-
重构你的思维
-
-