Merge upstream changes #5

Merged

yume merged 26 commits from develop into master 2024-11-08 23:26:56 -06:00

Conversation 0 Commits 26 Files changed 96 +2070 -295

yume commented 2024-11-08 22:04:27 -06:00

Owner

Copy link

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

<!-- ℹ お読みください / README PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください: Thank you for your PR! Before creating a PR, please check the contribution guide: https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md --> ## What <!-- このPRで何をしたのか？ どう変わるのか？ --> <!-- What did you do with this PR? How will it change things? --> ## Why <!-- なぜそうするのか？ どういう意図なのか？ 何が困っているのか？ --> <!-- Why do you do it? What are your intentions? What is the problem? --> ## Additional info (optional) <!-- テスト観点など --> <!-- Test perspective, etc --> ## Checklist - [ ] Read the [contribution guide](https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md) - [ ] Test working in a local environment - [ ] (If needed) Add story of storybook - [ ] (If needed) Update CHANGELOG.md - [ ] (If possible) Add tests

yume self-assigned this 2024-11-08 22:04:27 -06:00

yume added 25 commits 2024-11-08 22:04:28 -06:00

fix(frontend): 一部のノート表示で設定にかかわらずセンシティブなファイルを含むノートが最小化される問題を修正 ... 7fc8a2a7b0

Fix https://github.com/misskey-dev/misskey/pull/14772#discussion_r1821707117

refactor(frontend): asとanyをすぐなおせる範囲で除去 (#14848) ... 17d9aca5a7

* refactor(frontend): できるだけanyを除去

* refactor

* lint

* fix

* remove unused

* Update packages/frontend/src/components/MkReactionsViewer.details.vue

* Update packages/frontend/src/components/MkUsersTooltip.vue

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

refactor ceb60d61b0

lint 724dea8136

refactor 224bbd486f

fix(frontend): withSensitiveフィルタ周りの挙動修正 (#14884) ... d57b8bf2e2

* fix(frontend): withSensitiveフィルタ周りの挙動修正

* Update MkNote.vue

fix(backend): ノートを連合する際にリモートユーザーのacctの大小文字を区別して処理している問題を修正 (#14880) ... 6718a54f6f

* fix: make sure outgoing remote mentions get resolved correctly if referenced with non-canonical casing (resolves #646)

* Update Changelog

* Update Changelog

* indent

---------

Co-authored-by: Laura Hausmann <laura@hausmann.dev>

fix(frontend): ノート投稿ボタンにホバー時のスタイルが適用されていない (#14887) ... a896c39dbf

* fix(frontend): ノート投稿ボタンにホバー時のスタイルが適用されていない (#305)

(cherry picked from commit 711ab846a967feeddbe0c908bee4b91646cec321)

* Update Changelog

---------

Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>

fix(backend): FTT無効時にユーザーリストタイムラインが使用できない問題を修正 (#14878) ... b1c82213a3

* fix: return getfromdb when FanoutTimeline is not enabled

* Update Changelog

* fix

---------

Co-authored-by: Lhc_fl <lhcfl@outlook.com>

chore: little type trick in pizzax.ts (#14891) ... f1eb17f66c

Make `makeGetterSetter` take the correct type associated with getter and setter

fix(backend): フォロワーへのメッセージの絵文字をemojisに含めるように (#14904) bca690f256

Update CHANGELOG.md 0b976064ca

fix(backend): followedMessageではなくdescriptionになっていたのを修正 (#14908) 794cb9ffe2

Update CONTRIBUTING.md 8a4ce16e90

fix(backend): SQLのサニタイズを強化 (#14920) ... 98b4717c45

* Fix code scanning alert no. 28: Incomplete string escaping or encoding (MisskeyIO#800)

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
(cherry picked from commit 443335c662b14f609d6a81a8f3807e95709aebc1)

* ✌️

---------

Co-authored-by: あわわわとーにゅ <17376330+u1-liquid@users.noreply.github.com>

fix(frontend): 外部URLへのリダイレクトのバリデーションを強化 (#14919) ... 5b60ae810b

* Fix code scanning alert no. 25: Incomplete URL scheme check (MisskeyIO#799)

* Fix code scanning alert no. 26: Incomplete URL scheme check

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* Fix code scanning alert no. 25: Incomplete URL scheme check

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

---------

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
(cherry picked from commit 7d7552e076c0152a5966e919be0e9a60b3736208)

* ✌️

---------

Co-authored-by: あわわわとーにゅ <17376330+u1-liquid@users.noreply.github.com>

enhance(frontend): 個別お知らせページではmetaタグを出力するように (#14902) ... e75b62f3f5

* enhance(frontend): 個別お知らせページではmetaタグを出力するように

* Update Changelog

enhance(backend) : リモートユーザーの照会をオリジナルにリダイレクトするように (#12892) (#14897) ... a4c5ce1413

* enhance(backend) : リモートユーザーの照会をオリジナルにリダイレクトするように (#12892)

* オリジンリダイレクトのテストをtodoとして追加。

e2eテストにリモートユーザー考慮のテストがなさそうなので。

次のコマンドで動くことは確認済みです。
curl "http://localhost:3000/@foo@bar" -H "accept: application/activity+json" -L

* Acctのパースを既存のパーサーでするように修正

* lint

refactor(frontend): 動画UIのフルスクリーン周りの調整 (#14877) ... 3a421837bf

* refactor(frontend): フルスクリーン周りの調整

(cherry picked from commit 783032caec5853d78d5af3391e29cf364f2282e8)

* refactor(frontend): deviceKindの循環参照を除去

(cherry picked from commit 1ca471f57e968a1a6e2259bde4a7c6da1fe0c54e)

* fix

---------

Co-authored-by: taiyme <53635909+taiyme@users.noreply.github.com>

fix(backend): ローカルユーザーへのメンションを含むノートが連合される際に正しいURLに変換されないことがある問題を修正 (#14879) ... 4a62051ce7

* fix: make sure mentions of local users get rendered correctly during AP delivery (resolves #645)

* Update Changelog

* indent

---------

Co-authored-by: Laura Hausmann <laura@hausmann.dev>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

Bump version to 2024.10.2-alpha.3 9f7d41eb47

Bump version to 2024.11.0-alpha.0 cf09aa21f0

auto deployment ... 616ec50435

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

fix branch matching ... 8e9c175c06

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

Merge tag '2024.11.0-alpha.0' into develop 770226a040

yume added 1 commit 2024-11-08 22:45:49 -06:00

qualify version ... 539ce47adb

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

yume merged commit 972e5ef753 into master 2024-11-08 23:26:56 -06:00

yume referenced this pull request from a commit 2024-11-08 23:26:58 -06:00

Merge pull request 'Merge upstream changes' (#5) from develop into master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

yume

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: yume/yumechi-no-kuni#5

No description provided.