Merge branch 'develop' into merge/2024-02-03
# Conflicts: # locales/index.d.ts # packages/backend/src/core/SearchService.ts # packages/frontend/src/pages/search.note.vue # packages/misskey-js/src/autogen/types.ts # sharkey-locales/en-US.yml
This commit is contained in:
commit
667262dcfb
8 changed files with 135 additions and 59 deletions
36
locales/index.d.ts
vendored
36
locales/index.d.ts
vendored
|
|
@ -12049,6 +12049,42 @@ export interface Locale extends ILocale {
|
|||
*/
|
||||
"title": string;
|
||||
};
|
||||
"_noteSearch": {
|
||||
/**
|
||||
* Sort by newest to oldest
|
||||
*/
|
||||
"newestToOldest": string;
|
||||
/**
|
||||
* File Type
|
||||
*/
|
||||
"fileType": string;
|
||||
"_fileType": {
|
||||
/**
|
||||
* None
|
||||
*/
|
||||
"none": string;
|
||||
/**
|
||||
* Images
|
||||
*/
|
||||
"image": string;
|
||||
/**
|
||||
* Videos
|
||||
*/
|
||||
"video": string;
|
||||
/**
|
||||
* Audio
|
||||
*/
|
||||
"audio": string;
|
||||
/**
|
||||
* Module
|
||||
*/
|
||||
"module": string;
|
||||
/**
|
||||
* Flash
|
||||
*/
|
||||
"flash": string;
|
||||
};
|
||||
};
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue