Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry-pick of 4 PRs #243

Merged
merged 4 commits into from
Jan 29, 2025
Merged

Cherry-pick of 4 PRs #243

merged 4 commits into from
Jan 29, 2025

Conversation

anatawa12
Copy link
Collaborator

What

Why

Additional info (optional)

Checklist

  • Read the contribution guide
  • Test working in a local environment
  • (If needed) Add story of storybook
  • (If needed) Update CHANGELOG.md
  • (If possible) Add tests

@anatawa12
enhance(backend): スレッドミュートにおいて、RN/引用/リアクションの通知もミュートするように (misskey-dev…
f2f5cfe 
…#15271)

commit 7de945d
Merge: ff3c154 4f31dcf
Author: Sayamame-beans <[email protected]>
Date:   Mon Jan 27 19:25:03 2025 +0900

    Merge branch 'develop' into enhance-thread-mute

commit ff3c154
Merge: 97d6561 8f37fb6
Author: Sayamame-beans <[email protected]>
Date:   Sat Jan 25 21:39:48 2025 +0900

    Merge branch 'develop' into enhance-thread-mute

commit 97d6561
Merge: 72aa1cb 31ccefa
Author: Sayamame-beans <[email protected]>
Date:   Tue Jan 21 19:47:39 2025 +0900

    Merge branch 'develop' into enhance-thread-mute

commit 72aa1cb
Author: Sayamame-beans <[email protected]>
Date:   Sun Jan 19 03:57:55 2025 +0900

    test(backend): fix test

commit 9f94145
Author: Sayamame-beans <[email protected]>
Date:   Sun Jan 19 03:49:07 2025 +0900

    test(backend): fix test

commit cf67704
Author: Sayamame-beans <[email protected]>
Date:   Wed Jan 15 23:23:11 2025 +0900

    test(backend): update thread-mute test

commit a379c85
Merge: fb43b2d 145c6cf
Author: Sayamame-beans <[email protected]>
Date:   Tue Jan 14 21:39:11 2025 +0900

    Merge branch 'develop' into enhance-thread-mute

commit fb43b2d
Author: Sayamame-beans <[email protected]>
Date:   Mon Jan 13 21:45:26 2025 +0900

    docs(changelog): update changelog

commit 17bf032
Author: Sayamame-beans <[email protected]>
Date:   Mon Jan 13 20:39:30 2025 +0900

    fix(backend): thread mute did not suppress Quote when Quoted is not muted but Quoting is on muted tree

commit 109718f
Author: Sayamame-beans <[email protected]>
Date:   Mon Jan 13 17:18:30 2025 +0900

    chore: move comment position

commit b3d0ac9
Author: Sayamame-beans <[email protected]>
Date:   Sun Jul 21 00:25:43 2024 +0900

    fix(backend): thread mute did not suppress Reaction

commit 61f517a
Author: Sayamame-beans <[email protected]>
Date:   Sat Jul 20 23:44:05 2024 +0900

    fix(backend): thread mute did not suppress RN/Quote
@anatawa12
feat(frontend): 画像を投稿前にプレビュー可能に (misskey-dev#15341)
2e38f84 
commit 83d2794
Author: taichan <[email protected]>
Date:   Mon Jan 27 10:23:18 2025 +0900

    Update packages/frontend/.storybook/generate.tsx

commit 842c745
Author: tai-cha <[email protected]>
Date:   Sat Jan 25 17:09:01 2025 +0900

    Add MkImgPreviewDialog to storybook generator

commit e1365fb
Author: tai-cha <[email protected]>
Date:   Sat Jan 25 17:02:37 2025 +0900

    backgroundのスタイル変更

    Co-authored-by: kakkokari-gtyih <[email protected]>

commit 4bb30a1
Author: tai-cha <[email protected]>
Date:   Sat Jan 25 16:59:32 2025 +0900

    Add storybook for MkImgPreviewDialog

commit c838f80
Author: tai-cha <[email protected]>
Date:   Sat Jan 25 16:43:25 2025 +0900

    消えてたのFix

commit b4842c0
Author: tai-cha <[email protected]>
Date:   Sat Jan 25 16:41:09 2025 +0900

    SPDX

commit 5b0aec5
Author: tai-cha <[email protected]>
Date:   Sat Jan 25 16:33:33 2025 +0900

    Update Changelog

commit ce787e4
Author: tai-cha <[email protected]>
Date:   Sat Jan 25 16:31:51 2025 +0900

    feat(client): 画像をプレビュー可能に
@anatawa12
アンテナ、リスト等の名前をdeckのカラム名のデフォルト値にするように (misskey-dev#13992)
29c1970 
commit a28ab48
Author: anatawa12 <[email protected]>
Date:   Thu Jan 9 11:02:25 2025 +0900

    docs: fix changelog

commit 212a2d8
Author: anatawa12 <[email protected]>
Date:   Thu Jan 9 10:50:26 2025 +0900

    chore: チャンネルについては投稿でも使用されてる channel 変数を使用するように

commit e173d2b
Author: anatawa12 <[email protected]>
Date:   Thu Jan 9 10:48:54 2025 +0900

    chore: カラム名が指定されている場合にはチャンネル名を取得しないように

commit 6209947
Merge: c4c3c86 13439e0
Author: かっこかり <[email protected]>
Date:   Wed Jan 8 21:13:54 2025 +0900

    Merge branch 'develop' into deck-default-name

commit c4c3c86
Merge: cda207f 89841e4
Author: かっこかり <[email protected]>
Date:   Thu Sep 26 13:31:29 2024 +0900

    Merge branch 'develop' into deck-default-name

commit cda207f
Merge: a805a27 8b4933c
Author: Sayamame-beans <[email protected]>
Date:   Wed Jul 17 19:39:59 2024 +0900

    Merge branch 'develop' into deck-default-name

commit a805a27
Merge: eeb1d73 b8b4dc5
Author: syuilo <[email protected]>
Date:   Sat Jun 22 19:45:39 2024 +0900

    Merge branch 'develop' into deck-default-name

commit eeb1d73
Author: anatawa12 <[email protected]>
Date:   Fri Jun 14 15:27:16 2024 +0900

    lint: fix

commit 063cd34
Author: anatawa12 <[email protected]>
Date:   Fri Jun 14 12:13:35 2024 +0900

    docs: アンテナ、リスト等の名前をカラム名のデフォルト値にするように

commit 90efe12
Author: anatawa12 <[email protected]>
Date:   Fri Jun 14 12:10:33 2024 +0900

    feat: アンテナ、リスト等の名前をカラム名のデフォルト値にするように

commit 452a8ed
Author: anatawa12 <[email protected]>
Date:   Fri Jun 14 10:42:15 2024 +0900

    refactor: remove type errors from deck.vue and deck-store.ts
@anatawa12
fix: iPadでdeck uiでマウスホイールでスクロールできない (misskey-dev#15244)
f16dd50 
commit b299046
Author: anatawa12 <[email protected]>
Date:   Thu Jan 9 20:23:25 2025 +0900

    docs(changelog): iPadOSでdeck uiをマウスカーソルによってスクロールできない問題を修正

commit 8a531b7
Author: anatawa12 <[email protected]>
Date:   Thu Jan 9 20:11:34 2025 +0900

    fix: ipadでdeck uiでスクロールできない
@github-actions GitHub Actions
Copy link

このPRによるapi.jsonの差分
差分はありません。
Get diff files from Workflow Page

Sayamame-beans
Sayamame-beans approved these changes Jan 29, 2025
View reviewed changes
Copy link

@Sayamame-beans Sayamame-beans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

多分ヨシ!

@anatawa12 anatawa12 merged commit 11b944d into niri-la:develop Jan 29, 2025
28 checks passed
@anatawa12 anatawa12 deleted the picks branch January 29, 2025 04:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sayamame-beans Sayamame-beans Sayamame-beans approved these changes

Assignees
No one assigned
Labels
packages/backend:test packages/backend packages/frontend
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@anatawa12 @Sayamame-beans