From 1ffdf20a52643e5f8fd0b97b0a2f470ce9ec3aa9 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 13 Sep 2022 21:43:58 -0700 Subject: [PATCH 1/4] =?UTF-8?q?docs:=20=F0=9F=93=9D=20Docker=20instruction?= =?UTF-8?q?s=20=F0=9F=90=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2bd90a94b7..68ed33ce4e 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,6 @@ NODE_ENV=production yarn run build && yarn run migrate ```sh # git pull -sudo docker-compose build -sudo docker-compose stop && sudo docker-compose up -d +sudo docker compose build +sudo docker compose stop && sudo docker compose up -d ``` From c7f679d3962a57f2c7a4e3fbc3c39755ac6d7d4e Mon Sep 17 00:00:00 2001 From: "Jae Lo Presti (DN0)" Date: Wed, 14 Sep 2022 09:36:24 +0300 Subject: [PATCH 2/4] client: remove orphaned closing tags --- packages/client/src/pages/user/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue index b1bbd2dd4c..79a411b989 100644 --- a/packages/client/src/pages/user/index.vue +++ b/packages/client/src/pages/user/index.vue @@ -31,8 +31,6 @@ - - From e72e336dfa3e48075e705efb20ec12a10a4bb437 Mon Sep 17 00:00:00 2001 From: "Jae Lo Presti (DN0)" Date: Wed, 14 Sep 2022 09:37:01 +0300 Subject: [PATCH 3/4] docker-compose: replace misskey with calckey to fix example --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0bf17a5557..feea00ae25 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,8 +14,8 @@ services: - internal_network - external_network volumes: - - ./files:/misskey/files - - ./.config:/misskey/.config:ro + - ./files:/calckey/files + - ./.config:/calckey/.config:ro redis: restart: always From b983bdb5cf3de3c71097588a9f36d4f7e124f5b8 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 14 Sep 2022 10:32:39 -0700 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E2=9C=A8=20Warning=20in=20control?= =?UTF-8?q?=20panel=20if=20there's=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CALCKEY.md | 1 + locales/en-US.yml | 1 + locales/ja-JP.yml | 1 + package.json | 2 +- packages/client/src/pages/admin/index.vue | 13 ++++++++++++- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CALCKEY.md b/CALCKEY.md index d2ab613728..e567951692 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -75,6 +75,7 @@ - Make showing the update popup optional - Improve PWA manifest - Fix incoming chat scrolling globally +- Update notifier - Obliteration of Ai-chan - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996) - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056) diff --git a/locales/en-US.yml b/locales/en-US.yml index bfde20c5cb..e5ea4c0a0b 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -913,6 +913,7 @@ recommendedInstances: "Recommended instances" recommendedInstancesDescription: "Recommended instances seperated by line breaks to appear in the recommended timeline. Do NOT add `https://`, ONLY the domain." caption: "Auto Caption" splash: "Splash Screen" +updateAvailable: "There's an update available!" _sensitiveMediaDetection: description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server." diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index c0b244cbc0..5636421842 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -913,6 +913,7 @@ recommendedInstances: "推奨インスタンス" recommendedInstancesDescription: "推奨タイムラインに表示するために改行で区切られた推奨インスタンス。`https：//`を追加しないでください。ドメインのみを追加してください。" caption: "自動キャプション" splash: "スプラッシュスクリーン" +updateAvailable: "アップデートがありますよ" _sensitiveMediaDetection: description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。" diff --git a/package.json b/package.json index 89095852bd..3ac5f93fbd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc", + "version": "12.119.0-calc.1", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue index 9200b5d547..7e95ab368a 100644 --- a/packages/client/src/pages/admin/index.vue +++ b/packages/client/src/pages/admin/index.vue @@ -1,6 +1,6 @@