Merge upstream 31 #272
Merged
Merge upstream 31 #272
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: syuilo <[email protected]>
* feat: アクセストークン発行時に通知するように (misskey-dev#13353) * fix: 不要な翻訳を削除/インデントを揃えるように * chore(backend): 不要なawaitを削除 * chore: changelogへ追加
* fix(frontend): 埋め込みiframeから外部ページに移動できない問題を修正 * Update Changelog
…isskey-dev#15460) * enhance(frontend): ノートに埋め込まれたメディアのコンテキストメニューから管理者用のファイル管理画面を開けるように * fix icon * fix menu --------- Co-authored-by: syuilo <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: おさむのひと <[email protected]>
* fix * update change log
|
このPRによるapi.jsonの差分 差分はこちら--- base
+++ head
@@ -9993,7 +9993,12 @@
]
},
"federation": {
- "type": "string"
+ "type": "string",
+ "enum": [
+ "all",
+ "specified",
+ "none"
+ ]
},
"federationHosts": {
"type": "array",
@@ -51174,6 +51179,7 @@
"achievementEarned",
"exportCompleted",
"login",
+ "createToken",
"app",
"test",
"pollVote",
@@ -51200,6 +51206,7 @@
"achievementEarned",
"exportCompleted",
"login",
+ "createToken",
"app",
"test",
"pollVote",
@@ -51417,6 +51424,7 @@
"achievementEarned",
"exportCompleted",
"login",
+ "createToken",
"app",
"test",
"reaction:grouped",
@@ -51445,6 +51453,7 @@
"achievementEarned",
"exportCompleted",
"login",
+ "createToken",
"app",
"test",
"reaction:grouped",
@@ -81184,6 +81193,30 @@
]
}
},
+ "required": [
+ "id",
+ "createdAt",
+ "type"
+ ]
+ },
+ {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string",
+ "format": "id"
+ },
+ "createdAt": {
+ "type": "string",
+ "format": "date-time"
+ },
+ "type": {
+ "type": "string",
+ "enum": [
+ "createToken"
+ ]
+ }
+ },
"required": [
"id",
"createdAt", |
* wip * bump misskey-dev/eslint-plugin * lint fixes (backend) * lint fixes (frontend) * lint fixes (frontend-embed) * rollback nsfwjs to 4.2.0 ref: infinitered/nsfwjs#904 * rollback openapi-typescript to v6 v7でOpenAPIのバリデーションが入るようになった関係でスコープ外での変更が避けられないため一時的に戻した * lint fixes (misskey-js) * temporarily disable errored lint rule (frontend-shared) * fix lint * temporarily ignore errored file for lint (frontend-shared) * rollback simplewebauthn/server to 12.0.0 v13 contains breaking changes that require some decision making * lint fixes (frontend-shared) * build misskey-js with types * fix(backend): migrate simplewebauthn/server to v12 * fix(misskey-js/autogen): ignore indent rules to generate consistent output * attempt to fix test changes due to capricorn86/happy-dom#1617 (XMLSerializer now produces valid XML) * attempt to fix test changes due to capricorn86/happy-dom#1617 (XMLSerializer now produces valid XML) * fix test * fix test * fix test * Apply suggestions from code review Co-authored-by: anatawa12 <[email protected]> * bump summaly to v5.2.0 * update tabler-icons to v3.30.0-based --------- Co-authored-by: かっこかり <[email protected]> Co-authored-by: anatawa12 <[email protected]>
…ey-dev#15469) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ev#15476) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ev#15473) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…#15490) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* enhance(frontend): リアクション時に確認ダイアログを出せるように * Update Changelog * indent * fix
…題の修正 (misskey-dev#15461) Co-authored-by: かっこかり <[email protected]>
* fix(deps): update [frontend] update dependencies * fix type error * fix * Revert "fix" This reverts commit de27d25. * fix version * attempt to fix test --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: おさむのひと <[email protected]> Co-authored-by: kakkokari-gtyih <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: おさむのひと <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: おさむのひと <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Why
Additional info (optional)
Checklist