1
0

Merge tag '2025.4.0' into merge/2025-03-24

# Conflicts:
#	.github/workflows/storybook.yml
#	locales/index.d.ts
#	package.json
#	packages/backend/src/models/json-schema/role.ts
#	packages/frontend/src/components/MkPageWindow.vue
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/admin/roles.vue
#	packages/frontend/src/pages/settings/preferences.vue
#	packages/frontend/src/pages/settings/privacy.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pref-migrate.ts
#	packages/frontend/src/ui/_common_/common.vue
#	packages/frontend/src/ui/deck.vue
#	packages/frontend/src/ui/universal.vue
#	packages/misskey-js/src/autogen/types.ts
This commit is contained in:
Hazelnoot
2025-04-13 13:04:57 -04:00
98 changed files with 1621 additions and 2087 deletions
+5 -4
View File
@@ -5166,7 +5166,7 @@ export type components = {
/** @default false */
notify: boolean;
/** @default false */
hideNotesInSensitiveChannel: boolean;
excludeNotesInSensitiveChannel: boolean;
};
Clip: {
/**
@@ -5451,7 +5451,8 @@ export type components = {
canImportMuting: boolean;
canImportUserLists: boolean;
scheduleNoteMax: number;
canChat: boolean;
/** @enum {string} */
chatAvailability: 'available' | 'readonly' | 'unavailable';
};
ReversiGameLite: {
/** Format: id */
@@ -12145,7 +12146,7 @@ export type operations = {
excludeBots?: boolean;
withReplies: boolean;
withFile: boolean;
hideNotesInSensitiveChannel?: boolean;
excludeNotesInSensitiveChannel?: boolean;
};
};
};
@@ -12457,7 +12458,7 @@ export type operations = {
excludeBots?: boolean;
withReplies?: boolean;
withFile?: boolean;
hideNotesInSensitiveChannel?: boolean;
excludeNotesInSensitiveChannel?: boolean;
};
};
};