Skip to content
Snippets Groups Projects

merge upstream for 2024.2.1

Merged dakkar requested to merge merge/2024-02-29 into develop

What does this PR do?

I've merged https://github.com/misskey-dev/misskey/pull/13447/ and made some minor adjustments (re-generated pnpm-lock.yaml (maybe even correctly, by pnpm install --no-frozen-lockfile), aligned NoteEditService and notes/edit.ts with their "create" counterparts, added missing English translations).

I expect the PR upstream to receive more commits before getting merged, I'll merge again when that happens.

This is my first big merge, so please pay extra attention! I may have broken things! (It builds, it seems to run, I can post and edit, notifications look fine, but still!)

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
  • Ghost User resolved all threads

    resolved all threads

  • Ghost User approved this merge request

    approved this merge request

  • Ghost User resolved all threads

    resolved all threads

  • dakkar added 10 commits

    added 10 commits

    • f7048919 - fix: emoji colorization
    • 114d3319 - chore(client): 絵文字の画像読み込みに失敗した際はテキストではなくダミー画像を表示 (#13487)
    • 32690f57 - fix(frontend): ピン留め or 履歴に表示されるカスタム絵文字がサーバから削除されるとリアクションが出来なくなる (#13486)
    • ecc5deca - New Crowdin updates (#13489)
    • 21e3a913 - Update CHANGELOG.md
    • b83cbc6d - Update CHANGELOG.md
    • 2744cbd3 - fix(frontend): MkCustomEmojiでフォールバックをテキストか画像か選べるように
    • 3afdafed - 2024.3.1
    • efda2e9b - Update README.md
    • b7331fda - Merge remote-tracking branch 'misskey/develop' into merge/2024-02-29

    Compare with previous version

  • Ghost User approved this merge request

    approved this merge request

  • Marie approved this merge request

    approved this merge request

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