From 5f4d20ac1d7ee6c5701ffd1a6645bc6bc42241cc Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 30 Apr 2023 12:11:43 +0000 Subject: [PATCH 001/235] =?UTF-8?q?ThisIsExperimentalFeature=20=E2=86=92?= =?UTF-8?q?=20thisIsExperimentalFeature?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 2 +- packages/frontend/src/pages/settings/migration.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 3225ff621..1958b649d 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -704,7 +704,7 @@ useSystemFont: "システムのデフォルトのフォントを使う" clips: "クリップ" experimentalFeatures: "実験的機能" experimental: "実験的" -ThisIsExperimentalFeature: "これは実験的な機能です。仕様が変更されたり、正常に動作しなかったりする可能性があります。" +thisIsExperimentalFeature: "これは実験的な機能です。仕様が変更されたり、正常に動作しなかったりする可能性があります。" developer: "開発者" makeExplorable: "アカウントを見つけやすくする" makeExplorableDescription: "オフにすると、「みつける」にアカウントが載らなくなります。" diff --git a/packages/frontend/src/pages/settings/migration.vue b/packages/frontend/src/pages/settings/migration.vue index fa4da0dae..277f9f538 100644 --- a/packages/frontend/src/pages/settings/migration.vue +++ b/packages/frontend/src/pages/settings/migration.vue @@ -1,7 +1,7 @@ @@ -40,7 +41,7 @@
- {{ i18n.ts.continue }} + {{ i18n.ts.continue }}
@@ -52,7 +53,7 @@
{{ i18n.ts.pushNotification }}
{{ i18n.t('_initialAccountSetting.pushNotificationDescription', { name: instance.name ?? host }) }}
- {{ i18n.ts.continue }} + {{ i18n.ts.continue }} @@ -70,7 +71,7 @@
{{ i18n.t('_initialAccountSetting.haveFun', { name: instance.name ?? host }) }}
- {{ i18n.ts.close }} + {{ i18n.ts.close }} From b16d7cc6c4b8d670e35e0b32e1527149e2c575ab Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 9 May 2023 08:09:16 +0900 Subject: [PATCH 101/235] =?UTF-8?q?chore(frontend):=20=E3=82=88=E3=82=8A?= =?UTF-8?q?=E6=9F=94=E8=BB=9F=E3=81=AA=E6=96=87=E8=A8=80=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 1 + packages/frontend/src/components/MkUserSetupDialog.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b886cc7bf..8bbf9459f 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1041,6 +1041,7 @@ youFollowing: "フォロー中" _initialAccountSetting: accountCreated: "アカウントの作成が完了しました！" + letsStartAccountSetup: "アカウントの初期設定を行いましょう。" letsFillYourProfile: "まずはあなたのプロフィールを設定しましょう。" profileSetting: "プロフィール設定" theseSettingsCanEditLater: "これらの設定は後から変更できます。" diff --git a/packages/frontend/src/components/MkUserSetupDialog.vue b/packages/frontend/src/components/MkUserSetupDialog.vue index c5e75276f..096b88c30 100644 --- a/packages/frontend/src/components/MkUserSetupDialog.vue +++ b/packages/frontend/src/components/MkUserSetupDialog.vue @@ -23,7 +23,7 @@
{{ i18n.ts._initialAccountSetting.accountCreated }}
-
{{ i18n.ts._initialAccountSetting.letsFillYourProfile }}
+
{{ i18n.ts._initialAccountSetting.letsStartAccountSetup }}
{{ i18n.ts._initialAccountSetting.profileSetting }}
From 5c54e12099035a5dad080de5ed8ad4ec4e541158 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 9 May 2023 08:32:25 +0900 Subject: [PATCH 102/235] =?UTF-8?q?fix(test):=20=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=96=E3=82=AD=E3=83=A5=E3=83=BC=E3=82=92=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=81=8C=E7=B5=82=E3=82=8F=E3=81=A3=E3=81=9F=E3=82=89?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #10802 ? --- packages/backend/src/boot/common.ts | 2 ++ packages/backend/test/e2e/move.ts | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/boot/common.ts b/packages/backend/src/boot/common.ts index 279a1fe59..45ded5495 100644 --- a/packages/backend/src/boot/common.ts +++ b/packages/backend/src/boot/common.ts @@ -34,4 +34,6 @@ export async function jobQueue() { jobQueue.get(QueueProcessorService).start(); jobQueue.get(ChartManagementService).start(); + + return jobQueue; } diff --git a/packages/backend/test/e2e/move.ts b/packages/backend/test/e2e/move.ts index 4dd5cbb9d..7d6c64609 100644 --- a/packages/backend/test/e2e/move.ts +++ b/packages/backend/test/e2e/move.ts @@ -10,6 +10,7 @@ import type { INestApplicationContext } from '@nestjs/common'; describe('Account Move', () => { let app: INestApplicationContext; + let jq: INestApplicationContext; let url: URL; let root: any; @@ -24,7 +25,7 @@ describe('Account Move', () => { beforeAll(async () => { app = await startServer(); - await jobQueue(); + jq = await jobQueue(); const config = loadConfig(); url = new URL(config.url); const connection = await initTestDb(false); @@ -39,7 +40,7 @@ describe('Account Move', () => { }, 1000 * 60 * 2); afterAll(async () => { - await app.close(); + await Promise.all([app.close(), jq.close()]); }); describe('Create Alias', () => { From aa28ddf762f88ca355c62edcbfa54e19a2b93c29 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 9 May 2023 08:33:57 +0900 Subject: [PATCH 103/235] fix(frontend): fix e2e --- .../frontend/src/components/MkUserSetupDialog.Profile.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/components/MkUserSetupDialog.Profile.vue b/packages/frontend/src/components/MkUserSetupDialog.Profile.vue index 373e2cf8d..adb8d4334 100644 --- a/packages/frontend/src/components/MkUserSetupDialog.Profile.vue +++ b/packages/frontend/src/components/MkUserSetupDialog.Profile.vue @@ -12,11 +12,11 @@ - + - + From 7feca2a60a4bf6e302ea7f0c79927524e7d0817d Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 9 May 2023 08:48:42 +0900 Subject: [PATCH 104/235] fix(frontend): fix e2e --- cypress/e2e/basic.cy.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/cypress/e2e/basic.cy.js b/cypress/e2e/basic.cy.js index e5e3a466a..73f6e7a0f 100644 --- a/cypress/e2e/basic.cy.js +++ b/cypress/e2e/basic.cy.js @@ -181,6 +181,30 @@ describe('After user signed in', () => { cy.get('[data-cy-user-setup-continue]').click(); }); +}); + +describe('After user setup', () => { + beforeEach(() => { + cy.resetState(); + + // インスタンス初期セットアップ + cy.registerUser('admin', 'pass', true); + + // ユーザー作成 + cy.registerUser('alice', 'alice1234'); + + cy.login('alice', 'alice1234'); + + // アカウント初期設定ウィザード + cy.get('[data-cy-user-setup] [data-cy-modal-window-close]').click(); + cy.get('[data-cy-modal-dialog-ok]').click(); + }); + + afterEach(() => { + // テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。 + // waitを入れることでそれを防止できる + cy.wait(1000); + }); it('note', () => { cy.get('[data-cy-open-post-form]').should('be.visible'); From c8343b2750310bb3f48cc8ef2e4c50c9c7f98b83 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 9 May 2023 09:11:44 +0900 Subject: [PATCH 105/235] [ci skip] New Crowdin updates (#10803) * New translations ja-JP.yml (Norwegian) * New translations ja-JP.yml (English) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Norwegian) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (Japanese, Kansai) --- locales/de-DE.yml | 23 +++++++++++++++++++++++ locales/en-US.yml | 23 +++++++++++++++++++++++ locales/ja-KS.yml | 41 +++++++++++++++++++++++++++++++++++++---- locales/ko-KR.yml | 14 +++++++++++++- locales/no-NO.yml | 28 ++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 5 deletions(-) diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 89a61d42d..d678fadd4 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1036,7 +1036,20 @@ channelArchiveConfirmTitle: "{name} wirklich archivieren?" channelArchiveConfirmDescription: "Ein archivierter Kanal taucht nicht mehr in der Kanalliste oder in Suchergebnissen auf. Zudem können ihm keine Beiträge mehr hinzugefügt werden." thisChannelArchived: "Dieser Kanal wurde archiviert." displayOfNote: "Anzeige von Notizen" +initialAccountSetting: "Kontoeinrichtung" youFollowing: "Gefolgt" +_initialAccountSetting: + accountCreated: "Dein Konto wurde erfolgreich erstellt!" + letsFillYourProfile: "Lass uns zuerst dein Profil einrichten." + profileSetting: "Profileinstellungen" + theseSettingsCanEditLater: "Diese Einstellungen kannst du jederzeit ändern." + youCanEditMoreSettingsInSettingsPageLater: "In den Einstellungen findest du noch viele weitere Optionen. Schau dort später mal vorbei." + followUsers: "Folge zuerst ein paar Nutzern, um deine Chronik zu füllen." + pushNotificationDescription: "Durch die Aktivierung von Push-Benachrichtigungen kannst du von {name} Benachrichtigungen direkt auf dein Gerät erhalten." + initialAccountSettingCompleted: "Kontoeinrichtung abgeschlossen!" + haveFun: "Viel Spaß mit {name}!" + ifYouNeedLearnMore: "Besuche {link}, falls du mehr über {name} (Misskey) lernen möchtest." + skipAreYouSure: "Die Kontoeinrichtung wirklich überspringen?" _serverRules: description: "Eine Reihe von Regeln, die vor der Registrierung angezeigt werden. Eine Zusammenfassung der Nutzungsbedingungen anzuzeigen ist empfohlen." _accountMigration: @@ -1586,6 +1599,16 @@ _time: minute: "Minute(n)" hour: "Stunde(n)" day: "Tag(en)" +_timelineTutorial: + title: "Wie du Misskey verwendest" + step1_1: "Dieser Bildschirm ist die \"Chronik\". Hier werden alle \"Notizen\" von {name} angezeigt." + step1_2: "Es gibt einige verschiedene Chroniken. Beispielsweise werden in der \"Startseite\" alle Notizen von Nutzern, denen du folgst, angezeigt, und in der \"Lokalen Chronik\" werden Notizen aller Nutzer auf {name} angezeigt." + step2_1: "Lass uns als nächstes versuchen, eine Notiz zu schreiben. Dies kannst du tun, indem du auf den Knopf mit dem Stift-Icon drückst." + step2_2: "Stell dich den anderen vor oder schreibe einfach \"Hallo {name}!\", wenn du darauf keine Lust hast oder dir nichts einfällt." + step3_1: "Fertig mit dem Senden deiner ersten Notiz?" + step3_2: "Falls deine Notiz nun in deiner Chronik auftaucht, hast du alles richtig gemacht." + step4_1: "Notizen können zusätzlich mit \"Reaktionen\" ausgestattet werden." + step4_2: "Um eine Reaktion anzufügen, klicke auf das „+“-Symbol einer Notiz und wähle ein Emoji aus, mit dem du reagieren möchtest." _2fa: alreadyRegistered: "Du hast bereits ein Gerät für Zwei-Faktor-Authentifizierung registriert." registerTOTP: "Authentifizierungs-App registrieren" diff --git a/locales/en-US.yml b/locales/en-US.yml index f5533d03a..ea91bcc0e 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1036,7 +1036,20 @@ channelArchiveConfirmTitle: "Really archive {name}?" channelArchiveConfirmDescription: "An archived channel won't appear in the channel list or search results anymore. New posts can also not be added to it anymore." thisChannelArchived: "This channel has been archived." displayOfNote: "Note display" +initialAccountSetting: "Profile configuration" youFollowing: "Followed" +_initialAccountSetting: + accountCreated: "Your account was successfully created!" + letsFillYourProfile: "First, let's set up your profile." + profileSetting: "Profile settings" + theseSettingsCanEditLater: "You can always change these settings later." + youCanEditMoreSettingsInSettingsPageLater: "There are many more settings you can configure from the \"Settings\" page. Be sure to visit it later." + followUsers: "Try following some users that interest you to build up your timeline." + pushNotificationDescription: "Enabling push notifications will allow you to receive notifications from {name} directly on your device." + initialAccountSettingCompleted: "Profile configuration complete!" + haveFun: "Enjoy {name}!" + ifYouNeedLearnMore: "If you'd like to learn more about how to use {name} (Misskey), please visit {link}." + skipAreYouSure: "Really skip profile configuration?" _serverRules: description: "A set of rules to be displayed before registration. Setting a summary of the Terms of Service is recommended." _accountMigration: @@ -1586,6 +1599,16 @@ _time: minute: "Minute(s)" hour: "Hour(s)" day: "Day(s)" +_timelineTutorial: + title: "How to use Misskey" + step1_1: "This is the \"timeline\". All \"notes\" submitted on {name} will be chronologically displayed here." + step1_2: "There are a few different timelines. For example, the \"Home timeline\" will contain notes of users you follow, and the \"Local timeline\" will contain notes from all users of {name}." + step2_1: "Let's try posting a note next. You can do so by pressing the button with a pencil icon." + step2_2: "How about writing a self-introduction, or just \"Hello {name}!\" if you don't feel like it?" + step3_1: "Finished posting your first note?" + step3_2: "Your first note should now be displayed on your timeline." + step4_1: "You can also attach \"Reactions\" to notes." + step4_2: "To attach a reaction, press the \"+\" mark on a note and choose an emoji you'd like to react with." _2fa: alreadyRegistered: "You have already registered a 2-factor authentication device." registerTOTP: "Register authenticator app" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index ee1c0f113..512cce145 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -26,7 +26,7 @@ otherSettings: "ほかの設定" openInWindow: "ウィンドウで開くで" profile: "プロフィール" timeline: "タイムライン" -noAccountDescription: "自己紹介はあらへん" +noAccountDescription: "自己紹介食ってもた" login: "ログイン" loggingIn: "ログインしよるで" logout: "ログアウト" @@ -38,9 +38,9 @@ addUser: "ユーザーを追加や" favorite: "お気に入り" favorites: "お気に入り" unfavorite: "やっぱ気に入らん" -favorited: "お気に入りに登録したで" +favorited: "お気に入りに入れたで" alreadyFavorited: "もうお気に入りに入れとるがな。" -cantFavorite: "アカン、お気に入り登録できへんかったで。" +cantFavorite: "アカン、お気に入りに入れれんかったわ。" pin: "ピン留めしとく" unpin: "やっぱピン留めせん" copyContent: "内容をコピー" @@ -462,7 +462,7 @@ uiLanguage: "UIの表示言語" aboutX: "{x}について" emojiStyle: "絵文字のスタイル" native: "ネイティブ" -disableDrawer: "メニューをドロワーで表示せぇへん" +disableDrawer: "メニューをドロワーで表示せえへん" showNoteActionsOnlyHover: "ノートの操作部をホバー時のみ表示するで" noHistory: "履歴はないわ。" signinHistory: "ログイン履歴" @@ -560,6 +560,7 @@ accountDeletedDescription: "このアカウントは削除されとるで。" menu: "メニュー" divider: "分割線" addItem: "項目を追加" +rearrange: "並び替え" relays: "リレー" addRelay: "リレーの追加" inboxUrl: "inboxのURL" @@ -1028,11 +1029,32 @@ pleaseConfirmBelowBeforeSignup: "このサーバーに登録する前に、下 pleaseAgreeAllToContinue: "続けるんやったら、全ての「せやな」にチェック入れてる必要があるで。" continue: "続けるで" preservedUsernames: "予約ユーザー名" +preservedUsernamesDescription: "予約しとくユーザー名を行ごとに挙げるで。ここで指定されたユーザー名はアカウント作るときに使えへんくなるけど、管理者は例外や。あと、もうあるアカウントも例外やな。" +createNoteFromTheFile: "このファイル使うてノート作るで" +archive: "アーカイブ" +channelArchiveConfirmTitle: "{name}をアーカイブしてええか？" +channelArchiveConfirmDescription: "アーカイブしたら、チャンネル一覧とか検索結果からなくなるし、新しく書き込みもできへんなるで。" +thisChannelArchived: "このチャンネル、アーカイブされとるで。" +displayOfNote: "ノートの表示" +initialAccountSetting: "初期設定" youFollowing: "フォロー中やで" +_initialAccountSetting: + accountCreated: "アカウント作り終わったで。" + letsFillYourProfile: "最初はあんたのプロフィールを設定しよか。" + profileSetting: "プロフィール設定" + theseSettingsCanEditLater: "この設定はあとから変えれるで。" + youCanEditMoreSettingsInSettingsPageLater: "これ以外にもいろんな設定を「設定」ページからできるで。後で確認してみてな。" + followUsers: "タイムラインを構築するために、気になるユーザーをフォローしてみ。" + pushNotificationDescription: "プッシュ通知を有効にすると{name}の通知をあんたのデバイスで受け取れるで。" + initialAccountSettingCompleted: "初期設定が終わったで。" + haveFun: "{name}、楽しんでな～" + ifYouNeedLearnMore: "{name}(Misskey)の使い方とかをよー知りたいんやったら{link}をみてな。" + skipAreYouSure: "初期設定飛ばすか？" _serverRules: description: "新規登録前に見せる、サーバーの簡潔なルールを設定すんで。内容は使うための決め事の要約とすることを推奨するわ。" _accountMigration: moveFrom: "別のアカウントからこのアカウントに引っ越す" + moveFromSub: "別のアカウントへエイリアスを作る" moveFromLabel: "引っ越し元のアカウント：" moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したかったら、ここでエイリアスを作っとく必要があるで。必ずお引っ越しを実行する前に作っとかなあかんで！引っ越し元のアカウントをこんな風に入力してくれへんか？：@person@instance.com" moveTo: "このアカウントをさらのアカウントに引っ越すで" @@ -1324,6 +1346,7 @@ _role: canInvite: "サーバー招待コードの発行" canManageCustomEmojis: "カスタム絵文字の管理" driveCapacity: "ドライブ容量" + alwaysMarkNsfw: "勝手にファイルにNSFWをくっつける" pinMax: "ノートのピン留めの最大数" antennaMax: "アンテナの作成可能数" wordMuteMax: "ワードミュートの最大文字数" @@ -1575,6 +1598,16 @@ _time: minute: "分" hour: "時間" day: "日" +_timelineTutorial: + title: "Misskeyってなんや？" + step1_1: "これは「タイムライン」や。{name}に投稿された「ノート」が順番に表示されるで。" + step1_2: "タイムラインには何個か種類があってな、例えば「ホームタイムライン」だったらあんたのフォローしてる人のノート、「ローカルタイムライン」には{name}全部のノートが流れてくるで。" + step2_1: "試しに、何かノートを投稿してみ。画面の鉛筆マークのボタンでフォームが開くで。" + step2_2: "最初のノートは、自己紹介とか「{name}始めてみたんや」とかがええと思うで。" + step3_1: "投稿できた？" + step3_2: "あんたのノートがタイムラインに出てきたら成功や。" + step4_1: "ノートには、「リアクション」を付けれるで。" + step4_2: "ツッコむんやったら、ノートの「+」マークを押して、好きな絵文字を選ぶで。" _2fa: alreadyRegistered: "もう設定終わっとるわ。" registerTOTP: "認証アプリの設定はじめる" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 0f2b9a740..4a2fbe2a8 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -2,7 +2,7 @@ _lang_: "한국어" headlineMisskey: "노트로 연결되는 네트워크" introMisskey: "환영합니다! Misskey는 오픈 소스 분산형 마이크로 블로그 서비스입니다.\n'노트'를 작성해서 지금 일어나고 있는 일을 공유하거나, 당신만의 이야기를 모두에게 발신하세요📡\n'리액션' 기능으로 친구의 노트에 총알같이 반응을 추가할 수도 있습니다👍\n새로운 세계를 탐험해 보세요🚀" -poweredByMisskeyDescription: "{name}은(는) 오픈소스 플랫폼Misskey를 사용한 서버 중 하나입니다." +poweredByMisskeyDescription: "{name}은(는) 오픈소스 플랫폼 Misskey를 사용한 서버 가운데 하나입니다." monthAndDay: "{month}월 {day}일" search: "검색" notifications: "알림" @@ -1036,7 +1036,19 @@ channelArchiveConfirmTitle: "{name} 을(를) 아카이브하시겠습니까?" channelArchiveConfirmDescription: "아카이브한 채널은 채널 목록과 검색 결과에 표시되지 않으며, 채널에 새로운 노트를 작성할 수 없게 됩니다." thisChannelArchived: "이 채널은 아카이브되었습니다." displayOfNote: "노트 표시" +initialAccountSetting: "초기 설정" youFollowing: "팔로잉" +_initialAccountSetting: + accountCreated: "계정 생성이 완료되었습니다!" + letsFillYourProfile: "우선 나의 프로필을 설정해 보아요." + profileSetting: "프로필 설정" + theseSettingsCanEditLater: "이 설정들은 나중에도 변경할 수 있습니다." + youCanEditMoreSettingsInSettingsPageLater: "이 외에도 '설정' 페이지에서 다양한 설정을 나의 입맛에 맛게 조절할 수 있습니다. 꼭 확인해 보세요!" + followUsers: "관심사가 맞는 유저를 팔로우하여 타임라인을 가꾸어 봅시다." + pushNotificationDescription: "푸시 알림을 활성화하면 {name}의 알림을 나의 기기에서 받아볼 수 있게 됩니다." + initialAccountSettingCompleted: "초기 설정을 모두 마쳤습니다!" + haveFun: "{name}와 함께 즐거운 시간 보내세요!" + ifYouNeedLearnMore: "{name}(Misskey)의 사용 방법에 대해 자세히 알아보려면 {link}를 참고해 주세요." _serverRules: description: "회원 가입 이전에 간단하게 표시할 서버 규칙입니다. 이용 약관의 요약으로 구성하는 것을 추천합니다." _accountMigration: diff --git a/locales/no-NO.yml b/locales/no-NO.yml index 883b17c78..f7f0d442d 100644 --- a/locales/no-NO.yml +++ b/locales/no-NO.yml @@ -274,10 +274,16 @@ letsLookAtTimeline: "La oss se på tidslinje" cannotBeChangedLater: "Du kan ikke endre senere." likeOnly: "Bare liker" retryAllQueuesConfirmTitle: "Vil du prøve igjen akkurat nå?" +video: "Video" +videos: "Videoer" continue: "Fortsett" youFollowing: "Følger" +_initialAccountSetting: + theseSettingsCanEditLater: "Du kan endre disse innstillingene senere." _achievements: _types: + _notes100000: + flavor: "Du har jammen mye å si." _noteFavorited1: title: "Stjernekikker" _myNoteFavorited1: @@ -290,13 +296,28 @@ _achievements: title: "For mange venner" _followers10: title: "Følg meg!" + _followers100: + title: "Populær" + _postedAtLateNight: + flavor: "Det er på tide å gå til sengs." + _driveFolderCircularReference: + title: "Rundskrivreferanse" _reactWithoutRead: title: "Leste du det virkelig?" _clickedClickHere: title: "Klikk her" description: "Du har klikket her" + _justPlainLucky: + title: "Rett og slett heldig" + _setNameToSyuilo: + description: "Du har satt navnet ditt til \"syuilo\"" _loggedInOnBirthday: title: "Gratulerer med dagen" + _loggedInOnNewYearsDay: + title: "Godt nytt år" + _brainDiver: + title: "Brain Diver" + flavor: "Misskey-Misskey La-Tu-Ma" _role: options: "Alternativ" _priority: @@ -318,6 +339,7 @@ _registry: key: "Nøkkel" keys: "Nøkler" _aboutMisskey: + about: "Misskey er programvare med åpen kildekode som har blitt utviklet av syuilo siden 2014." translation: "Oversett Misskey" _instanceTicker: none: "Ikke vis" @@ -355,6 +377,8 @@ _time: minute: "Minutter" hour: "Timer" day: "Dager" +_timelineTutorial: + title: "Hvordan bruke Misskey" _2fa: renewTOTPCancel: "Avbryt" _weekday: @@ -374,14 +398,18 @@ _widgets: clock: "Klokke" photos: "Bilder" button: "Knapp" + aiscriptApp: "AiScript App" userList: "Brukerliste" _userList: chooseList: "Velg liste" _cw: show: "Vis mer" _poll: + noOnlyOneChoice: "Trenger minst to valger." + choiceN: "Valg {n}" noMore: "Du kan ikke legge til flere." deadlineTime: "Timer" + votesCount: "{n} stemmer" vote: "Stem" showResult: "Vis resultatet" voted: "Stemt" From e382f74bb38c5d78828c4ade2621dd96315c8da6 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 9 May 2023 09:17:17 +0900 Subject: [PATCH 106/235] [ci skip] 13.12.0 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 336b56ff5..003e907c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ - --> -## 13.x.x (unreleased) +## 13.12.0 ### NOTE - Node.js 18.6.0以上が必要になりました diff --git a/package.json b/package.json index 1358b6f42..5b1d21b81 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "13.12.0-beta.6", + "version": "13.12.0", "codename": "nasubi", "repository": { "type": "git", From 80619260c11a44ad50619aaed2578eb5dc0260e9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 9 May 2023 13:57:43 +0900 Subject: [PATCH 107/235] =?UTF-8?q?fix(frontend):=20=E3=83=A6=E3=83=BC?= =?UTF-8?q?=E3=82=B6=E3=83=BC=E9=81=B8=E6=8A=9E=E3=83=80=E3=82=A4=E3=82=A2?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #10809 --- CHANGELOG.md | 12 ++++++++++++ packages/frontend/src/components/MkModalWindow.vue | 7 +++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 003e907c5..83caa66a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,18 @@ - --> + +## 13.x.x (unreleased) + +### General +- + +### Client +- Fix: ユーザー選択ダイアログが表示されない問題を修正 + +### Server +- + ## 13.12.0 ### NOTE diff --git a/packages/frontend/src/components/MkModalWindow.vue b/packages/frontend/src/components/MkModalWindow.vue index 1c942cfd0..ad7dc4da1 100644 --- a/packages/frontend/src/components/MkModalWindow.vue +++ b/packages/frontend/src/components/MkModalWindow.vue @@ -1,6 +1,6 @@ diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 0af4b5c02..aa4b98c05 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -92,7 +92,7 @@ export const defaultStore = markRaw(new Storage('base', { }, reactionAcceptance: { where: 'account', - default: null as 'likeOnly' | 'likeOnlyForRemote' | null, + default: 'nonSensitiveOnly' as 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote' | null, }, mutedWords: { where: 'account', From 59255e11b8989d1e4f60c222590d2918a61adb54 Mon Sep 17 00:00:00 2001 From: tamaina Date: Fri, 19 May 2023 09:44:06 +0900 Subject: [PATCH 208/235] =?UTF-8?q?perf:=20MkImgWithBlurhash=E3=81=A8MkMed?= =?UTF-8?q?iaImage=E3=82=92=E6=9C=80=E9=81=A9=E5=8C=96=20(#10782)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * #10781 * fix tsconfig * fetch image?? * Revert "fetch image??" This reverts commit 0925c28d5a4f328264c39d5591dc736795541683. * wip * Revert "wip" This reverts commit be97c6cb88318bcea441edeeecb69b6d6ed0dd8f. * loading="eager" * loading="eager" 2 * error * wip * wip * wip * wip * clean up * fix * 生成するworkerを1つにする? * clean up * use buraha * wip * smaller width, height * update buraha * clean up * fix * Update MkMediaImage.vue * Update MkImgWithBlurhash.vue * Revert "fix(frontend): センシティブ設定された画像を開くとき一瞬レイアウトが崩れる問題を修正" This reverts commit 41e9aa6f9b03107518224e2ebde8889c64408204. * Update MkMediaList.vue * Update MkMediaList.vue * Update MkMediaList.vue * Update CHANGELOG.md * wait for decode * fix * ? * (test) remove container-type: inline-size; * Revert "(test) remove container-type: inline-size;" This reverts commit 9448e64228428175a3d624c04df1bfad0f59cb69. * container-name * Revert "container-name" This reverts commit 94385d32213a00a06a59fbd2296d6ef1b5f91785. * width: 100%; * improve performance * refactor * wip * WIP * wip * Revert "wip" This reverts commit 36e3b75cab8114e423544b79a8e2df353880f43b. * Revert "WIP" This reverts commit 05b729ef9189aea052ba411ac10f30a46cc668c8. * Revert "wip" This reverts commit 0801e7936116c58154d7cecfea955dd15fa61a77. * #10860 * wip * no worker * Revert "no worker" This reverts commit a9c49e4fb49976958a7594393343d52be0e082d7. * :v: * workerNumber固定は不要 --------- Co-authored-by: syuilo --- CHANGELOG.md | 1 + packages/frontend/package.json | 2 +- .../src/components/MkGalleryPostPreview.vue | 15 +- .../src/components/MkImgWithBlurhash.vue | 196 +++++++++++++----- .../frontend/src/components/MkMediaImage.vue | 55 +++-- .../frontend/src/components/MkMediaList.vue | 65 +++++- .../src/components/global/MkAvatar.vue | 3 +- .../frontend/src/pages/settings/general.vue | 3 +- .../src/scripts/worker-multi-dispatch.ts | 75 +++++++ .../frontend/src/workers/draw-blurhash.ts | 15 ++ packages/frontend/src/workers/test-webgl2.ts | 7 + packages/frontend/src/workers/tsconfig.json | 5 + packages/frontend/vite.config.ts | 4 + pnpm-lock.yaml | 12 +- 14 files changed, 367 insertions(+), 91 deletions(-) create mode 100644 packages/frontend/src/scripts/worker-multi-dispatch.ts create mode 100644 packages/frontend/src/workers/draw-blurhash.ts create mode 100644 packages/frontend/src/workers/test-webgl2.ts create mode 100644 packages/frontend/src/workers/tsconfig.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 03b1bb4e2..972958963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -103,6 +103,7 @@ Meilisearchの設定に`index`が必要になりました。値はMisskeyサー * 画像が全て隠れた状態で表示されるようになります - 閲覧注意設定された画像は表示した状態でもそれが閲覧注意だと分かる表示をするように - モデレーターはノートに添付された画像上から直接NSFW設定できるように +- 1枚だけのメディアリストの画像のアスペクト比を画像に応じて縦長にするように - プロフィール設定「追加情報」の項目の削除と並び替えができるように - 新しい実績を追加 - AiScriptを0.13.2に更新 diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 7e6c1442b..2f754f8aa 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -25,9 +25,9 @@ "@vue-macros/reactivity-transform": "0.3.7", "@vue/compiler-sfc": "3.3.2", "autosize": "6.0.1", - "blurhash": "2.0.5", "broadcast-channel": "4.20.2", "browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3", + "buraha": "github:misskey-dev/buraha", "canvas-confetti": "1.6.0", "chart.js": "4.3.0", "chartjs-adapter-date-fns": "3.0.0", diff --git a/packages/frontend/src/components/MkGalleryPostPreview.vue b/packages/frontend/src/components/MkGalleryPostPreview.vue index 4f8f7b945..fccc33dcc 100644 --- a/packages/frontend/src/components/MkGalleryPostPreview.vue +++ b/packages/frontend/src/components/MkGalleryPostPreview.vue @@ -5,12 +5,9 @@ diff --git a/packages/frontend/src/pages/my-lists/index.vue b/packages/frontend/src/pages/my-lists/index.vue index 47437f3e5..6068e375e 100644 --- a/packages/frontend/src/pages/my-lists/index.vue +++ b/packages/frontend/src/pages/my-lists/index.vue @@ -70,6 +70,7 @@ definePageMetadata({ padding: 16px; border: solid 1px var(--divider); border-radius: 6px; + margin-bottom: 8px; &:hover { border: solid 1px var(--accent); diff --git a/packages/frontend/src/pages/my-lists/list.vue b/packages/frontend/src/pages/my-lists/list.vue index 86201e8e0..dd431e8dc 100644 --- a/packages/frontend/src/pages/my-lists/list.vue +++ b/packages/frontend/src/pages/my-lists/list.vue @@ -1,35 +1,43 @@ + + diff --git a/packages/frontend/src/router.ts b/packages/frontend/src/router.ts index add4bd921..6b11137d7 100644 --- a/packages/frontend/src/router.ts +++ b/packages/frontend/src/router.ts @@ -30,6 +30,10 @@ export const routes = [{ name: 'note', path: '/notes/:noteId', component: page(() => import('./pages/note.vue')), +}, { + name: 'list', + path: '/list/:listId', + component: page(() => import('./pages/list.vue')), }, { path: '/clips/:clipId', component: page(() => import('./pages/clip.vue')), From 0c0ae6ff90029d8a5e0526c2c20276794db41114 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 19 May 2023 10:07:29 +0900 Subject: [PATCH 211/235] 13.13.0-beta.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc1e2e62e..5a8e1e7b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "13.13.0-beta.1", + "version": "13.13.0-beta.2", "codename": "nasubi", "repository": { "type": "git", From 8317772436590e76fc4a10bd7cf0f26c5120f80c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=B4=E3=83=BC?= <75538777+mappi-pr@users.noreply.github.com> Date: Fri, 19 May 2023 11:35:46 +0900 Subject: [PATCH 212/235] =?UTF-8?q?fix:Firefox=E3=81=A7=E3=82=B5=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97=E3=81=99=E3=82=8B=E6=99=82?= =?UTF-8?q?=E3=80=81=E3=83=A1=E3=83=BC=E3=83=AB=E3=82=A2=E3=83=89=E3=83=AC?= =?UTF-8?q?=E3=82=B9=E3=81=8C=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E5=90=8D?= =?UTF-8?q?=E3=81=A8=E3=81=97=E3=81=A6=E8=AA=8D=E8=AD=98=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=82=8B#10523=20(#10869)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix:Firefoxでサインアップする時、メールアドレスがユーザー名として認識される * Update CHANGELOG.md edit CHANGELOG.md --- CHANGELOG.md | 1 + packages/frontend/src/components/MkSignupDialog.form.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 994541538..454974ca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ - 開発者モードを追加 - AiScriptを0.13.3に更新 - Fix: URLプレビューで情報が取得できなかった際の挙動を修正 +- Fix: Safari、Firefoxでの新規登録時、パスワードマネージャーにメールアドレスが登録されていた挙動を修正 ## 13.12.2 diff --git a/packages/frontend/src/components/MkSignupDialog.form.vue b/packages/frontend/src/components/MkSignupDialog.form.vue index 0e8bdb321..c8d805cc1 100644 --- a/packages/frontend/src/components/MkSignupDialog.form.vue +++ b/packages/frontend/src/components/MkSignupDialog.form.vue @@ -9,7 +9,7 @@ - + From 95b9284e79d00bb47184122760fac3933e8ef5ae Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 19 May 2023 13:35:46 +0900 Subject: [PATCH 213/235] :art: --- .../src/pages/admin/other-settings.vue | 25 ++++++++++++++++--- .../frontend/src/pages/admin/settings.vue | 24 +++--------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/packages/frontend/src/pages/admin/other-settings.vue b/packages/frontend/src/pages/admin/other-settings.vue index 62dff6ce7..15d720a07 100644 --- a/packages/frontend/src/pages/admin/other-settings.vue +++ b/packages/frontend/src/pages/admin/other-settings.vue @@ -1,9 +1,17 @@