Merge upstream #40

Merged

yume merged 36 commits from develop into master 2024-11-21 11:40:02 -06:00

Conversation 0 Commits 36 Files changed 59 +1616 -962

yume commented 2024-11-21 10:22:08 -06:00

Owner

Copy link

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

<!-- ℹ お読みください / README PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください: Thank you for your PR! Before creating a PR, please check the contribution guide: https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md --> ## What <!-- このPRで何をしたのか？ どう変わるのか？ --> <!-- What did you do with this PR? How will it change things? --> ## Why <!-- なぜそうするのか？ どういう意図なのか？ 何が困っているのか？ --> <!-- Why do you do it? What are your intentions? What is the problem? --> ## Additional info (optional) <!-- テスト観点など --> <!-- Test perspective, etc --> ## Checklist - [ ] Read the [contribution guide](https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md) - [ ] Test working in a local environment - [ ] (If needed) Add story of storybook - [ ] (If needed) Update CHANGELOG.md - [ ] (If possible) Add tests

yume added 18 commits 2024-11-21 10:22:08 -06:00

Fix(backend): アカウント削除のモデレーションログが動作していないのを修正 (#14996) (#14997) ... 763c708253

* アカウント削除のモデレーションログが動作していないのを修正

* update CHANGELOG

feat: 絵文字のポップアップメニューに編集を追加 (#15004) ... 4603ab67bb

* Mod: 絵文字のポップアップメニューに編集を追加

* fix: code styleの修正

* fix: code styleの修正

* fix

Partial Merge of 5f675201f261d5db6a58d3099a190372bb2f09f0 ... 504ead526a

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

Fix(backend): アカウント削除のモデレーションログが動作していないのを修正 (#14996) (#14997) ... f0a754eaa8

* アカウント削除のモデレーションログが動作していないのを修正

* update CHANGELOG

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

feat: 絵文字のポップアップメニューに編集を追加 (#15004) ... 329995f4a3

* Mod: 絵文字のポップアップメニューに編集を追加

* fix: code styleの修正

* fix: code styleの修正

* fix

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

perf(frontend): reduce api requests for non-logged-in enviroment (#15001) ... c427e10f17

* wip

* Update CHANGELOG.md

* wip

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

Fix: リノートミュートが新規投稿通知に対して作用していなかった問題を修正 (#15006) ... 323de25075

* fix(backend): renoteMute doesn't work for note notification

* docs(changelog): update changelog

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

New Crowdin updates (#15000) ... 3b804799c3

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Korean)

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

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

* New translations ja-jp.yml (German)

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

Merge commit from fork ... a3ad95c058

* Fix poll update spoofing

* fix: Disallow negative poll counts

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

Merge commit from fork ... ce08d2c827

* fix(backend): check target IP before sending HTTP request

* fix(backend): allow accessing private IP when testing

* Apply suggestions from code review

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

* fix(backend): lint and typecheck

* fix(backend): add isLocalAddressAllowed option to getAgentByUrl and send (HttpRequestService)

* fix(backend): allow fetchSummaryFromProxy, trueMail to access local addresses

---------

Co-authored-by: anatawa12 <anatawa12@icloud.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

Merge remote-tracking branch 'upstream/develop' into incoming ... b33a595b67

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

remove e2e testing ... d621657f16

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

pick pari sw.ts 9bb310e0d1

fix sw.js initialization order ... 5587de26c7

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

remove unused httpAgent ... 8d48909e4f

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

Merge pull request 'prepare for upstream release' (#39) from incoming into develop ... 8212c62663

Reviewed-on: #39

Merge branch 'master' into develop 57c4fef275

fix a mishap during merging upstream ... 9052a02598

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

yume added 1 commit 2024-11-21 10:32:15 -06:00

2024.11.0-yumechinokuni.6 ... dfc522f830

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

yume force-pushed develop from dfc522f830 to 3f70c7bcb2 2024-11-21 10:49:44 -06:00 Compare

yume force-pushed develop from 3f70c7bcb2 to a1ccb194e8 2024-11-21 10:59:31 -06:00 Compare

yume force-pushed develop from a1ccb194e8 to 63a98f3b41 2024-11-21 11:23:52 -06:00 Compare

yume merged commit 7a0067460b into master 2024-11-21 11:40:02 -06:00

yume referenced this pull request from a commit 2024-11-21 11:40:04 -06:00

Merge pull request 'Merge upstream' (#40) from develop into master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

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: yume/yumechi-no-kuni#40

No description provided.