Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts: # locales/index.d.ts # locales/ja-JP.yml # package.json # packages/backend/src/core/entities/NoteEntityService.ts # packages/backend/src/models/Note.ts # packages/backend/src/server/api/endpoints/roles/notes.ts # packages/backend/src/server/api/stream/channels/global-timeline.ts # packages/backend/src/server/api/stream/channels/home-timeline.ts # packages/backend/src/server/api/stream/channels/hybrid-timeline.ts # packages/backend/src/server/api/stream/channels/local-timeline.ts # packages/frontend/src/components/MkFollowButton.vue # packages/frontend/src/pages/settings/general.vue # packages/frontend/src/pages/timeline.vue # packages/frontend/src/pages/user/home.vue # packages/frontend/src/store.ts
This commit is contained in:
commit
eacb74cb44
246 changed files with 2381 additions and 1867 deletions
|
|
@ -443,7 +443,15 @@ export const defaultStore = markRaw(new Storage('base', {
|
|||
FeaturedOrNote: {
|
||||
where: 'device',
|
||||
default: false
|
||||
}
|
||||
},
|
||||
tlWithReplies: {
|
||||
where: 'device',
|
||||
default: false,
|
||||
},
|
||||
defaultWithReplies: {
|
||||
where: 'account',
|
||||
default: false,
|
||||
},
|
||||
}));
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue