Vanessa 611d47563f Merge remote-tracking branch 'origin/dev' into dev ...

# Conflicts:
#	app/appearance/langs/en_US.json
#	app/appearance/langs/es_ES.json
#	app/appearance/langs/fr_FR.json
#	app/appearance/langs/zh_CHT.json
#	app/appearance/langs/zh_CN.json
#	app/src/config/bazaar.ts

2024-01-31 17:59:23 +08:00

..

appearance

🎨 fix https://github.com/siyuan-note/siyuan/issues/10285

2024-01-31 17:55:32 +08:00

appx

🔖 Release v2.12.6

2024-01-30 11:00:59 +08:00

changelogs

📝 Update changelogs

2024-01-31 09:44:08 +08:00

electron

🎨 fix https://github.com/siyuan-note/siyuan/issues/10254

2024-01-25 17:59:32 +08:00

guide

📝 Update flashcard user guide chapter

2024-01-28 11:36:54 +08:00

nsis

…

pandoc

…

src

Merge remote-tracking branch 'origin/dev' into dev

2024-01-31 17:59:23 +08:00

stage

🎨 Upgrade lute

2024-01-29 16:25:41 +08:00

.eslintignore

…

.eslintrc.js

…

.npmrc

…

electron-builder-darwin-arm64.yml

🎨 Update linux/macOS packing font

2024-01-23 17:03:09 +08:00

electron-builder-darwin.yml

🎨 Update linux/macOS packing font

2024-01-23 17:03:09 +08:00

electron-builder-linux.yml

🎨 Update linux/macOS packing font

2024-01-23 17:03:09 +08:00

electron-builder.yml

…

package.json

🔖 Release v2.12.6

2024-01-30 11:00:59 +08:00

pnpm-lock.yaml

♻️ Upgrade Electron v28.2.0 https://github.com/siyuan-note/siyuan/issues/10250

2024-01-25 09:55:41 +08:00

tsconfig.json

…

webpack.config.js

…

webpack.desktop.js

…

webpack.export.js

…

webpack.mobile.js

…