Merge Upstream Changes
What does this PR do?
Merges recent upstream changes to beta 10
This will also close !381 (closed) as upstream merged that MR and the background section is included in this merge
Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines
-
I agree to follow this project's Contribution Guidelines -
I have made sure to test this pull request
Merge request reports
Activity
Filter activity
added 1 commit
- 1fa34739 - fix: add missing diff between SkNote* and MkNote*
requested review from @dakkar
requested review from @Amelia
added 24 commits
- 1fa34739...d6cb68b0 - 14 earlier commits
- 653ca7e7 - CHANGELOGを修正 (#13181)
- 93e711d8 - chore(frontend): reword possible typo (#13182)
- 500ea793 - fix(bubble-game): 共有用画像のコメントにnullが入る問題を修正 (#13183)
- c81b61eb - fix(misskey-js): 自動生成物の冒頭からバージョンと日付を削除 (#13185)
- e89d7602 - Enhance: 連合向けのノート配信を軽量化 (#13192)
- 56d7f586 - Fix(frontend): MkCodeEditorで行がずれていくのを修正 (#13188)
- 313ce821 - 正しい 2024.2.0-beta.10 改版手順? (#13173)
- 155896a8 - enhance(frontend/HorizontalSwipe): 操作性の改善 (#13038)
- 52bf808d - typo
- af5ebdfc - merge: more upstream changes
Toggle commit list- Resolved by dakkar
- Resolved by dakkar
- Resolved by dakkar
- Resolved by dakkar
- Resolved by dakkar
mentioned in merge request !381 (closed)
added 14 commits
- af5ebdfc...0f7918c5 - 4 earlier commits
- d40612ac - fix(frontend): aiscriptのコードブロックでのハイライト指定を修正 (#13208)
- c0cb76f0 - chore: use vite@5.1.0 / pnpm@8.15.1
- 614c9a0f - fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加 (#13210)
- c23c97d3 - perf(frontend): splash screenのdomが消えない場合があるのを修正
- 37d83df0 - chore(deps): bump pnpm/action-setup from 2 to 3 (#13215)
- b5b31bfd - New Crowdin updates (#13179)
- 7fc1d778 - update deps
- 639f14f7 - 2024.2.0-beta.11
- 7a8cf274 - fix misskey-js version
- 85355813 - merge: latest changes
Toggle commit listrequested review from @dakkar
requested review from @Amelia
also https://github.com/misskey-dev/misskey/issues/13219 apparently 7fc1d778 breaks things
Please register or sign in to reply