Commit graph

6 commits

Author SHA1 Message Date
mattyatea
5fe20bbe96 fix mute 2023-11-26 18:21:16 +09:00
mattyatea
5b7984a23b Revert "Fix: mute"
This reverts commit bbf1ba6a
2023-11-26 16:54:42 +09:00
mattyatea
ff79746100 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	packages/backend/src/models/json-schema/user.ts
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkReactionsViewer.reaction.vue
#	packages/frontend/src/pages/settings/mute-block.word-mute.vue
#	packages/misskey-js/etc/misskey-js.api.md
2023-11-24 22:44:42 +09:00
anatawa12
864827f788
Hard mute (#12376)
* feat(backend,misskey-js): hard mute storage in backend

* fix(backend,misskey-js): mute word record type

* chore(frontend): generalize XWordMute

* feat(frontend): configure hard mute

* feat(frontend): hard mute notes on the timelines

* lint(backend,frontend): fix lint failure

* chore(misskey-js): update api.md

* fix(backend): test failure

* chore(frontend): check word mute for reply

* chore: limit hard mute count
2023-11-23 18:56:20 +09:00
mattyatea
bbf1ba6a54 Fix: mute 2023-10-20 14:39:25 +09:00
syuilo
89e4f28d06 enhance(frontend): tweak ui 2023-10-04 20:03:52 +09:00
Renamed from packages/frontend/src/pages/settings/word-mute.vue (Browse further)