Merge upstream 2025-01-17 #40

Merged

ashten merged 35 commits from sugar/forkey:merge-upstream-2025-01-17 into main 2025-02-03 16:05:49 +00:00

Conversation 3 Commits 35 Files changed 109 +4870 -2674

sugar commented 2025-01-17 15:38:00 +00:00

Owner

Copy link

This is a pretty large change, including stuff like scheduled notes, and drafts, so it makes sense to merge it.

This is a pretty large change, including stuff like scheduled notes, and drafts, so it makes sense to merge it.

sugar added 30 commits 2025-01-17 15:38:01 +00:00

fix(MisskeyIO#866): ユーザーメニューからロールの割り当て時メモを入力しないとキャンセル扱いされる問題を修正 (MisskeyIO#877) 0d24c8843c

fix(frontend/mobile): モバイルでkawaiiモードが適用されない問題を修正 (MisskeyIO#878) 8bd7884873

spec(notes/create): 投稿されたnoteを返さないオプションを追加 (MisskeyIO#879) 535a6bc756

Sync charts one-at-a-time to reduce database contention and timeouts (MisskeyIO#880) ... 8a0b98aa26

(cherry picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/830)

Co-authored-by: Hazelnoot <acomputerdog@gmail.com>

feat(frontend/draft): 下書き機能の改良・強化 (MisskeyIO#881) 31d57f270c

Bump up version to 2024.5.0-io.6 (MisskeyIO#882) f280ce2a39

fix(frontend): 一定の条件でノート送信ボタンが意図しない見た目になる問題を修正 (MisskeyIO#884) ... c88478f31b

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

spec(MisskeyIO#884): 送信ボタンをアイコンのみの表示にするしきい値を変更 (MisskeyIO#885) d4baf040cc

spec(MisskeyIO#884): 送信ボタンをアイコンのみの表示にするしきい値を変更 2 (MisskeyIO#886) cf1952ac0d

update deps (MisskeyIO#887) ... 9792ea0223

(cherry picked from commit f7da2bad6f0b25652ded11e6a9f86efc40872200)
(cherry picked from commit d60c307c4e4c3eaba2a40b46ba41c4d684d5d370)

Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

Bump up version to 2024.5.0-io.6a (MisskeyIO#888) 5f6cbe048a

update deps (MisskeyIO#889) ... 68c3eb5b5d

- メンテナンスされないredis-lockを自前実装に変更
- 既にロックされている場合のリトライ間隔を調整

update deps (MisskeyIO#891) 509f385402

feat(note): 予約投稿 (MisskeyIO#890) cbe80fdd26

perf(frontend/css): MkNote 及び MkNotification に content-visibility を適用 (MisskeyIO#892) 6993e5b7fd

Bump up version to 2024.5.0-io.7 (MisskeyIO#893) 86209cf4b3

fix(backend/object-storage): disable data integrity protections (MisskeyIO#895) ... bcb85f2237

Cloudflare R2 does not support 'x-amz-checksum-*'

Bump up version to 2024.5.0-io.7a (MisskeyIO#896) f69e489442

fix(frontend/MkDraftsDialog): 🎨 (MisskeyIO#898) fc31c0e219

Bump up version to 2024.5.0-io.7b (MisskeyIO#899) a075b6aeef

chore(frontend): 通報のカテゴリの調整・投稿フォームのガイドラインへの導線に利用規約も追加 (MisskeyIO#902) f60d9da614

fix(backend/SigninApiService): ログインのレートリミット時、意図したものと違うエラーメッセージが表示される可能性がある問題を修正 (MisskeyIO#903) 71c2921b9d

enhance(ux/frontend/MkPostForm): 予約投稿の時間を再度設定する時、以前設定した時間が表示されるように (MisskeyIO#904) 655ed957bc

spec(backend/queue/ScheduledNote): 予約時間が過ぎる前にチェックするように (MisskeyIO#905) f0f86f1121

spec(role/ScheduledNote): ロールで予約投稿の個数・予約の最大日数を制御できるように (MisskeyIO#906) 8821e3e81b

perf(stream): 必要のない既読処理のメッセージが発生しないように (MisskeyIO#907) c4fafbdca7

Bump up version to 2024.5.0-io.7c (MisskeyIO#908) 428ff56abe

fix(MisskeyIO#907): サブスクライブコマンドは必要だった (MisskeyIO#910) d423d9bb44

perf: dynamically load audio visualizer (MisskeyIO#912) ... 15414e4ce5

audio visualizer weights 475 kB by itself, and audio files are
relatively rare on timelines, so it makes sense to load it only when
it's necessary

Merge remote-tracking branch 'misskeyio/io' into merge-upstream-2025-01-17 2ac89cd654

sugar added 1 commit 2025-01-17 15:40:39 +00:00

Revert "fix(frontend/mobile): モバイルでkawaiiモードが適用されない問題を修正 (MisskeyIO#878)" ... d35b2dd0bc

This reverts commit 8bd7884873.

sugar commented 2025-01-17 15:41:49 +00:00

Author

Owner

Copy link

Reverting kawaii change again, rebasing (which fae has done to run tests) broke previous merge (made it a cherry-pick essentially), so all previous commits were reapplied.

Reverting kawaii change again, rebasing (which fae has done to run tests) broke previous merge (made it a cherry-pick essentially), so all previous commits were reapplied.

sugar added 1 commit 2025-01-19 00:08:37 +00:00

Merge branch 'main' into merge-upstream-2025-01-17 6b7e6bedb3

sugar commented 2025-01-19 00:15:10 +00:00

Author

Owner

Copy link

Merged main due to merge conflict related to rebranding changing the package name in package.json (this merge conflict will occur with every single update pretty much, but that's okay).

Merged main due to merge conflict related to rebranding changing the package name in `package.json` (this merge conflict will occur with every single update pretty much, but that's okay).

sugar added 1 commit 2025-01-19 08:31:43 +00:00

Merge branch 'main' into merge-upstream-2025-01-17 9e4fd869d2

sugar commented 2025-01-19 08:31:56 +00:00

Author

Owner

Copy link

Merging main again due to lint issues.

Merging main again due to lint issues.

leah added 1 commit 2025-02-03 12:29:06 +00:00

Merge branch 'main' into merge-upstream-2025-01-17 83c1dc4105

leah added 1 commit 2025-02-03 15:53:31 +00:00

Merge branch 'main' into merge-upstream-2025-01-17 0ceb07314b

ashten merged commit 0ef9fb12c4 into main 2025-02-03 16:05:49 +00:00

ashten referenced this pull request from a commit 2025-02-03 16:05:50 +00:00

Merge pull request 'Merge upstream 2025-01-17' (#40) from sugar/forkey:merge-upstream-2025-01-17 into main

leah deleted branch merge-upstream-2025-01-17 2025-02-03 17:12:59 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something is not working

  

customization

Change something to be more suitable for forkey

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

feature parity

Another fork has this feature, and it should be pulled into this fork.

  

help wanted

Need some help

  

high priority

  

invalid

Something is wrong

  

low priority

  

question

More information is needed

  

wontfix

This won't be fixed

No labels

bug

customization

duplicate

enhancement

feature parity

help wanted

high priority

invalid

low priority

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

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: woem.men/forkey#40

No description provided.