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

Merge upstream (2024.5.0-host.2e) #9

Merged
merged 15 commits into from
Sep 16, 2024
Merged

Merge upstream (2024.5.0-host.2e) #9

merged 15 commits into from
Sep 16, 2024

Conversation

riku6460
Copy link

What

Why

Additional info (optional)

Checklist

  • Read the contribution guide
  • Test working in a local environment
  • (If needed) Add story of storybook
  • (If needed) Update CHANGELOG.md
  • (If possible) Add tests

nafu-at and others added 14 commits August 22, 2024 17:15
Co-authored-by: まっちゃとーにゅ <[email protected]>
…の追加 (MisskeyIO#722)

- MkSignin のログインで、user が取得できるまでログインがクリックできないようにした
  - パスワードマネージャの自動ログインが動かなくなるが、元々動作していなかったため問題ないと思われる
* fix

* fix

* fix

* Feat: アカウント移行機能のモデレーションを行いやすくした

* コミット忘れ

* 文章を組み立てるのやめた

* Fix test

* Fix test

* updateModerationNote から mergeModerationNote に

* updateAccountMoveLogs から insertAccountMoveLog に

---------

Co-authored-by: nenohi <[email protected]>
Co-authored-by: nenohi <[email protected]>
@riku6460 riku6460 merged commit 14be044 into nijimiss Sep 16, 2024
17 of 18 checks passed
@riku6460 riku6460 deleted the merge-upstream branch September 16, 2024 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants