Revert "Merge branch 'develop' into develop"

This reverts commit 9febc64, reversing changes made to 4d75786.
aic-6301 · Aug 11, 2024 · a3d236c · a3d236c
1 parent 9febc64
commit a3d236c
Show file tree

Hide file tree

Showing 65 changed files with 58 additions and 1,575 deletions.
diff --git a/.github/ISSUE_TEMPLATE/02_feature-request.yml b/.github/ISSUE_TEMPLATE/02_feature-request.yml
@@ -15,7 +15,6 @@ body:
       description: Describe the specific problem or need you think this feature will solve, and who it will help.
     validations:
       required: true
-
   - type: checkboxes
     attributes:
       label: Do you want to implement this feature yourself?

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  REGISTRY_IMAGE: taichanne30/nadesuki
+  REGISTRY_IMAGE: misskey/misskey
   TAGS: |
     type=edge
     type=ref,event=pr

diff --git a/CHANGELOG_NADE.md b/CHANGELOG_NADE.md
diff --git a/COPYING b/COPYING
@@ -1,5 +1,5 @@
 Unless otherwise stated this repository is
-Copyright © 2014-2024 syuilo and contributers
+Copyright © 2014-2024 syuilo and contributors
 
 And is distributed under The GNU Affero General Public License Version 3, you should have received a copy of the license file as LICENSE.
 

diff --git a/DIFFERENCE.md b/DIFFERENCE.md
diff --git a/README.md b/README.md
@@ -24,8 +24,7 @@
 <a href="https://www.patreon.com/syuilo">
 		<img src="https://custom-icon-badges.herokuapp.com/badge/become_a-patron-F96854?logoColor=F96854&style=for-the-badge&logo=patreon&labelColor=363B40" alt="become a patron"/></a>
 
-## Diff of this fork
-[Changelog of this fork](CHANGELOG_NADE)
+</div>
 
 ## Thanks
 

diff --git a/locales/en-US.yml b/locales/en-US.yml
@@ -980,7 +980,6 @@ cannotUploadBecauseInappropriate: "This file could not be uploaded because parts
 cannotUploadBecauseNoFreeSpace: "Upload failed due to lack of Drive capacity."
 cannotUploadBecauseExceedsFileSizeLimit: "This file cannot be uploaded as it exceeds the file size limit."
 beta: "Beta"
-originalFeature: "Nadesskey"
 enableAutoSensitive: "Automatic marking as sensitive"
 enableAutoSensitiveDescription: "Allows automatic detection and marking of sensitive media through Machine Learning where possible. Even if this option is disabled, it may be enabled instance-wide."
 activeEmailValidationDescription: "Enables stricter validation of email addresses, which includes checking for disposable addresses and by whether it can actually be communicated with. When unchecked, only the format of the email is validated."

diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -3936,10 +3936,6 @@ export interface Locale extends ILocale {
      * ベータ
      */
     "beta": string;
-    /**
-     * Nadesskey
-     */
-    "originalFeature": string;
     /**
      * 自動センシティブ判定
      */
@@ -4384,18 +4380,6 @@ export interface Locale extends ILocale {
      * 常に広告を表示する
      */
     "forceShowAds": string;
-    /**
-     * ノート通知
-     */
-    "noteNotification": string;
-    /**
-     * ノート通知を有効にする
-     */
-    "noteSubscribe": string;
-    /**
-     * ノート通知を無効にする
-     */
-    "noteUnsubscribe": string;
     /**
      * メモを追加
      */

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -980,7 +980,6 @@ cannotUploadBecauseInappropriate: "不適切な内容を含む可能性がある
 cannotUploadBecauseNoFreeSpace: "ドライブの空き容量が無いためアップロードできません。"
 cannotUploadBecauseExceedsFileSizeLimit: "ファイルサイズの制限を超えているためアップロードできません。"
 beta: "ベータ"
-originalFeature: "Nadesskey"
 enableAutoSensitive: "自動センシティブ判定"
 enableAutoSensitiveDescription: "利用可能な場合は、機械学習を利用して自動でメディアにセンシティブフラグを設定します。この機能をオフにしても、サーバーによっては自動で設定されることがあります。"
 activeEmailValidationDescription: "ユーザーのメールアドレスのバリデーションを、捨てアドかどうかや実際に通信可能かどうかなどを判定しより積極的に行います。オフにすると単に文字列として正しいかどうかのみチェックされます。"
@@ -1092,9 +1091,6 @@ accountMoved: "このユーザーは新しいアカウントに移行しまし
 accountMovedShort: "このアカウントは移行されています"
 operationForbidden: "この操作はできません"
 forceShowAds: "常に広告を表示する"
-noteNotification: "ノート通知"
-noteSubscribe: "ノート通知を有効にする"
-noteUnsubscribe: "ノート通知を無効にする"
 addMemo: "メモを追加"
 editMemo: "メモを編集"
 reactionsList: "リアクション一覧"

diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
@@ -980,7 +980,6 @@ cannotUploadBecauseInappropriate: "きわどい内容を含むかもしれへん
 cannotUploadBecauseNoFreeSpace: "ドライブがもうパンパンやからアップロードできへんわ。"
 cannotUploadBecauseExceedsFileSizeLimit: "ファイルが思うたよりも大きいさかいアップロードできへんでこれ。"
 beta: "ベータ"
-originalFeature: "Nadesskey"
 enableAutoSensitive: "自動できわどいか判断する"
 enableAutoSensitiveDescription: "使える時は、機械学習を使って自動でメディアにNSFWフラグを設定するで。この機能をオフにしても、サーバーによっては自動で設定されることがあるで。"
 activeEmailValidationDescription: "ユーザーのメアドのバリデーションを、捨てアドかどうかとか、ちゃんと通信できるかとかを見るで。切ったら単に文字列として合っとるかどうかだけ見るわ。"

diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
 	"name": "misskey",
-	"version": "2024.8.0-nade.1.5.6.alpha.0",
+	"version": "2024.8.0-alpha.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/nadesuki/nadesskey.git"
+		"url": "https://github.com/misskey-dev/misskey.git"
 	},
 	"packageManager": "pnpm@9.6.0",
 	"workspaces": [

diff --git a/packages/backend/assets/tabler-badges/bell.png b/packages/backend/assets/tabler-badges/bell.png
diff --git a/packages/backend/migration/1682932943132-note-notification.js b/packages/backend/migration/1682932943132-note-notification.js
diff --git a/packages/backend/migration/1697814583291-delete-created-at.js b/packages/backend/migration/1697814583291-delete-created-at.js