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.

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

マルチトラック:mainをマージ #2159

Merged
merged 4 commits into from
Jul 5, 2024
Merged

Conversation

sevenc-nanashi
Copy link
Member

@sevenc-nanashi sevenc-nanashi commented Jul 5, 2024

内容

project-multitrackにmainを持ってきます。主に #2128 です。

関連 Issue

(なし)

スクリーンショット・動画など

(なし)

その他

conflictが無かったのでmainから直接投げています。一応buffer作った方が良いかも?

sabonerune and others added 4 commits July 2, 2024 04:24
* feat: IPCメッセージの`sender`を確認する

* Apply suggestions from code review

---------

Co-authored-by: Hiroshiba <[email protected]>
* Update: Typescriptを更新

* Update: typescript-eslintを更新

* Update: package-lock.jsonを更新

* Update: 色々更新
* feat: ウインドウの作成とナビゲーションを無効化する

* Update src/backend/electron/main.ts

---------

Co-authored-by: Hiroshiba <[email protected]>
fix:returnResourceUrlの説明を追加
@sevenc-nanashi sevenc-nanashi requested a review from a team as a code owner July 5, 2024 10:51
@sevenc-nanashi sevenc-nanashi requested review from Hiroshiba and removed request for a team July 5, 2024 10:51
Copy link
Member

@Hiroshiba Hiroshiba left a comment

Choose a reason for hiding this comment

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

LGTM!!

コンフリクト無いならそのままPR&マージが最適だと思います!!

@Hiroshiba Hiroshiba merged commit a2d4da8 into project-multitrack Jul 5, 2024
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants