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 #174

Merged
merged 35 commits into from
Feb 13, 2024
Merged

Merge upstream #174

merged 35 commits into from
Feb 13, 2024

Conversation

taiyme
Copy link
Owner

@taiyme taiyme commented Feb 13, 2024 •
edited
Loading

What

Why

Additional info (optional)

  • Dockerfileの変更、build-assets.mjsの調整を含む

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

mei23 and others added 30 commits February 7, 2024 19:57
@mei23
Enhance: 連合向けのノート配信を軽量化 (misskey-dev#13192)
e89d760 
* AP HTML表現をシンプルに

* a

* CHANGELOG

* リンク
@1Step621
Fix(frontend): MkCodeEditorで行がずれていくのを修正 (misskey-dev#13188)
56d7f58 
* MkCodeEditorで行がずれていくのを修正

* update CHANGELOG.md
@mei23
正しい 2024.2.0-beta.10 改版手順？ (misskey-dev#13173)
313ce82 
* 正しい 2024.2.0-beta.10 改版手順？

* run build-misskey-js-with-types
@kakkokari-gtyih @syuilo
enhance(frontend/HorizontalSwipe): 操作性の改善 (misskey-dev#13038)
155896a 
* Update swipe thresholds and touch-action

* スワイプ中にPullToRefreshが反応しないように

* 横スワイプに関与する可能性のある要素がある場合はスワイプを発火しないように

* update threshold

* isSwipingを外部化

* rename

---------

Co-authored-by: syuilo <[email protected]>
@syuilo
typo
52bf808
@mei23
Fix: Summaly proxy利用時にプレイヤーが動作しないことがあるのを修正 (misskey-dev#13196)
82c34f7 
* Fix: Summaly proxy利用時にプレイヤーが動作しないことがあるのを修正

* CHANGELOG
@zyoshoka
test(frontend): migrate MSW in Storybook to v2 (misskey-dev#13195)
5299d17
@kakkokari-gtyih
fix(frontend) misskey-js type (misskey-dev#13202)
90b633b
@kakkokari-gtyih
refactor(backend): exist -> exists (misskey-dev#13203)
0f7918c 
* refactor(backend): exist -> exists

* fix
@kakkokari-gtyih
fix(frontend): aiscriptのコードブロックでのハイライト指定を修正 (misskey-dev#13208)
d40612a
@tamaina
chore: use [email protected] / [email protected]
c0cb76f
@samunohito
fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加 (misskey-dev#13210)
614c9a0 
* fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加

* Serviceでチェックするように変更
@syuilo
perf(frontend): splash screenのdomが消えない場合があるのを修正
c23c97d 
misskey-dev#10805
@dependabot
chore(deps): bump pnpm/action-setup from 2 to 3 (misskey-dev#13215)
37d83df 
Bumps [pnpm/action-setup](https://github.com/pnpm/action-setup) from 2 to 3.
- [Release notes](https://github.com/pnpm/action-setup/releases)
- [Commits](pnpm/action-setup@v2...v3)

---
updated-dependencies:
- dependency-name: pnpm/action-setup
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@syuilo
New Crowdin updates (misskey-dev#13179)
b5b31bf 
* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Catalan)
@syuilo
update deps
7fc1d77
@syuilo
2024.2.0-beta.11
639f14f
@kakkokari-gtyih
fix misskey-js version
7a8cf27
@Srgr0
dev: Update misskey-tga deploy-test-environment.yml (misskey-dev#13221)
207e4f3
@kakkokari-gtyih
fix: misskey-jsの型定義生成時にバックエンドの依存パッケージもビルドするように (misskey-dev#13249)
0736eea 
* fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正

* type

* fix: misskey-jsの型定義生成時にバックエンドの依存パッケージもビルドするように

* Revert "type"

This reverts commit bac0951.

* Revert "fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正"

This reverts commit 92b2165.
@syuilo
Update about-misskey.vue
674fd0b
@syuilo
New Crowdin updates (misskey-dev#13216)
25383de 
* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)
@syuilo
Merge branch 'develop' of https://github.com/misskey-dev/misskey into…
4bdaf26 
… develop
@acid-chicken
feat: provide tarball (misskey-dev#13260)
3dc095d 
* feat: provide tarball

* build: pack on build-assets

* chore: use ignore-walk

* chore: debug

* build: dependencies
@syuilo
New translations ja-jp.yml (Spanish) (misskey-dev#13261)
6afd2dc
@syuilo
update SPDX-FileCopyrightText
9b5aeb7
@syuilo
Merge branch 'develop' of https://github.com/misskey-dev/misskey into…
a1e12c0 
… develop
@KisaragiEffective @kakkokari-gtyih
refactor(msjs): avoid any (part 1) (misskey-dev#13247)
b95e250 
* refactor(msjs): avoid any

* run api extractor

---------

Co-authored-by: かっこかり <[email protected]>
Co-authored-by: kakkokari-gtyih <[email protected]>
@u1-liquid
ci(test-frontend): Cypressのテストの失敗時、永遠に止まらない問題を回避 (MisskeyIO#434) (mis…
63c4396 
…skey-dev#13274)

失敗しないようタイムアウトの延長・15分で止まるように
@tamaina @kakkokari-gtyih
chore: 以前の開発環境（backendにアクセスする方式）を立ち上げられるように (misskey-dev#13220)
4f80b6f 
* chore: 以前の開発環境（backendにアクセスする方式）を立ち上げられるように

* Update scripts/dev.mjs

Co-authored-by: かっこかり <[email protected]>

---------

Co-authored-by: かっこかり <[email protected]>
@taiyme taiyme marked this pull request as ready for review February 13, 2024 09:30
@taiyme taiyme merged commit eeb48ba into taiyme Feb 13, 2024
2 checks passed
@taiyme taiyme deleted the merge-upstream branch February 13, 2024 09:41
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:test packages/frontend Client side specific issue/PR packages/misskey-js packages/sw
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.