diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index ab540c6a4d..a3f2a82ed3 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -316,6 +316,8 @@ bannerUrl: "バナー画像のURL" basicInfo: "基本情報" pinnedUsers: "ピン留めユーザー" pinnedUsersDescription: "「みつける」ページなどにピン留めしたいユーザーを改行で区切って記述します。" +pinnedPages: "ピン留めページ" +pinnedPagesDescription: "インスタンスのトップページにピン留めしたいページのパスを改行で区切って記述します。" hcaptcha: "hCaptcha" enableHcaptcha: "hCaptchaを有効にする" hcaptchaSiteKey: "サイトキー" @@ -1117,6 +1119,7 @@ _pages: unlike: "いいね解除" my: "自分のページ" liked: "いいねしたページ" + featured: "人気" inspector: "インスペクター" contents: "コンテンツ" content: "ページブロック" diff --git a/migration/1605585339718-instance-pinned-pages.ts b/migration/1605585339718-instance-pinned-pages.ts new file mode 100644 index 0000000000..2f0ebab235 --- /dev/null +++ b/migration/1605585339718-instance-pinned-pages.ts @@ -0,0 +1,14 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class instancePinnedPages1605585339718 implements MigrationInterface { + name = 'instancePinnedPages1605585339718' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{"/announcements", "/featured", "/channels", "/pages", "/explore", "/games/reversi", "/about-misskey"}'::varchar[]`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedPages"`); + } + +} diff --git a/src/client/components/notes.vue b/src/client/components/notes.vue index f2ea7e929b..649e7c4cf6 100644 --- a/src/client/components/notes.vue +++ b/src/client/components/notes.vue @@ -8,7 +8,7 @@
- diff --git a/src/client/components/tab.vue b/src/client/components/tab.vue index 7278c74d9a..aca4d32a22 100644 --- a/src/client/components/tab.vue +++ b/src/client/components/tab.vue @@ -1,26 +1,32 @@ - - - diff --git a/src/client/pages/instance/emojis.vue b/src/client/pages/instance/emojis.vue index dcd12edc91..01ea0d7f82 100644 --- a/src/client/pages/instance/emojis.vue +++ b/src/client/pages/instance/emojis.vue @@ -1,7 +1,10 @@