Skip to content
Snippets Groups Projects

Merge Upstream Changes

Merged Marie requested to merge merge/changes into develop

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

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • dakkar
  • dakkar
  • dakkar
  • dakkar
  • dakkar approved this merge request

    approved this merge request

  • dakkar resolved all threads

    resolved all threads

  • dakkar mentioned in merge request !381 (closed)

    mentioned in merge request !381 (closed)

  • Ghost User approved this merge request

    approved this merge request

  • Marie added 14 commits

    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

    Compare with previous version

  • Marie requested review from @dakkar

    requested review from @dakkar

  • Marie requested review from @Amelia

    requested review from @Amelia

  • Author Developer

    Needs re-approval due to the new merge commit

  • Ghost User approved this merge request

    approved this merge request

  • Marie added 1 commit

    added 1 commit

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading