diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index ac2b1b4d358a..acb04bd26e03 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -7,7 +7,7 @@ on:
workflow_dispatch:
env:
- REGISTRY_IMAGE: misskey/misskey
+ REGISTRY_IMAGE: pernucia/pern-custom-misskey
jobs:
# see https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
@@ -20,7 +20,7 @@ jobs:
platform:
- linux/amd64
- linux/arm64
- if: github.repository == 'misskey-dev/misskey'
+ if: github.repository == 'pernucia/pern-custom-misskey'
steps:
- name: Prepare
run: |
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index db899ba386be..9900540379ad 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,7 +6,7 @@ on:
workflow_dispatch:
env:
- REGISTRY_IMAGE: misskey/misskey
+ REGISTRY_IMAGE: pernucia/pern-custom-misskey
TAGS: |
type=edge
type=ref,event=pr
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 9f32969a79c3..b58832ee3aff 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2274,6 +2274,7 @@ _widgets:
chooseList: "リストを選択"
clicker: "クリッカー"
birthdayFollowings: "今日誕生日のユーザー"
+ paplin: "Papline"
_cw:
hide: "隠す"
diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue
index 97c765d81c73..86dbc01f5726 100644
--- a/packages/frontend/src/components/MkVisitorDashboard.vue
+++ b/packages/frontend/src/components/MkVisitorDashboard.vue
@@ -38,12 +38,12 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
diff --git a/packages/frontend/src/components/MkWidgets.vue b/packages/frontend/src/components/MkWidgets.vue
index ba619f606314..ecd598f06576 100644
--- a/packages/frontend/src/components/MkWidgets.vue
+++ b/packages/frontend/src/components/MkWidgets.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.selectWidget }}
-
+
{{ i18n.ts.add }}
{{ i18n.ts.close }}
diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue
index 8dfeb6d2a73e..e136196e66d1 100644
--- a/packages/frontend/src/pages/about.vue
+++ b/packages/frontend/src/pages/about.vue
@@ -10,9 +10,9 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
@@ -54,11 +54,13 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => [{
key: 'overview',
title: i18n.ts.overview,
-}, {
- key: 'emojis',
- title: i18n.ts.customEmojis,
- icon: 'ti ti-icons',
-}, {
+},
+// {
+// key: 'emojis',
+// title: i18n.ts.customEmojis,
+// icon: 'ti ti-icons',
+// },
+{
key: 'federation',
title: i18n.ts.federation,
icon: 'ti ti-whirl',
diff --git a/packages/frontend/src/pages/welcome.entrance.a.vue b/packages/frontend/src/pages/welcome.entrance.a.vue
index f0e4a852c971..5a8283b828da 100644
--- a/packages/frontend/src/pages/welcome.entrance.a.vue
+++ b/packages/frontend/src/pages/welcome.entrance.a.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
@@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ instance.host }}
diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts
index f908803f0116..9b0425eafb0d 100644
--- a/packages/frontend/src/ui/_common_/common.ts
+++ b/packages/frontend/src/ui/_common_/common.ts
@@ -51,12 +51,14 @@ export function openInstanceMenu(ev: MouseEvent) {
text: i18n.ts.instanceInfo,
icon: 'ti ti-info-circle',
to: '/about',
- }, {
- type: 'link',
- text: i18n.ts.customEmojis,
- icon: 'ti ti-icons',
- to: '/about#emojis',
- }, {
+ },
+ // {
+ // type: 'link',
+ // text: i18n.ts.customEmojis,
+ // icon: 'ti ti-icons',
+ // to: '/about#emojis',
+ // },
+ {
type: 'link',
text: i18n.ts.federation,
icon: 'ti ti-whirl',
@@ -66,12 +68,15 @@ export function openInstanceMenu(ev: MouseEvent) {
text: i18n.ts.charts,
icon: 'ti ti-chart-line',
to: '/about#charts',
- }, { type: 'divider' }, {
- type: 'link',
- text: i18n.ts.ads,
- icon: 'ti ti-ad',
- to: '/ads',
- });
+ }, { type: 'divider' }
+ // ,
+ // {
+ // type: 'link',
+ // text: i18n.ts.ads,
+ // icon: 'ti ti-ad',
+ // to: '/ads',
+ // }
+);
if ($i && ($i.isAdmin || $i.policies.canInvite) && instance.disableRegistration) {
menuItems.push({
diff --git a/packages/frontend/src/ui/visitor.vue b/packages/frontend/src/ui/visitor.vue
index 7d8677e3be78..eb1fa0dd1f61 100644
--- a/packages/frontend/src/ui/visitor.vue
+++ b/packages/frontend/src/ui/visitor.vue
@@ -17,10 +17,10 @@ SPDX-License-Identifier: AGPL-3.0-only