Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #9885

Closed
wants to merge 20 commits into from
Closed

Develop #9885

wants to merge 20 commits into from

Conversation

EightDoor
Copy link

@EightDoor EightDoor commented Dec 14, 2023

  • Please commit to the dev branch
  • For contributing new features, please supplement and improve the corresponding user guide documents
  • For bug fixes, please describe the problem and solution via code comments
  • For text improvements (such as typos and wording adjustments), please submit directly

* commit 'a63e1fda2e203917ae7f72cb359155f4094c4f3e': (217 commits)
  ⚡ Improve block loading performance on Windows/Linux/macOS amd64 arch siyuan-note#9084
  💄
  ⚡ Improve block loading performance on Windows/Linux/macOS amd64 arch siyuan-note#9084
  🐛 Block hyperlinks do not point to regenerated block IDs when importing .sy.zip siyuan-note#9083
  🎨 Reduce the memory usage of PDF asset file content parsing on the mobile siyuan-note#9079
  🎨 HTTPS certificate is no longer verified when `Convert network images to local images` siyuan-note#9080
  🐛 fix siyuan-note#9076
  🐛 fix siyuan-note#9076
  🐛
  🎨 siyuan-note#9068
  🎨 Improve the response status code of  kernel API `/api/file/getFile` siyuan-note#9075
  Improve the response status code of  kernel API `/api/file/getFile` (siyuan-note#9075)
  ✨ siyuan-note#9032siyuan-note#9032
  🐛 The update button is not displayed after the marketplace package version is updated Fix siyuan-note#9074siyuan-note#9032
  🎨 Improve asset file content search preview escaping siyuan-note#9073
  🎨 Improve asset file content search preview escaping siyuan-note#9073
  🎨 Improve EPUB asset file content parsing siyuan-note#9072
  ♻️ siyuan-note#9032
  ...

# Conflicts:
#	README.md
* commit '097501c84c56d5a0083a5bd29fc7efe686ee70b9': (82 commits)
  🎨 fix siyuan-note#9123
  🐛 fix siyuan-note#9135
  🎨 Remove av block also remove node attr siyuan-note#9091 (comment)
  🎨 Remove av block also remove node attr siyuan-note#9091 (comment)
  🎨 Remove av block also remove node attr siyuan-note#9091 (comment)
  🎨 Update av
  🐛 siyuan-note#9126
  💄
  🐛 The image file name is too long and truncated abnormally Fix siyuan-note#9129
  💄
  🎨 The cloud sync directory name (Bucket) supports up to 63 characters siyuan-note#9130
  🔥 Revert Improve block loading performance on Windows/Linux/macOS amd64 arch Fix siyuan-note#9131
  💄
  📱 fix siyuan-note#9113
  📱 fix siyuan-note#9127
  📱  fix siyuan-note#9111
  📱  fix siyuan-note#9111
  🚨
  ⚡ Improve block loading performance on Windows/Linux/macOS amd64 arch siyuan-note#9084
  🎨 Update text
  ...
* develop: (82 commits)
  🎨 fix siyuan-note#9123
  🐛 fix siyuan-note#9135
  🎨 Remove av block also remove node attr siyuan-note#9091 (comment)
  🎨 Remove av block also remove node attr siyuan-note#9091 (comment)
  🎨 Remove av block also remove node attr siyuan-note#9091 (comment)
  🎨 Update av
  🐛 siyuan-note#9126
  💄
  🐛 The image file name is too long and truncated abnormally Fix siyuan-note#9129
  💄
  🎨 The cloud sync directory name (Bucket) supports up to 63 characters siyuan-note#9130
  🔥 Revert Improve block loading performance on Windows/Linux/macOS amd64 arch Fix siyuan-note#9131
  💄
  📱 fix siyuan-note#9113
  📱 fix siyuan-note#9127
  📱  fix siyuan-note#9111
  📱  fix siyuan-note#9111
  🚨
  ⚡ Improve block loading performance on Windows/Linux/macOS amd64 arch siyuan-note#9084
  🎨 Update text
  ...
* commit '7a7af86b11b6ded088bc3db6769dd63f1ce6229f': (26 commits)
  🎨 aria label
  🎨 Pandoc template for exporting docx Fix siyuan-note#8740
  🎨 Pandoc template for exporting docx Fix siyuan-note#8740
  🎨 Cancel the read-only mode message notification after startup Fix siyuan-note#9100
  🎨 siyuan-note#8417
  🐛 An issue that caused cloud data corruption Fix siyuan-note#9144
  🐛 fix siyuan-note#9142
  🐛 fix siyuan-note#9141
  🐛 fix siyuan-note#9141
  🎨 Set Adaptive Width for individual documents siyuan-note#9107
  🎨 siyuan-note#9107
  🎨 siyuan-note#9134
  ♻️
  🎨 siyuan-note#9134
  🎨 Physically delete a workspace on the mobile siyuan-note#9134
  🎨 Physically delete a workspace on the mobile siyuan-note#9134
  🎨 fix siyuan-note#9134
  🎨 fix siyuan-note#9140
  🎨 Physically delete a workspace on the mobile siyuan-note#9134
  🔖 Release v2.10.4
  ...
* commit 'a84cd4a6dd0b4afd7b082ae40377427b4eb6449b': (63 commits)
  🐛 fix siyuan-note#9178
  🎨 fix siyuan-note#9184
  🎨 dock
  🎨 resize
  🎨 resize
  🎨 siyuan-note#9182
  🎨 Improve update tx
  🎨 Improve update tx
  📝 https://ld246.com/article/1694622447855
  🎨 Improve update tx
  📝 https://ld246.com/article/1694622447855
  🎨 Sort tx queue Undo and then redo after Shift+Enter trigger status exception siyuan-note#9178
  🎨  siyuan-note#9152
  🎨 fix siyuan-note#9152
  🎨 fix siyuan-note#9179
  🎨 fix siyuan-note#9179
  🔒 Authenticate requests with the Origin header other than 127.0.0.1 Fix siyuan-note#9180
  🎨 fix siyuan-note#9177
  🎨 Update text code block line num tip
  🎨 tooltip
  ...

# Conflicts:
#	app/src/config/account.ts
* commit '05495e70643a42e902ccfc4246055e4257f7b12c': (314 commits)
  🎨 siyuan-note#9303
  🎨 fix siyuan-note#9358
  🎨 Block ref anchor text no longer contains contents of inline-level memos siyuan-note#9363
  🎨 Block ref anchor text no longer contains contents of inline-level memos siyuan-note#9363
  🎨 fix siyuan-note#9362
  🎨 Improve bookmark panel rendering siyuan-note#9361
  🎨
  💄 siyuan-note#9359
  🎨 database
  🎨 database
  🎨 Database column icon siyuan-note#9304
  🎨 Database column icon siyuan-note#9304
  🎨 database
  🎨 database
  🎨 Database column icon siyuan-note#9304
  🎨 Database template col type
  💄 https://ld246.com/article/1696512420662
  🐛 focus av
  🎨 fix siyuan-note#9351
  🎨 Perform indexing in the background when moving a large number of documents Fix siyuan-note#9356
  ...

# Conflicts:
#	README.md
#	kernel/model/conf.go
Copy link

Your PR was set to target master, PRs should be target dev
The base branch of this PR has been automatically changed to dev, please check that there are no merge conflicts

@github-actions github-actions bot changed the base branch from master to dev December 14, 2023 15:03
@EightDoor EightDoor closed this Dec 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant