diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-07-05 08:18:56 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-07-05 08:18:56 +0900 |
| commit | 73397e1b7ebf51b1abca15f9187cd380fc2e7c61 (patch) | |
| tree | 15521efe7d1cc42fc70244f4ea6d2994074c91b2 | |
| parent | refactor (diff) | |
| parent | test: VS Code上で複数のjestテストを表示できるように (#16251) (diff) | |
| download | misskey-73397e1b7ebf51b1abca15f9187cd380fc2e7c61.tar.gz misskey-73397e1b7ebf51b1abca15f9187cd380fc2e7c61.tar.bz2 misskey-73397e1b7ebf51b1abca15f9187cd380fc2e7c61.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
| -rw-r--r-- | .vscode/settings.json | 6 | ||||
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | packages/frontend/src/pages/welcome.timeline.note.vue | 2 | ||||
| -rw-r--r-- | packages/misskey-js/package.json | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json index 0ceec23acd..5f36a32af4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,8 +6,12 @@ "files.associations": { "*.test.ts": "typescript" }, - "jest.jestCommandLine": "pnpm run jest", "jest.runMode": "on-demand", + "jest.virtualFolders": [ + { "name": "backend unit", "jestCommandLine": "pnpm -F backend run test" }, + { "name": "backend e2e", "jestCommandLine": "pnpm -F backend run test:e2e"}, + { "name": "misskey-js", "jestCommandLine": "pnpm -F misskey-js run jest" } + ], "editor.codeActionsOnSave": { "source.fixAll": "explicit" }, diff --git a/CHANGELOG.md b/CHANGELOG.md index 90c4ce48a6..8e3c9dfc77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Fix: ファイルがドライブの既定アップロード先に指定したフォルダにアップロードされない問題を修正 - Fix: プラグインをアンインストールしてもセーブデータが残る問題を修正 - Fix: 数時間後Misskeyのタブに戻った際に、タブがスロットリングされている間の更新アニメーションを延々見せ続けられる問題を修正 +- Fix: 非ログイン時のハイライトノートの画像がCWの有無を考慮せず表示される問題を修正 ### Server - Enhance: sinceId/untilIdが指定可能なエンドポイントにおいて、sinceDate/untilDateも指定可能に diff --git a/package.json b/package.json index 0a9d1e0d86..8e4a28b2e3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2025.7.0-alpha.0", + "version": "2025.7.0-beta.0", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/frontend/src/pages/welcome.timeline.note.vue b/packages/frontend/src/pages/welcome.timeline.note.vue index 4dff76901f..c119f4cf05 100644 --- a/packages/frontend/src/pages/welcome.timeline.note.vue +++ b/packages/frontend/src/pages/welcome.timeline.note.vue @@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only <Mfm v-if="note.text" :text="note.text" :author="note.user"/> <MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA> </div> - <div v-if="note.files && note.files.length > 0" :class="$style.richcontent"> + <div v-if="note.files && note.files.length > 0 && (note.cw == null || showContent)" :class="$style.richcontent"> <MkMediaList :mediaList="note.files.slice(0, 4)"/> </div> <div v-if="note.reactionCount > 0" :class="$style.reactions"> diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index 7b2078837a..8042c7088c 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2025.7.0-alpha.0", + "version": "2025.7.0-beta.0", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js", |