Merge branch 'develop' into feature/2024.9.0

# Conflicts: # locales/en-US.yml # locales/ja-JP.yml # packages/backend/src/core/NoteCreateService.ts # packages/backend/src/core/NoteDeleteService.ts # packages/backend/src/core/NoteEditService.ts # packages/frontend-shared/js/config.ts # packages/frontend/src/boot/common.ts # packages/frontend/src/pages/following-feed.vue # packages/misskey-js/src/autogen/endpoint.ts
2024-10-15 18:01:57 -04:00
parent d04e44b552 68b90df00b
commit 8a34d8e9d2
52 changed files with 1073 additions and 268 deletions
@@ -10916,6 +10916,22 @@ export interface Locale extends ILocale {
     * Severing all follow relations with {host} queued.
     */
    "severAllFollowRelationsQueued": ParameterizedString<"host">;
+    /**
+     * Pending follow requests
+     */
+    "pendingFollowRequests": string;
+    /**
+     * Show quotes
+     */
+    "showQuotes": string;
+    /**
+     * Show replies
+     */
+    "showReplies": string;
+    /**
+     * Show non-public
+     */
+    "showNonPublicNotes": string;
    "_mfm": {
        /**
         * This is not a widespread feature, it may not display properly on most other fedi software, including other Misskey forks