From d0283fe330957a21a378a7ad4e866d87f72a0ac2 Mon Sep 17 00:00:00 2001 From: WithoutPants <53250216+WithoutPants@users.noreply.github.com> Date: Tue, 21 Oct 2025 08:21:53 +1100 Subject: [PATCH] Update changelog --- ui/v2.5/src/docs/en/Changelog/v0290.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/v2.5/src/docs/en/Changelog/v0290.md b/ui/v2.5/src/docs/en/Changelog/v0290.md index f2c99de4a..12a958d86 100644 --- a/ui/v2.5/src/docs/en/Changelog/v0290.md +++ b/ui/v2.5/src/docs/en/Changelog/v0290.md @@ -34,10 +34,12 @@ * Fixed UI crash when viewing a gallery in the Performer details page. ([#5824](https://github.com/stashapp/stash/pull/5824)) * Fixed scraped performer stash ID being saved when cancelling scrape operation. ([#5839](https://github.com/stashapp/stash/pull/5839)) * Fixed groups not transferring when merging tags. ([#6127](https://github.com/stashapp/stash/pull/6127)) +* Fixed URLs and stash IDs not transferring during scene merge operation. ([#6151](https://github.com/stashapp/stash/pull/6151), [#6152](https://github.com/stashapp/stash/pull/6152)) * Fixed empty exclusion patterns being applied when scanning and cleaning. ([#6023](https://github.com/stashapp/stash/pull/6023)) * Fixed login page being included in browser history. ([#5747](https://github.com/stashapp/stash/pull/5747)) * Fixed gallery card resizing while scrubbing. ([#5844](https://github.com/stashapp/stash/pull/5844)) * Fixed incorrectly positioned scene markers in the scene player timeline. ([#5801](https://github.com/stashapp/stash/pull/5801), [#5804](https://github.com/stashapp/stash/pull/5804)) +* Fixed incorrect marker colours in the scene player timeline. ([#6141](https://github.com/stashapp/stash/pull/6141)) * Fixed custom fields not being displayed in Performer page with `Compact Expanded Details` enabled. ([#5833](https://github.com/stashapp/stash/pull/5833)) * Fixed issue in tagger where creating a parent studio would not map it to the other results. ([#5810](https://github.com/stashapp/stash/pull/5810), [#5996](https://github.com/stashapp/stash/pull/5996)) * Fixed generation options not being respected when generating using the Tasks page. ([#6139](https://github.com/stashapp/stash/pull/6139)) @@ -51,4 +53,5 @@ * Fixed parent tags missing in export if including dependencies. ([#5780](https://github.com/stashapp/stash/pull/5780)) * Add short hash of basename when generating export file names to prevent the same filename being generated. ([#5780](https://github.com/stashapp/stash/pull/5780)) * Fixed invalid studio and performer links in the tagger view. ([#5876](https://github.com/stashapp/stash/pull/5876)) -* Fixed clickable area for tag links. ([#6129](https://github.com/stashapp/stash/pull/6129)) \ No newline at end of file +* Fixed clickable area for tag links. ([#6129](https://github.com/stashapp/stash/pull/6129)) +* ffmpeg hardware encoding checks now timeout after 1 second to prevent startup hangs. ([#6154](https://github.com/stashapp/stash/pull/6154)) \ No newline at end of file