From 030082f7567e6896add3180fbc48f2d6ee4a151e Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Fri, 31 May 2024 19:35:27 +0900 Subject: [PATCH 1/8] :art: --- locales/index.d.ts | 4 ++++ locales/ja-JP.yml | 1 + packages/frontend/src/pages/admin/index.vue | 16 ++++++++-------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index 91bbe4ccb6..0b1b86d373 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -3364,6 +3364,10 @@ export interface Locale extends ILocale { * 管理者情報が設定されていません。 */ "noMaintainerInformationWarning": string; + /** + * 問い合わせ先URLが設定されていません。 + */ + "noInquiryUrlWarning": string; /** * Botプロテクションが設定されていません。 */ diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b7083b4942..a89cfbd843 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -837,6 +837,7 @@ administration: "管理" accounts: "アカウント" switch: "切り替え" noMaintainerInformationWarning: "管理者情報が設定されていません。" +noInquiryUrlWarning: "問い合わせ先URLが設定されていません。" noBotProtectionWarning: "Botプロテクションが設定されていません。" configure: "設定する" postToGallery: "ギャラリーへ投稿" diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue index eef1c8afa9..794feae202 100644 --- a/packages/frontend/src/pages/admin/index.vue +++ b/packages/frontend/src/pages/admin/index.vue @@ -12,10 +12,13 @@ SPDX-License-Identifier: AGPL-3.0-only - {{ i18n.ts.thereIsUnresolvedAbuseReportWarning }} {{ i18n.ts.check }} - {{ i18n.ts.noMaintainerInformationWarning }} {{ i18n.ts.configure }} - {{ i18n.ts.noBotProtectionWarning }} {{ i18n.ts.configure }} - {{ i18n.ts.noEmailServerWarning }} {{ i18n.ts.configure }} +
+ {{ i18n.ts.thereIsUnresolvedAbuseReportWarning }} {{ i18n.ts.check }} + {{ i18n.ts.noMaintainerInformationWarning }} {{ i18n.ts.configure }} + {{ i18n.ts.noInquiryUrlWarning }} {{ i18n.ts.configure }} + {{ i18n.ts.noBotProtectionWarning }} {{ i18n.ts.configure }} + {{ i18n.ts.noEmailServerWarning }} {{ i18n.ts.configure }} +
@@ -61,6 +64,7 @@ const pageProps = ref({}); let noMaintainerInformation = isEmpty(instance.maintainerName) || isEmpty(instance.maintainerEmail); let noBotProtection = !instance.disableRegistration && !instance.enableHcaptcha && !instance.enableRecaptcha && !instance.enableTurnstile; let noEmailServer = !instance.enableEmail; +let noInquiryUrl = isEmpty(instance.inquiryUrl); const thereIsUnresolvedAbuseReport = ref(false); const currentPage = computed(() => router.currentRef.value.child); @@ -348,10 +352,6 @@ defineExpose({ > .nav { .lxpfedzu { - > .info { - margin: 16px 0; - } - > .banner { margin: 16px; From 374c8791d72ff55b79b2152726a174261cc997d3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 31 May 2024 11:13:42 +0000 Subject: [PATCH 2/8] Bump version to 2024.5.0-rc.10 --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 26a15b694c..bc56cc45fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2024.5.0-rc.9", + "version": "2024.5.0-rc.10", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index 6ec4674c08..ce47ee4093 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2024.5.0-rc.9", + "version": "2024.5.0-rc.10", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js", From 46164f879b9bd672cd7f5eea34180a196b0967b8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 31 May 2024 11:20:13 +0000 Subject: [PATCH 3/8] Bump version to 2024.5.0-rc.11 --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bc56cc45fb..4f5e15014c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2024.5.0-rc.10", + "version": "2024.5.0-rc.11", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index ce47ee4093..dfda302960 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2024.5.0-rc.10", + "version": "2024.5.0-rc.11", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js", From 316d192bc0fb6dde1fb18c0cfe0d76a247d62388 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 31 May 2024 12:05:47 +0000 Subject: [PATCH 4/8] Bump version to 2024.5.0-rc.12 --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4f5e15014c..998d612b5b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2024.5.0-rc.11", + "version": "2024.5.0-rc.12", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index dfda302960..1b361c4295 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2024.5.0-rc.11", + "version": "2024.5.0-rc.12", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js", From 27d1b7e6156699184bed278c9a43d5b94e159d4e Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Fri, 31 May 2024 21:09:19 +0900 Subject: [PATCH 5/8] 2024.5.0 --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 998d612b5b..b1786e16f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2024.5.0-rc.12", + "version": "2024.5.0", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index 1b361c4295..4ff1a57309 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2024.5.0-rc.12", + "version": "2024.5.0", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js", From 61eec93f4e93686c362fd68c8ff1f1ca96e1d790 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Fri, 31 May 2024 21:16:35 +0900 Subject: [PATCH 6/8] Revert "2024.5.0" This reverts commit 27d1b7e6156699184bed278c9a43d5b94e159d4e. --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b1786e16f1..998d612b5b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2024.5.0", + "version": "2024.5.0-rc.12", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index 4ff1a57309..1b361c4295 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2024.5.0", + "version": "2024.5.0-rc.12", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js", From a59aa20be827f23f9d15f7a7368779bcc89ece25 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 31 May 2024 12:18:52 +0000 Subject: [PATCH 7/8] Bump version to 2024.5.0-rc.13 --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 998d612b5b..175561e467 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2024.5.0-rc.12", + "version": "2024.5.0-rc.13", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index 1b361c4295..a49bfab941 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2024.5.0-rc.12", + "version": "2024.5.0-rc.13", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js", From 6078081c336ab42535cbea173c728d2aef08d5d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 31 May 2024 12:24:53 +0000 Subject: [PATCH 8/8] [skip ci] Release: 2024.5.0 --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 175561e467..b1786e16f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2024.5.0-rc.13", + "version": "2024.5.0", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index a49bfab941..4ff1a57309 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2024.5.0-rc.13", + "version": "2024.5.0", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js",