Skip to content

Commit

Permalink
Merge branch 'develop' into add_check_connect_script
Browse files Browse the repository at this point in the history
  • Loading branch information
massongit authored Feb 24, 2023
2 parents 60fe479 + 55cc6b8 commit fc0a252
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 0 deletions.
File renamed without changes.
17 changes: 17 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/02_enhance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!-- ℹ お読みください / README
PRありがとうございます! PRを作成する前に、コントリビューションガイドをご確認ください:
Thank you for your PR! Before creating a PR, please check the contribution guide:
https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
-->

# What
<!-- このPRで何をしたのか? どう変わるのか? -->
<!-- What did you do with this PR? How will it change things? -->

# Why
<!-- なぜそうするのか? どういう意図なのか? 何が困っているのか? -->
<!-- Why do you do it? What are your intentions? What is the problem? -->

# Additional info (optional)
<!-- テスト観点など -->
<!-- Test perspective, etc -->
10 changes: 10 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/03_release.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Summary
This is a release PR.

For more information on the release instructions, please see:
https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md#release

# Checklist
- [ ] package.jsonのバージョンが正しく更新されている
- [ ] CHANGELOGが過不足無く更新されている
- [ ] CIが全て通っている
1 change: 1 addition & 0 deletions locales/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,7 @@ lastCommunication: "Last communication"
resolved: "Resolved"
unresolved: "Unresolved"
breakFollow: "Remove follower"
breakFollowConfirm: "Are you sure want to remove follower?"
itsOn: "Enabled"
itsOff: "Disabled"
emailRequiredForSignup: "Require email address for sign-up"
Expand Down
1 change: 1 addition & 0 deletions locales/ja-JP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,7 @@ lastCommunication: "直近の通信"
resolved: "解決済み"
unresolved: "未解決"
breakFollow: "フォロワーを解除"
breakFollowConfirm: "フォロワー解除しますか?"
itsOn: "オンになっています"
itsOff: "オフになっています"
emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする"
Expand Down
2 changes: 2 additions & 0 deletions packages/frontend/src/scripts/get-user-menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ export function getUserMenu(user, router: Router = mainRouter) {
}

async function invalidateFollow() {
if (!await getConfirmed(i18n.ts.breakFollowConfirm)) return;

os.apiWithDialog('following/invalidate', {
userId: user.id,
}).then(() => {
Expand Down

0 comments on commit fc0a252

Please sign in to comment.