Skip to content

Commit

Permalink
Merge branch 'develop' into re-ed25519
Browse files Browse the repository at this point in the history
  • Loading branch information
tamaina committed Nov 11, 2024
2 parents d7aeebc + 1bc4f40 commit e211284
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
### General
- Feat: コンテンツの表示にログインを必須にできるように
- Feat: 過去のノートを非公開化/フォロワーのみ表示可能にできるように
- Enhance: 依存関係の更新
- Enhance: l10nの更新

### Client
- Enhance: Bull DashboardでRelationship Queueの状態も確認できるように
Expand All @@ -25,6 +27,7 @@
- Fix: リンク切れを修正
= Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正
(Cherry-picked from https://github.com/taiyme/misskey/pull/305)
- Fix: メールアドレス登録有効化時の「完了」ダイアログボックスの表示条件を修正

### Server
- Enhance: 起動前の疎通チェックで、DBとメイン以外のRedisの疎通確認も行うように
Expand Down
4 changes: 3 additions & 1 deletion packages/frontend/src/components/MkSignupDialog.form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ async function onSubmit(): Promise<void> {
return null;
});

if (res) {
if (res && res.ok) {
if (res.status === 204 || instance.emailRequiredForSignup) {
os.alert({
type: 'success',
Expand All @@ -295,6 +295,8 @@ async function onSubmit(): Promise<void> {
await login(resJson.token);
}
}
} else {
onSignupApiError();
}

submitting.value = false;
Expand Down
4 changes: 4 additions & 0 deletions packages/frontend/src/pages/about-misskey.vue
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,9 @@ const patronsWithIcon = [{
}, {
name: 'Yatoigawa',
icon: 'https://assets.misskey-hub.net/patrons/505e3568885a4a488431a8f22b4553d0.jpg',
}, {
name: '秋瀬カヲル',
icon: 'https://assets.misskey-hub.net/patrons/0f22aeb866484f4fa51db6721e3f9847.jpg',
}];

const patrons = [
Expand Down Expand Up @@ -380,6 +383,7 @@ const patrons = [
'ケモナーのケシン',
'こまつぶり',
'まゆつな空高',
'asata',
];

const thereIsTreasure = ref($i && !claimedAchievements.includes('foundTreasure'));
Expand Down

0 comments on commit e211284

Please sign in to comment.