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

Merge upstream #199

Merged
merged 4 commits into from
Apr 24, 2024
Merged

Merge upstream #199

merged 4 commits into from
Apr 24, 2024

Conversation

taiyme
Copy link
Owner

@taiyme taiyme commented Apr 24, 2024

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

@github-actions github-actions bot added packages/frontend Client side specific issue/PR packages/backend Server side specific issue/PR packages/misskey-js packages/backend:test labels Apr 24, 2024
@taiyme taiyme marked this pull request as ready for review April 24, 2024 08:55
@taiyme taiyme merged commit c7ff3b0 into taiyme Apr 24, 2024
4 checks passed
@taiyme taiyme deleted the merge-upstream branch April 24, 2024 08:55
taiyme added a commit that referenced this pull request May 7, 2024
@taiyme
Merge branch 'taiyme' into workflow-for-v2024
ee094e1 
Squashed commit of the following:

commit 24684f0
Merge: 8ecb4c1 00dc7c5
Author: taiy <[email protected]>
Date:   Tue May 7 14:24:01 2024 +0900

    Merge pull request #212 from taiyme/merge-upstream

commit 00dc7c5
Merge: 8ecb4c1 c639f30
Author: taiyme <[email protected]>
Date:   Tue May 7 12:24:06 2024 +0900

    Merge remote-tracking branch 'upstream/develop' into merge-upstream

commit 8ecb4c1
Author: taiyme <[email protected]>
Date:   Tue May 7 11:25:29 2024 +0900

    tweak(MkNoteSub): 余白の微調整など

commit c1b0a9e
Author: taiyme <[email protected]>
Date:   Mon May 6 22:53:02 2024 +0900

    tweak(MkNoteDetailed): 返信を自動で展開する

commit 21eced5
Author: taiyme <[email protected]>
Date:   Mon May 6 22:51:28 2024 +0900

    refactor: 空文字の比較を厳密等価演算子に修正

commit c639f30
Author: syuilo <[email protected]>
Date:   Mon May 6 20:41:39 2024 +0900

    Update CHANGELOG.md

commit fc77ad9
Author: syuilo <[email protected]>
Date:   Mon May 6 20:37:04 2024 +0900

    refactor(frontend): provide linkNavigationBehavior

commit 533f395
Author: taiyme <[email protected]>
Date:   Mon May 6 19:49:34 2024 +0900

    refactor: style属性のセミコロンなど

commit 691157d
Author: taiyme <[email protected]>
Date:   Mon May 6 19:47:57 2024 +0900

    fix(MkNoteDetailed): renoteInfoにチャンネルが含まれない

commit 2b21c19
Author: syuilo <[email protected]>
Date:   Sat May 4 20:56:14 2024 +0900

    update deps (misskey-dev#13624)

    * update deps

    * Update package.json

    * update deps

    * build: pass --strip-leading-paths to restore 0.2.x behavior (misskey-dev#13684)

    * ✌️

    * ✌️

    * pureimageの代わりに@napi-rs/canvasを使う (misskey-dev#13748)

    * pureimageの代わりに@napi-rs/canvasを使う

    * remove writestream

    * remove createtemp

    * wip

    * Update ClientServerService.ts

    * update pnpm to 9.x

    * update deps

    * re: update pnpm to 9.x

    * update node

    * ✌️

    ---------

    Co-authored-by: anatawa12 <[email protected]>
    Co-authored-by: tamaina <[email protected]>

commit eef7fcd
Author: syuilo <[email protected]>
Date:   Sat May 4 19:40:17 2024 +0900

    chore(frontend): ui tweak

commit 774bdd1
Author: taiyme <[email protected]>
Date:   Sat May 4 19:14:36 2024 +0900

    enh(ui): 描画しているUIをprovide/injectする

commit a3f979f
Author: taiyme <[email protected]>
Date:   Sat May 4 19:18:11 2024 +0900

    tweak(tms): インスタンス情報 -> ノートのサーバー情報

commit ab0309c
Author: taiyme <[email protected]>
Date:   Sat May 4 19:16:50 2024 +0900

    tweak(tms): Pull-to-Refresh -> 引っ張ってリロード

commit 053e762
Author: かっこかり <[email protected]>
Date:   Sat May 4 13:21:40 2024 +0900

    enhance(frontend_ais): PostForm系の設定項目を追加 (misskey-dev#13788)

    * enhance(frontend_ais): PostForm系の設定項目を追加

    * Update Changelog

commit ab34fa5
Author: taiyme <[email protected]>
Date:   Fri May 3 20:33:56 2024 +0900

    chore(frontend): update patrons

commit 7c9c175
Author: taiy <[email protected]>
Date:   Thu May 2 22:38:53 2024 +0900

    fix(InstanceTicker): リモートサーバーのアイコンが初期画像になる問題 (#211)

commit b173f77
Author: taiyme <[email protected]>
Date:   Thu May 2 17:23:36 2024 +0900

    chore: welcome to (taiymeize)

commit b31e21a
Author: taiyme <[email protected]>
Date:   Thu May 2 17:08:54 2024 +0900

    fix mock (MkPostForm, MkMediaImage)

commit eab973d
Author: taiy <[email protected]>
Date:   Wed May 1 19:43:28 2024 +0900

    enhance(MkMention): Acctが長い場合省略して表示する、他 (#209)

    * enh: Acctが長い場合省略して表示する (fix: Acctが長い場合謎の改行が発生する問題)
    * fix: 一部の値がリアクティブでない問題
    * fix: 特定の条件下で自分自身を判定できない問題

commit 5a329a0
Author: taiy <[email protected]>
Date:   Wed May 1 18:23:11 2024 +0900

    Revert "enhance(frontend): add contact page" (#208)

    This reverts commit ef630df.

commit 40b501b
Merge: 3979cc2 d3799d6
Author: taiy <[email protected]>
Date:   Wed May 1 18:17:16 2024 +0900

    Merge pull request #207 from taiyme/merge-upstream

commit d3799d6
Merge: 3979cc2 c530a46
Author: taiyme <[email protected]>
Date:   Wed May 1 17:52:52 2024 +0900

    Merge remote-tracking branch 'upstream/develop' into merge-upstream

commit c530a46
Author: Kisaragi <[email protected]>
Date:   Wed May 1 17:13:20 2024 +0900

    enhance(backend): ドライブのファイルがNSFWかどうか個別に連合されるように (misskey-dev#13756)

    * fix(backend): ノートのattachmentにおいて、attach.sensitiveが元から存在する場合はそれを尊重する

    * docs: update changelog (per misskey-dev#13756)

    * feat(backend,apub): renderDocumentがsensitiveを連合するようにする
    per misskey-dev#13755 (comment)

    * chore(backend): 追加したコメントを削除

    * docs: changelogをより丁寧にする

    * docs: changelogの項目名をPRに合わせる

    * docs: tweak

    apply suggestion from mei23

commit 9c057e6
Author: zyoshoka <[email protected]>
Date:   Wed May 1 16:39:16 2024 +0900

    fix(frontend): fix Storybook type errors (misskey-dev#13779)

    * fix(frontend): fix Storybook type errors

    * fix: `hasReduce` doesn't work in args

commit d2a5bb3
Author: Daiki Mizukami <[email protected]>
Date:   Wed May 1 07:33:58 2024 +0000

    Merge pull request from GHSA-2vxv-pv3m-3wvj

    * fix: normalize incoming signed activities

    * Tweak style

    * Update CHANGELOG.md

    * Log compacted activity as well

    ---------

    Co-authored-by: syuilo <[email protected]>

commit 9f66f22
Author: taiy <[email protected]>
Date:   Wed May 1 15:29:38 2024 +0900

    fix(frontend): 連合なしの状態の読み書きができない問題 (misskey-dev#13777)

    * fix: 連合なしの状態の読み書きができない問題

    * update changelog

    * fix types: misskey-dev#13777 (comment)

commit ef630df
Author: syuilo <[email protected]>
Date:   Wed May 1 14:12:36 2024 +0900

    enhance(frontend): add contact page

commit 8c5e564
Author: かっこかり <[email protected]>
Date:   Wed May 1 13:52:59 2024 +0900

    fix type error

commit 2017f91
Author: かっこかり <[email protected]>
Date:   Wed May 1 13:51:00 2024 +0900

    refactor(frontend): 非ログイン画面でのmeta取得を減らす (misskey-dev#13776)

    * refactor(frontend): 非ログイン画面でのmeta取得を減らす

    * fix(frontend): サーバー供給のmetaとクライアントフォールバックで取れるmetaの型が違うのを修正

    * force fetch meta at welcome.vue

    * refactor

commit 3979cc2
Author: taiy <[email protected]>
Date:   Tue Apr 30 23:13:24 2024 +0900

    fix: 連合なしの状態の読み書きができない問題、他 (#206)

    * fix: 連合なしの状態の読み書きができない問題
    * fix: canPakuru: trueの場合、canRenoteを無視してリノートボタンが表示される問題
    * refactoring: 共通部分を関数でまとめたり、三項演算子をやめてif文の記述にしたり、など

commit 5f93074
Author: taiyme <[email protected]>
Date:   Mon Apr 29 21:04:51 2024 +0900

    fix(tms): toMeEntity でトークンが取得できないことがある問題

commit 2d23e45
Author: CaffeinePower <[email protected]>
Date:   Tue Apr 30 09:57:36 2024 +0900

    hotfix: compact incoming signed activities (#205)

    Co-authored-by: Daiki Mizukami <[email protected]>

commit 2ff90a8
Author: zyoshoka <[email protected]>
Date:   Mon Apr 29 15:36:01 2024 +0900

    fix(backend): add detailed schema to `fetch-rss` endpoint (misskey-dev#13764)

commit b8beb2d
Author: taiyme <[email protected]>
Date:   Mon Apr 29 15:28:57 2024 +0900

    fix(frontend): isEnabledUrlPreview をリアクティブに判定する

commit 15ca917
Merge: 5b31fea fd55f35
Author: taiy <[email protected]>
Date:   Sun Apr 28 20:34:13 2024 +0900

    Merge pull request #203 from taiyme/merge-upstream

commit fd55f35
Merge: 5b31fea e2ff5f5
Author: taiyme <[email protected]>
Date:   Sun Apr 28 19:36:30 2024 +0900

    Merge remote-tracking branch 'upstream/develop' into merge-upstream

commit e2ff5f5
Author: syuilo <[email protected]>
Date:   Sun Apr 28 10:54:20 2024 +0900

    lint

commit c7d7da8
Author: MeiMei <[email protected]>
Date:   Sun Apr 28 10:53:33 2024 +0900

    AP Link等は添付ファイル扱いしないようになど (misskey-dev#13754)

    * Linkは添付ファイルではない

    * CHANGELOG

commit 8e8ee2a
Author: anatawa12 <[email protected]>
Date:   Sat Apr 27 21:24:39 2024 +0900

    open links in abuse comment in new window (misskey-dev#13381)

    * feat: changing MkA behavior from MkMFM

    * chore: open links in abuse comment in new window

    * docs(changelog): 通報のコメント内のリンクをクリックした際、ウィンドウで開くように

    * chore: use inject instead of prop drilling

    * Revert "chore: use inject instead of prop drilling"

    This reverts commit b4dd14e.

commit fe1172f
Author: anatawa12 <[email protected]>
Date:   Sat Apr 27 20:41:55 2024 +0900

    fix: ハイフンを含むリモート絵文字が描画されない (misskey-dev#13715)

commit 20eb4bc
Author: ikasoba <[email protected]>
Date:   Sat Apr 27 20:26:55 2024 +0900

    Fix(backend): ActivityPubでのHTMLへのシリアライズを修正 (misskey-dev#13752)

    * devモードでもActivityPub系エンドポイントへアクセスできるように

    * ActivityPubでのHTMLのシリアライズを修正

    * ハードコードしていたurlを`httpUrl`へ修正

    * テストの追加

commit 78e61c6
Author: かっこかり <[email protected]>
Date:   Sat Apr 27 20:00:57 2024 +0900

    fix(frontend_reversi): 共有ボタンの実装を改善 (misskey-dev#13750)

    * fix(frontend_reversi): 共有ボタンの実装を改善

    * Update Changelog

    ---------

    Co-authored-by: syuilo <[email protected]>

commit 7ce6a9b
Author: かっこかり <[email protected]>
Date:   Sat Apr 27 19:59:30 2024 +0900

    fix(frontend): グループ通知の人数をちゃんと数えるように (misskey-dev#13751)

    * fix(frontend): グループ通知の人数をちゃんと数えるように

    * Update Changelog

commit cb5d8bd
Author: かっこかり <[email protected]>
Date:   Sat Apr 27 18:53:28 2024 +0900

    fix(backend): ページのOGP URLが違うのを修正 (misskey-dev#13749)

    * fix(backend): ページのOGP URLが違うのを修正

    * Update Changelog

    * typo

commit 0a31e13
Author: かっこかり <[email protected]>
Date:   Sat Apr 27 16:48:04 2024 +0900

    fix(frontend): PlayのAiScriptランタイムが停止したときに画面が初期化されていない問題を修正 (misskey-dev#13747)

    * fix(frontend): PlayのAiScriptランタイムが停止したときに画面が初期化されていない問題を修正

    * fix

    * Update Changelog

    * typo

commit f53e22d
Author: salano_ym <[email protected]>
Date:   Sat Apr 27 16:12:00 2024 +0900

    add comma (misskey-dev#13746)

commit 6abb8c4
Author: MeiMei <[email protected]>
Date:   Sat Apr 27 12:57:00 2024 +0900

    Merge pull request from GHSA-m9qf-3pfj-2r86

    * Add Cache-Control to Bull Board

    * CHANGELOG

    ---------

    Co-authored-by: syuilo <[email protected]>

commit 5b31fea
Merge: e44a64b 8e2a2b9
Author: taiy <[email protected]>
Date:   Fri Apr 26 22:46:12 2024 +0900

    Merge pull request #202 from taiyme/merge-upstream

commit 8e2a2b9
Merge: e44a64b 85339ca
Author: taiyme <[email protected]>
Date:   Fri Apr 26 22:38:40 2024 +0900

    Merge remote-tracking branch 'upstream/develop' into merge-upstream

commit e44a64b
Author: taiyme <[email protected]>
Date:   Fri Apr 26 22:29:52 2024 +0900

    fix(frontend): もっと見るが見切れる問題

commit 95885ba
Author: taiyme <[email protected]>
Date:   Fri Apr 26 18:53:08 2024 +0900

    tweak: スワイプしてタブを切り替える はデフォルトで無効にする

commit 53727e6
Author: taiyme <[email protected]>
Date:   Fri Apr 26 18:42:00 2024 +0900

    enh(locale): コミットハッシュ変更時に言語アセットを更新する

commit e27d7b2
Author: taiyme <[email protected]>
Date:   Fri Apr 26 17:49:52 2024 +0900

    chore: ユニオン型のパイプ記号の位置を変更

commit a869939
Author: taiy <[email protected]>
Date:   Fri Apr 26 00:15:23 2024 +0900

    feat(tms): インスタンス情報の表示位置 (#198)

commit ae5735e
Author: taiyme <[email protected]>
Date:   Thu Apr 25 23:25:50 2024 +0900

    chore: update docs (taiymeize)

    * chore: update issue template (taiymeize)

    * chore: update docs (taiymeize)

commit 85339ca
Author: Cocoa Hoto <[email protected]>
Date:   Thu Apr 25 11:03:34 2024 +0900

    feat: improve emoji endpoint (misskey-dev#13742)

commit 553ba84
Author: FineArchs <[email protected]>
Date:   Thu Apr 25 10:34:26 2024 +0900

    AiScriptのバージョンを0.18.0に上げる (misskey-dev#13743)

    * Update package.json

    * Update autogen files

    * Update flash-edit.vue

    * Update flash-edit.vue

    * Update CHANGELOG.md

    * revert

commit 2e2d01c
Author: taiyme <[email protected]>
Date:   Wed Apr 24 20:44:03 2024 +0900

    change: FTTはデフォルトで無効にする

commit 214f1ae
Author: taiyme <[email protected]>
Date:   Wed Apr 24 20:20:07 2024 +0900

    chore: update boot (taiymeize)

commit d215c8b
Author: taiyme <[email protected]>
Date:   Wed Apr 24 20:07:23 2024 +0900

    chore: update docs (taiymeize)

commit c7ff3b0
Merge: 5505af0 b32f369
Author: taiy <[email protected]>
Date:   Wed Apr 24 17:55:45 2024 +0900

    Merge pull request #199 from taiyme/merge-upstream

commit b32f369
Merge: 5505af0 f9aed8f
Author: taiyme <[email protected]>
Date:   Wed Apr 24 17:36:30 2024 +0900

    Merge remote-tracking branch 'upstream/develop' into merge-upstream

commit 5505af0
Author: taiy <[email protected]>
Date:   Wed Apr 24 17:34:47 2024 +0900

    feat(tms): Pull-to-Refreshでページ全体をリロードする (#197)

commit caade94
Author: taiy <[email protected]>
Date:   Wed Apr 24 17:28:17 2024 +0900

    feat(tms): Pull-to-Refreshの感度 (#196)

commit 0a142d2
Author: taiyme <[email protected]>
Date:   Wed Apr 24 17:14:03 2024 +0900

    chore(mfm): 視差効果が許可されている場合動きのあるMFMをデフォルトで有効にする

commit 8bc2301
Author: taiy <[email protected]>
Date:   Tue Apr 23 16:08:16 2024 +0900

    fix(frontend): 1:1以外のエラー画像のアスペクト比が崩れる問題 (#195)

commit f9aed8f
Author: anatawa12 <[email protected]>
Date:   Fri Apr 19 19:42:01 2024 +0900

    fix: 正規化されていない状態のhashtagが連合されてきたhtmlに含まれているとhashtagが正しくhashtagに復元されない問題を修正 (misskey-dev#13733)

commit cd7f727
Author: おさむのひと <[email protected]>
Date:   Fri Apr 19 15:22:23 2024 +0900

    enhance: 新しいコンディショナルロール条件の実装 (misskey-dev#13732)

    * enhance: 新しいコンディショナルロールの実装

    * fix: CHANGELOG.md

commit ea9aa6f
Author: かっこかり <[email protected]>
Date:   Wed Apr 17 18:29:35 2024 +0900

    :art: （ページ表示部上部のボタン順序を変更）

    Fix misskey-dev#13724 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
packages/backend:test packages/backend Server side specific issue/PR packages/frontend Client side specific issue/PR packages/misskey-js
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@taiyme @kakkokari-gtyih @samunohito @anatawa12