worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
27566 commits 2 branches 1049 tags 155 MiB
Commit graph

27566 commits

This branch
This branch
All branches
Author SHA1 Message Date
아르페 7524b89c9d fix: nanka iroiro 2024-02-17 21:01:14 +09:00
아르페 1663d8a36d style: LycheeBridge contributors 2024-02-17 20:53:52 +09:00
아르페 8d4c296f44 chore: bump version to 2.1 
autogen: api types
 2024-02-17 20:44:51 +09:00
아르페 699243d440 fix: cherrypick patch 
chore: pnpm resolution
style: change kr locales
 2024-02-17 20:43:22 +09:00
아르페 a006de9ced Merge branch 'misskey-develop' into develop 2024-02-17 20:33:45 +09:00
Cocoa Hoto ef5e4363b4 fix: allow moderators see role assigned users; fix #13301 (#13315) 2024-02-17 20:00:30 +09:00
anatawa12 10529ff6f4 chore: 通報ページのユーザをクリックした際にユーザをウィンドウで開くように (#13348) 
* chore: 通報ページのユーザをクリックした際にユーザをウィンドウで開くように

* docs(changelog): 通報ページのユーザをクリックした際にユーザをウィンドウで開くように

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-17 20:00:30 +09:00
syuilo 5bae455807 New Crowdin updates (#13341) 
* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Indonesian)

* 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 (French)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Ukrainian)

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

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Japanese, Kansai)
 2024-02-17 20:00:30 +09:00
syuilo 80acb85082 fix of 9a70ce8f5e 
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
 2024-02-17 19:59:51 +09:00
syuilo 2940723dcd Update package.json 2024-02-17 19:59:51 +09:00
syuilo 080d4265d3 2024.2.0 2024-02-17 19:59:51 +09:00
Acid Chicken (硫酸鶏) 27d4448961 feat: license violation protection (#13285) 
* spec(frontend): aboutページにリポジトリ・フィードバックのURLを表示させる

Cherry-picked from MisskeyIO#441
Cherry-picked from MisskeyIO#438

* feat: license violation protection

* build: fix typo

* build: fix typo

* fix: farewell to the static type land

* fix: key typo

* fix: import typo

* fix: properly interpret `prominently`

* docs: add disclaimer

* docs: update CHANGELOG

* chore: add gap

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-17 19:59:51 +09:00
syuilo b7397531c4 Update CHANGELOG.md 2024-02-17 19:59:51 +09:00
anatawa12 3685fe5b31 feat: add link to local note in initial comment of abuse note (#13347) 
* feat: add link to local note in initial comment of abuse note

* docs(changelog): ノートの通報時にリモートのノートであっても自インスタンスにおけるノートのリンクを含むように
 2024-02-17 19:59:51 +09:00
tamaina eb9d209a4b Merge pull request from GHSA-qqrm-9grj-6v32 
* maybe ok

* fix

* test wip

* ✌️

* fix

* if (res.ok)

* validateContentTypeSetAsJsonLD

* 条件を考慮し直す

* その他の+json接尾辞が付いているメディアタイプも受け容れる

* https://github.com/misskey-dev/misskey-ghsa-qqrm-9grj-6v32/pull/1#discussion_r1490999009

* add `; profile="https://www.w3.org/ns/activitystreams"`

* application/ld+json;
 2024-02-17 19:59:50 +09:00
tamaina 5a78e2f694 2024.2.0-beta.13 2024-02-17 19:59:50 +09:00
かっこかり 4bc32454ed Update CHANGELOG.md 2024-02-17 19:59:50 +09:00
zyoshoka ad95b5c1be refactor(backend): remove/replace deprecated type deps (#13252) 2024-02-17 19:59:50 +09:00
かっこかり 1ef9f5edac fix misskey-js version 2024-02-17 19:59:50 +09:00
かっこかり 6dabfac092 fix(dev): devコマンドの実装を修正 (#13336) 2024-02-17 19:59:50 +09:00
anatawa12 5c56d0a489 fix of #13330 (#13330) 
* build: docker buildのpnpm i実行時にNODE_ENV=productionが指定されるようにする

* build: 消す行間違ってたのを修正
 2024-02-17 19:59:50 +09:00
anatawa12 b419badb46 build: docker buildのpnpm i実行時にNODE_ENV=productionが指定されるようにする (#13329) 2024-02-17 19:59:50 +09:00
dependabot[bot] da71db9d43 chore(deps): bump actions/setup-node from 3.8.1 to 4.0.2 (#13307) 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.8.1 to 4.0.2.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.8.1...v4.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-02-17 19:59:50 +09:00
dependabot[bot] 4a61ec1417 chore(deps): bump actions/upload-artifact from 3 to 4 (#13308) 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-02-17 19:59:50 +09:00
dependabot[bot] e12872a836 chore(deps): bump actions/checkout from 3.6.0 to 4.1.1 (#13309) 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.6.0...v4.1.1)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-02-17 19:59:50 +09:00
dependabot[bot] 59fa1cafc8 chore(deps): bump pnpm/action-setup from 2 to 3 (#13310) 
Bumps [pnpm/action-setup](https://github.com/pnpm/action-setup) from 2 to 3.
- [Release notes](https://github.com/pnpm/action-setup/releases)
- [Commits](https://github.com/pnpm/action-setup/compare/v2.0.0...v3)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-02-17 19:59:50 +09:00
dependabot[bot] d8506ae9ba chore(deps): bump actions/github-script from 6.4.0 to 7.0.1 (#13311) 
Bumps [actions/github-script](https://github.com/actions/github-script) from 6.4.0 to 7.0.1.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6.4.0...v7.0.1)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-02-17 19:59:49 +09:00
taiy 497700f046 fix(frontend/pageMetadata): ページタイトルが更新されない問題 (#13289) 
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-17 19:59:49 +09:00
zyoshoka 7c1c3e7a4a fix(ci): publish docker image fails (3) (#13327) 
* fix(ci): publish docker image fails (3)

* fix: set `tags`
 2024-02-17 19:59:48 +09:00
syuilo 5f4c868e7d 2024.2.0-beta.12 2024-02-17 19:59:48 +09:00
かっこかり 35afe4a6af fix(frontend): vue v3.4.16以降でタイムラインが正常に表示できない問題を修正 (#13248) 
* fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正

* type

* Revert "fix: downgrade vue to 3.4.15"

This reverts commit e12369ac13.

* Update pnpm-lock.yaml

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-17 19:59:48 +09:00
syuilo 93420663e9 New Crowdin updates (#13267) 
* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (English)

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

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Traditional)
 2024-02-17 19:59:48 +09:00
syuilo 5a20f05e99 Update CHANGELOG.md 2024-02-17 19:59:25 +09:00
syuilo 7d902aef55 fix type 2024-02-17 19:59:25 +09:00
syuilo d48bbc5072 fix 2024-02-17 19:59:25 +09:00
syuilo 0b15ea32c6 refactor(backend): misc/cacheをシンプルな実装に戻した 2024-02-17 19:59:25 +09:00
MeiMei ab23bb5c8c リモートユーザーが復活してもキャッシュにより該当ユーザーのActivityが受け入れられないのを修正 Fix #13273 (#13275) 
* リモートユーザーが復活してもキャッシュにより該当ユーザーのActivityが受け入れられないのを修正 Fix #13273

* CHAGELOG

* Use Redis event

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2024-02-17 19:59:25 +09:00
zyoshoka cf3174dae7 fix(backend): add missing schemas and fix incorrect schemas (#13295) 
* fix(backend): add missing schemas and fix incorrect schemas

* fix: ci

* fix: ci (本命)

* fix: run `pnpm build-misskey-js-with-types`

* fix: typos

* fix: role-condition-formula-value contains `id`

* fix: incorrect schema
 2024-02-17 19:59:25 +09:00
Kisaragi 8bfdbe90f8 feat(backend): likeOnlyなどでハートにフォールバックする際異体字セレクタがない方に揃える (#13299) 
* feat(backend): likeOnlyなどでハートにフォールバックする際異体字セレクタがない方に揃える

close #13298

* Update ReactionService.ts

* chore(backend): prefer single quote for string literal
 2024-02-17 19:59:25 +09:00
zyoshoka 310477217c fix(ci): publish docker image fails (#13325) 
* fix(ci): publish docker image fails

* fix: `docker.yml`

* refactor: remove inaccurate name

* fix: match version
 2024-02-17 19:59:25 +09:00
Srgr0 d52911b0be dev: Update misskey-tga (#13223) 
* Update deploy-test-environment.yml

* Update .github/workflows/deploy-test-environment.yml

Co-authored-by: anatawa12 <anatawa12@icloud.com>

* Update deploy-test-environment.yml

* Update deploy-test-environment.yml

---------

Co-authored-by: anatawa12 <anatawa12@icloud.com>
 2024-02-17 19:59:25 +09:00
Acid Chicken (硫酸鶏) ac81143720 build: upgrade Storybook to 8 beta (#13297) 
* chore: upgrade Storybook to 8

* ci: restore Storybook workflow

* build: createRequire

* ci: TurboSnap life extension
 2024-02-17 19:59:25 +09:00
Acid Chicken (硫酸鶏) 0be937224c fix: TypeAssertionExpression breaks Storybook builds 2024-02-17 19:59:25 +09:00
taiy 228ee94aec fix(frontend): エラーページのトラブルシューティングがリンク切れしている問題 (#176) (#13288) 2024-02-17 19:59:25 +09:00
Acid Chicken (硫酸鶏) 07a56089e9 perf: omit search for immutable static requests (#13265) 
* perf: omit search for immutable static requests

* perf: also applies to /files

* fix: exclude /proxy

* /files/:key/*を301 redirectに

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2024-02-17 19:59:25 +09:00
Kisaragi feb5e91aa3 Update CHANGELOG.md (#13282) 
#13281 に対応していることを強調
 2024-02-17 19:59:25 +09:00
tamaina 9d16565204 enhance: 禁止ワードはリモートノートも対象に (#13280) 
Resolve #13279
 2024-02-17 19:59:25 +09:00
tamaina b432050b9e fix: downgrade vue to 3.4.15 2024-02-17 19:59:25 +09:00
tamaina 37724a20f7 chore: 以前の開発環境（backendにアクセスする方式）を立ち上げられるように (#13220) 
* chore: 以前の開発環境（backendにアクセスする方式）を立ち上げられるように

* Update scripts/dev.mjs

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2024-02-17 19:59:24 +09:00
まっちゃとーにゅ 5304e33eec ci(test-frontend): Cypressのテストの失敗時、永遠に止まらない問題を回避 (MisskeyIO#434) (#13274) 
失敗しないようタイムアウトの延長・15分で止まるように
 2024-02-17 19:59:24 +09:00