mattyatea
e039cba2a3
fix
2024-06-20 14:08:20 +09:00
mattyatea
a72bb3026e
fix
2024-06-20 14:01:08 +09:00
mattyatea
a64c607584
emoji more
2024-06-20 13:48:44 +09:00
mattyatea
88122a3d9d
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkPostForm.vue
2024-04-14 21:54:44 +09:00
zyoshoka
960c4df48e
enhance(frontend): better condition for posting and displaying Notes ( #13670 )
...
* enhance(frontend): better condition for posting and displaying Notes
* Update CHANGELOG.md
2024-04-07 21:16:37 +09:00
mattyatea
04fae906c9
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/models/Meta.ts
# packages/backend/src/server/api/endpoints/admin/meta.ts
# packages/backend/src/server/api/endpoints/admin/update-meta.ts
# packages/frontend/src/components/MkButton.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNoteDetailed.vue
# packages/frontend/src/components/MkSwitch.button.vue
# packages/frontend/src/pages/settings/general.vue
2024-04-01 15:32:52 +09:00
1Step621
d4ca973e34
Enhance(frontend): もっと!ボタンでリアクション一覧が開けるように ( #12935 )
...
* もっと!ボタンでリアクション一覧が開けるように
* update CHANGELOG.md && デバッグ用に最大リアクション表示数を1にしてたのを一応戻した
* fix
* デザイン調整
* maxNumberもどす
* fix CHANGELOG
* fix
* move changelog
* 🎨
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-03-30 20:30:22 +09:00
かっこかり
6bd78770de
enhance(frontend): リアクション受け入れがいいねのみの場合はボタンホバーでツールチップが出るように ( #13613 )
2024-03-22 18:21:14 +09:00
おさむのひと
831c74a25b
fix: URLプレビューの動作改善+動作設定を可能にする ( #13579 )
...
* wip
* support new version
* URLプレビュー無効化時、フロント側も非表示にしてリクエストをしないようにする
* fix lint
* fix lint
* tweak preview request error handles
* fix: CHANGELOG.md
* fix
* fix
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-03-21 18:46:42 +09:00
mattyatea
c2aba3886a
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkNote.vue
2024-03-09 20:49:56 +09:00
かっこかり
27f823e882
enhance(frontend): リアクションの総数を表示するか設定で選べるように ( #13539 )
...
* enhance(frontend): リプライ・リノート・リアクションの総数を表示するか設定で選べるように (MisskeyIO#512)
(cherry picked from commit 3c8475e5ac )
* fix: いいねのみの場合は強制的にカウント表示
* make `showReactionsCount` default false
* リアクションだけ
* けしわすれ
* けしわすれ2
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2024-03-08 18:13:09 +09:00
かっこかり
7ead98cbe5
enhance(frontend): リアクションの総数を表示するように ( #13532 )
...
* enhance(frontend): リアクションの総数を表示するように
* Update Changelog
* リアクション選択済の色をaccentに
2024-03-06 21:08:42 +09:00
tamaina
c1514ce91d
(re) update SPDX-FileCopyrightText
...
Fix #13290
2024-02-13 15:59:27 +00:00
tamaina
311c2172d7
Revert "update SPDX-FileCopyrightText"
...
This reverts commit 9b5aeb76d8 .
2024-02-13 15:50:11 +00:00
mattyatea
5812b15cbd
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/core/QueueService.ts
# packages/frontend/src/components/global/MkFooterSpacer.vue
2024-02-13 05:48:07 +09:00
syuilo
9b5aeb76d8
update SPDX-FileCopyrightText
2024-02-12 11:37:45 +09:00
mattyatea
dfd491ff85
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/endpoints/notes/create.ts
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/pages/settings/theme.vue
2024-02-09 10:14:24 +09:00
かっこかり
6829ecb509
enhance(frontend): リモートへの引用リノートと同一のリンクにはリンクプレビューを表示しないように ( #13178 )
...
* enhance(frontend): リモートへの引用リノートと同一のリンクにはリンクプレビューを表示しないように
* Update Changelog
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2024-02-06 16:49:57 +09:00
1Step621
74245df382
Enhance(frontend): フロント側でもリアクション権限のチェックをするように ( #13134 )
...
* フロント側でもリアクション権限のチェックをするように
* update CHANGELOG.md
* lint fixes
* remove unrelated diffs
* deny -> reject
denyは「(信用しないことを理由に)拒否する」という意味らしい
* allow -> accept
* EmojiSimpleにlocalOnlyを含めるように
* リアクション権限のない絵文字は打てないように(ダイアログを出すのではなく)
* regenerate type definitions
* lint fix
* remove unused locales
* remove unnecessary async
2024-02-06 16:45:21 +09:00
mattyatea
7579df2da0
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkFoldableSection.vue
# packages/frontend/src/components/MkPostForm.vue
2024-02-03 21:13:22 +09:00
tamaina
07dc99d197
「見たことのあるリノートを省略して表示」が効いていない問題を修正 ( #13133 )
...
* fix: 「見たことのあるリノートを省略して表示」が効いていない問題を修正
fix #13131
* add a comment
2024-02-02 11:24:20 +09:00
mattyatea
942b7f1b3c
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/endpoints.ts
# packages/frontend/src/components/MkButton.vue
# packages/frontend/src/components/MkDrive.vue
# packages/frontend/src/components/MkEmojiPicker.section.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/MkFoldableSection.vue
# packages/frontend/src/components/MkInput.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/components/MkSwitch.button.vue
# packages/frontend/src/components/MkTab.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/components/MkUserSelectDialog.vue
# packages/frontend/src/components/global/MkCustomEmoji.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/ui/universal.vue
2024-01-31 19:51:51 +09:00
yukineko
a6a91fec3a
refactor: frontendのcomponentsの型エラーを改善 ( #12926 )
...
* add: safeFloatParserを追加
* fix: 欠けていた型を追加
* refactor: pageBlockTypesをjson-schemaに移植
* refactor: components/global内の型エラーが出ている箇所を修正
* lint: fix null check style
* refactor: fix type error
* refactor: fix some type errors
* fix: 翻訳が抜けていた箇所を修正
* refactor: getJsonSchemaで正しいスキーマが返されるように修正
* fix: MkChartの型エラーとbytesオプションが機能していない問題を修正
* fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正
* refactor: fix some type errors
* change: Captcha読み込み中の文言をLoadingに変更
* refactor(backend/misskey-js): MainEventの型を改善
* refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正
* update: misskey-js.api.md
* refactor: fix some type errors
* fix: backendのtypecheckが落ちていたのを修正
* update: misskey-js.api.md
* add: json-schemaのnoteにpollの型定義を追加
* refactor: noteのjson-schemaの型を改善
* refactor: MkPoll
* refactor: fix some type errors
* change: UserLiteにisLockedを持たせるように
* fix: notificationスキーマにroleが含まれていないのを修正
* Revert "change: UserLiteにisLockedを持たせるように"
This reverts commit 1bb0c8e7a9 .
* fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正
* refactor: noteスキーマのvisibilityにenumを追加
* change: deepCloneのCloneableTypeにundefinedを追加
* refactor: fix some type errors
* refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え
* enhance: API 'retension' のresponseの型を追加
* fix: Chart関連のtooltipが正しい位置に表示されない問題を修正
* refactor: fix some type errors
* fix: 型情報が不足していたのを修正
* enhance: announcementスキーマにenumを追加
* enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植
* refactor: policiesを`ref: RolePolicies`に統一
* fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正
* refactor: fix some type errors
* fix: backendのlintが落ちているのを修正
* fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正
* fix: backendのtypecheckが落ちているのを修正
* update: run build-misskey-js-with-types
* fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正
* update: CHANGELOG.md
* refactor: MkUserSelectDialogの型を改善
* fix: deepCloneでundefinedはcloneしないように (#9207 )
* change: frontendのcloneをbackend側にも反映
* update: CHANGELOG.md
* fix: RoleServiceからPackを通して型RolePoliciesに依存させないように
* Update packages/frontend/src/scripts/get-note-summary.ts
* revert RoleService.ts changes
* change: optional chaining -> non-null assertion
* remove: unused import
* fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正
* change: fix null check style
* refactor: fix type error
* change: fix null check style
* Update packages/frontend/src/components/MkDrive.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* refactor: css moduleでglobalを使わないように
* refactor: roleのiconUrlは必ず存在するものとして扱うように
* enhance: MenuButtonのactiveにcomputedを受け付けられるように
* Update packages/frontend/src/components/MkNotePreview.vue
* Update MkWindow.vue
* refactor: notification.noteは必ず存在するものとして扱うように
* Update packages/frontend/src/components/MkNotification.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正
* Update packages/frontend/src/scripts/clone.ts
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* refactor: 不要な返り値の型を削除
* refactor: 不要なnullチェックを削除
* update: misskey-js-autogen
* update: clone.ts
* refactor
* Update MkNotification.vue
* Update MkNotification.vue
* ✌️
* Update MkNotification.vue
* Update MkNotification.vue
* Update MkNotification.vue
* Update MkNotifications.vue
* Update MkUserSetupDialog.Profile.vue
* Update MkUserCardMini.vue
* ✌️
* Update MkMenu.vue
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2024-01-30 19:53:53 +09:00
mattyatea
78a34d3de3
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/pages/timeline.vue
2024-01-23 12:38:56 +09:00
かっこかり
0580ba1fb5
enhance(frontend): タイムラインフィルターの設定を保持+センシティブなノートを隠せるように ( #12848 )
...
* (enhance) タイムラインフィルターの状態を記憶するように
* fix
* (enhance) センシティブな投稿をミュート形式で表示する(TLのみ)
* fix
* Update Changelog
* Fix changelog
* Lintエラーを潰す
* Update locales/ja-JP.yml
* hideSensitive -> withSensitive
* Update CHANGELOG.md
* Update ja-JP.yml
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2024-01-21 18:29:17 +09:00
mattyatea
f6d3fde92d
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/models/_.ts
# packages/frontend/src/components/MkDrive.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/components/MkUserSelectDialog.vue
# packages/frontend/src/components/index.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/avatar-decorations.vue
# packages/frontend/src/pages/settings/mute-block.word-mute.vue
# packages/frontend/src/pages/user/home.vue
# packages/misskey-bubble-game/src/monos.ts
2024-01-20 14:54:06 +09:00
Acid Chicken (硫酸鶏)
7881f06be0
refactor: deprecate i18n.t ( #13039 )
...
* refactor: deprecate i18n.t
* revert: deprecate i18n.t
This reverts commit 7dbf873a2f .
* chore: reimpl
2024-01-20 08:11:59 +09:00
mattyatea
33507e24ff
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/models/_.ts
# packages/backend/src/postgres.ts
# packages/frontend/src/components/MkDrive.file.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/router.ts
# packages/frontend/src/ui/universal.vue
2024-01-11 21:46:28 +09:00
かっこかり
0d7f9308cc
enhance(frontend): バブルゲームの諸々を修正・改良2 ( #12948 )
...
* (fix) ゲームが正常に終了するように
* (enhance) 効果音の音量を設定可能に
* (add) store
* (add) スクショにロゴの透かしを入れる
* Update packages/frontend/src/pages/drop-and-fusion.vue
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
* tweak
* tweak
* tweak
* tweak
* Update drop-and-fusion.vue
* tweak
* tweak
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2024-01-09 13:25:33 +09:00
mattyatea
de3f4ce29c
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkChannelFollowButton.vue
# packages/frontend/src/components/MkDrive.folder.vue
# packages/frontend/src/components/MkDrive.navFolder.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/pages/about.vue
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/admin/instance-block.vue
# packages/frontend/src/pages/avatar-decorations.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/mute-block.vue
# packages/frontend/src/pages/settings/profile.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user/home.vue
2024-01-06 14:24:39 +09:00
おさむのひと
fa9c4a19b9
refactor(frontend): os.tsに引き込んだscripts/api.tsの再exportをやめる ( #12694 )
...
* refactor(frontend): os.tsに引き込んだscripts/api.tsの再exportをやめる
* fix
* fix
* renate to "misskeyApi"
* rename file
2024-01-04 18:32:46 +09:00
mattyatea
8d058b0529
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/pages/about.vue
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/mute-block.vue
# packages/frontend/src/pages/settings/theme.vue
# packages/frontend/src/ui/_common_/navbar-for-mobile.vue
2023-12-26 23:38:43 +09:00
zyoshoka
75034d9240
refactor(frontend): Reactivityで型を明示するように ( #12791 )
...
* refactor(frontend): Reactivityで型を明示するように
* fix: プロパティの参照が誤っているのを修正
* fix: 初期化の値を空配列に書き換えていた部分をnullに置き換え
2023-12-26 14:19:35 +09:00
mattyatea
487b3089a0
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# README.md
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNoteSimple.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/widgets/WidgetInstanceInfo.vue
2023-12-23 09:14:17 +09:00
woxtu
c92508a575
Remove unused imports ( #12730 )
2023-12-21 11:36:45 +09:00
1STEP621
eeedef59c4
Fix(frontend): CWボタンに常に「引用」が出てしまうのを修正 ( #12715 )
...
* RNと引用RNの判定が間違っているのを修正
* remove dump.rdb
* update CHANGELOG.md
* lint fix
* fix cw button label
2023-12-19 18:30:31 +09:00
1STEP621
f6ff3b1f1a
Fix: Renoteの判定が間違っているのを修正 ( #12706 )
...
* RNと引用RNの判定が間違っているのを修正
* remove dump.rdb
* update CHANGELOG.md
* lint fix
2023-12-18 19:49:19 +09:00
mattyatea
8c4a08c383
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
# packages/backend/src/server/api/endpoints/admin/meta.ts
# packages/backend/src/server/api/endpoints/channels/timeline.ts
# packages/backend/src/server/api/endpoints/notes/featured.ts
# packages/frontend/src/components/MkButton.vue
# packages/frontend/src/components/MkClickerGame.vue
# packages/frontend/src/components/MkDialog.vue
# packages/frontend/src/components/MkDrive.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkEmojiPicker.section.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/components/MkInstanceTicker.vue
# packages/frontend/src/components/MkLaunchPad.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNoteSimple.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkRadio.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/components/MkSwitch.vue
# packages/frontend/src/custom-emojis.ts
# packages/frontend/src/pages/about.emojis.vue
# packages/frontend/src/pages/about.vue
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/admin/other-settings.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/settings/mute-block.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/pages/user/index.files.vue
# packages/frontend/src/scripts/get-note-menu.ts
# packages/frontend/src/store.ts
# packages/frontend/src/ui/_common_/stream-indicator.vue
# packages/frontend/src/ui/classic.sidebar.vue
# packages/frontend/src/ui/universal.vue
# packages/frontend/src/ui/universal.widgets.vue
# packages/frontend/vite.config.ts
# packages/misskey-js/etc/misskey-js.api.md
# packages/misskey-js/src/api.types.ts
# packages/misskey-js/src/entities.ts
# packages/misskey-js/src/streaming.types.ts
2023-12-13 07:08:57 +09:00
syuilo
b691126bff
refactor(frontend): menuのdividerをnullで表現するのをやめる
2023-12-12 10:26:37 +09:00
zyoshoka
406b4bdbe7
refactor(frontend): 非推奨となったReactivity Transformを使わないように ( #12539 )
...
* refactor(frontend): 非推奨となったReactivity Transformを使わないように
* refactor: 不要な括弧を除去
* fix: 不要なアノテーションを除去
* fix: Refの配列をrefしている部分の対応
* refactor: 不要な括弧を除去
* fix: lint
* refactor: Ref、ShallowRef、ComputedRefの変数の宣言をletからconstに置換
* fix: type error
* chore: drop reactivity transform from eslint configuration
* refactor: remove unnecessary import
* fix: 対応漏れ
2023-12-07 14:42:09 +09:00
mattyatea
1802c5da5f
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/navbar.ts
2023-12-02 00:47:40 +09:00
zyoshoka
98e1af28b8
enhance(frontend): ノートプレビューにCWが反映されるように ( #12509 )
...
* enhance(frontend): ノートプレビューにCWが反映されるように
* Update CHANGELOG.md
* refactor: 不要な条件を除去
* Revert "refactor: 不要な条件を除去"
This reverts commit e4eff689bd .
* fix: やっぱり不要な条件だった
2023-11-30 13:49:31 +09:00
anatawa12
8f1da036f4
style: fix lint error of 6acaded8 ( #12476 )
2023-11-27 15:29:39 +09:00
anatawa12
6acaded898
fix: error can be happened if animation is on and hard mute matches ( #12474 )
2023-11-27 14:47:25 +09:00
mattyatea
072b228568
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkNote.vue
2023-11-26 18:20:21 +09:00
mattyatea
5b7984a23b
Revert "Fix: mute"
...
This reverts commit bbf1ba6a
2023-11-26 16:54:42 +09:00
かっこかり
5bdae9f6d0
enhance(frontend): リアクション選択時に音を流せるように ( #12441 )
...
* (add) リアクション選択時に音を鳴らせるように
* Update Changelog
* tweak sound
* tweak sound
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-11-26 13:04:44 +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
d439dd66f9
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkNotifications.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/ui/_common_/navbar.vue
# packages/frontend/src/ui/_common_/stream-indicator.vue
2023-11-15 13:32:09 +09:00