Claude
146cb7b975
LR-MERGE-HDR: the merge no longer depends on the order the frames come in
...
The same bracket merged in another order gave a different result: on real ARW brackets, the app's selection
order and the CLI's file order differed on 0.6 % of the pixels (up to 102 levels), while the same order gave
byte-identical files. Alignment seeds were the frames' input positions, and sums, deghost masks and brightness
ties followed them too.
merge_hdr now puts the frames in brightness order first (ties by median, then a content fingerprint, never by
position), runs everything in that order, and returns the per-frame results (EV, alignment, reference index)
in the caller's order. Test: every permutation of a bracket gives the same radiance and deghost overlay bit for
bit, and the same per-frame results (fails before: "the radiance differs").
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_015gRtdWF1E9358FfzhzYqCS
2026-10-13 05:57:13 +00:00
Claude
8bb084074c
Merge storytold/lightcraft main into LR-MERGE-HDR (lens corrections)
...
Conflicts: crates/engine/src/tests_merge.rs (#1123 's test landed where this branch's is; both kept),
docs/parity-checklist.md (the LR-MERGE-HDR row: both notes) and docs/whats-new.md (both entries).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_015gRtdWF1E9358FfzhzYqCS
2026-10-13 05:57:08 +00:00
Marco Arnulfo
8155c118cd
LR-PREF-DISPLAY: test that the 1:1 window is drawn with the screen's profile ( #1365 )
2026-10-13 07:46:27 +02:00
BFlat
68c924047d
Merge pull request #1431 : integration batch 33 (85 reviewed contributor PRs)
...
Integration batch 33: main green again, 85 reviewed contributor PRs
2026-10-13 12:16:54 +07:00
Claudio
0a565d308a
Recently Deleted shows deleted Local (browsed) photos ( Fixes #1430 )
...
A photo browsed in a Local folder is flagged deleted by photo.delete, but
Filter::matches_in dropped every browsed photo from views without a folder,
so it vanished from the folder and never reached Recently Deleted: it could
not be restored and sat in the catalog invisibly (a deleted record is also
never forgotten as an untouched Local one).
Deleted browsed photos now match the Recently Deleted filter, so they can be
restored; the library view still excludes browsed photos.
2026-10-12 23:15:38 -06:00
bflatastic
2397927681
Merge main (batch 32a landed)
...
# Conflicts:
# apps/lightcraft-cli/src/main.rs
# crates/codecs/src/lib.rs
# crates/mcp/src/headless.rs
2026-10-13 12:09:34 +07:00
bflatastic
ece9bd83e4
Batch 32: one tracker row per id (rows two PRs both edited), parity summary refreshed
2026-10-13 12:05:26 +07:00
Jason Baldwin
3f9bf67eae
Merge slideshow-templates into slideshow-export (toast clear of dialog buttons)
2026-10-13 07:04:13 +02:00
Jason Baldwin
ed5c7d38eb
Merge slideshow-titles into slideshow-templates (toast clear of dialog buttons)
2026-10-13 07:04:13 +02:00
Jason Baldwin
db876a0a3d
Merge slideshow-overlays into slideshow-titles (toast clear of dialog buttons)
2026-10-13 07:04:13 +02:00
Jason Baldwin
75c4b5c920
Merge slideshow-composer into slideshow-overlays (toast clear of dialog buttons)
2026-10-13 07:04:13 +02:00
Jason Baldwin
39de3777fa
Merge slideshow-playback into slideshow-composer (toast clear of dialog buttons)
2026-10-13 07:04:13 +02:00
Jason Baldwin
21b417fe3c
LRC-SS-PLAYBACK: the toast also goes to the top while a dialog is open, clear of its buttons
2026-10-13 07:04:13 +02:00
Jason Baldwin
4ea05a85ae
Merge slideshow-templates into slideshow-export (toast clear of the slideshow controls)
2026-10-13 06:55:21 +02:00
Jason Baldwin
f36020c3cf
Merge origin/main into slideshow-export (batch 32: state.rs keeps the SlideshowExport dialog and New Album's include_selected)
2026-10-13 06:55:21 +02:00
Jason Baldwin
a89daef74a
Merge slideshow-titles into slideshow-templates (origin/main: batch 32; toast clear of the slideshow controls)
2026-10-13 06:55:03 +02:00
Jason Baldwin
fd685e7680
Merge slideshow-overlays into slideshow-titles (origin/main: batch 32; toast clear of the slideshow controls)
2026-10-13 06:55:02 +02:00
Jason Baldwin
38d53ccaee
Merge slideshow-composer into slideshow-overlays (origin/main: batch 32; toast clear of the slideshow controls)
2026-10-13 06:55:02 +02:00
Jason Baldwin
2faee15203
Merge slideshow-playback into slideshow-composer (origin/main: batch 32; toast clear of the slideshow controls)
2026-10-13 06:55:02 +02:00
Jason Baldwin
6246ea67a4
LRC-SS-PLAYBACK: during a slideshow the toast shows at the top, clear of the playback controls (toasts take the pointer since #7ccff3b9)
2026-10-13 06:55:01 +02:00
bflatastic
7693cbf3ae
Revert "Merge PR #1262 ": the toast as a widget takes the clicks meant for what is under it (a dialog's button)
2026-10-13 11:54:39 +07:00
Jason Baldwin
5c41859778
Merge remote-tracking branch 'origin/main' into slideshow-playback
2026-10-13 06:53:37 +02:00
bflatastic
2e877ad476
Batch 32: arrows over a slider nudge it ( #1264 ), the toast area doesn't fade in ( #1262 ), #1282 's test runs on Windows
2026-10-13 11:42:47 +07:00
radialmonster
2d28ea81bd
LR-SIDEBAR-LOCAL-SYNC: Synchronize Folder in the Local folder menu
...
A Local folder that holds library photos (or has a folder with some inside)
now offers Synchronize Folder... like the Folders section. The check reads
the cached Folders tree only. Headless test covers shown and not shown.
2026-10-13 00:37:53 -04:00
Brandon Thomas
b709180587
Merge pull request from storytold/claude/integrate-batch-32 (batch 32a)
...
Integration batch 32a: 8 reviewed contributor PRs
2026-10-13 00:27:00 -04:00
sanyamsingh001 and Codex
056b0f7a28
LR-MASK-OBJECTS: open the configured model folder and preserve retry
...
Open the configured SAM directory itself and preserve the pending mask
action and existing files when folder creation or the opener fails.
Run the Linux desktop opener in a background task and deliver failures
to the UI for retry. Directory creation remains synchronous.
Cover configured paths, creation and opener failures, retry state and
worker completion.
Partially addresses #366 ; model download hosting remains unresolved.
Credit: sanyamsingh001
Co-authored-by: Codex <codex@openai.com >
2026-10-13 04:22:23 +00:00
bflatastic
1d70cf6358
Batch 32: the import tool tests date their fixtures (undated files take the file's date, #1216 )
2026-10-13 11:20:47 +07:00
Brandon Thomas and Claude Opus 5.5
2f0931d3ca
Batch 32: rustfmt after merges
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-13 00:13:49 -04:00
Brandon Thomas
a1035f1372
Merge PR #997
2026-10-13 00:13:41 -04:00
Brandon Thomas
d5b8d52e1d
Merge PR #1262
2026-10-13 00:13:41 -04:00
Brandon Thomas
6568a7ae16
Merge PR #1260
2026-10-13 00:13:40 -04:00
bflatastic
d752076339
Batch 32: fixes for PRs merged together ( #984 leap-year lint, #1344 ColorData field, #1187 preset panel builds)
2026-10-13 11:11:02 +07:00
bflatastic
702f90bfc9
Batch 32: close the tests two merges added at one place; cargo fmt
2026-10-13 11:08:16 +07:00
bflatastic
fa3dfbbc4a
Merge PR #1238
...
# Conflicts:
# crates/pipeline/src/spots.rs
# crates/ui-egui/src/panels/edit.rs
# docs/parity-checklist.md
2026-10-13 11:06:46 +07:00
bflatastic
84d6849cf3
Merge PR #1216
...
# Conflicts:
# crates/engine/src/files.rs
# crates/ui-egui/locales/de-formats.json
# crates/ui-egui/locales/de.json
# crates/ui-egui/locales/es-formats.json
# crates/ui-egui/locales/es.json
# crates/ui-egui/locales/fr-formats.json
# crates/ui-egui/locales/fr.json
# crates/ui-egui/locales/ja-formats.json
# crates/ui-egui/locales/ja.json
# crates/ui-egui/locales/pt-br-formats.json
# crates/ui-egui/locales/pt-br.json
# crates/ui-egui/locales/ru-formats.json
# crates/ui-egui/locales/ru.json
# crates/ui-egui/locales/uk-formats.json
# crates/ui-egui/locales/uk.json
# crates/ui-egui/locales/zh-hans-formats.json
# crates/ui-egui/locales/zh-hans.json
# crates/ui-egui/locales/zh-hant-formats.json
# crates/ui-egui/locales/zh-hant.json
# docs/parity-checklist.md
2026-10-13 11:06:28 +07:00
bflatastic
ed1d641f22
Merge PR #1174
...
# Conflicts:
# crates/catalog/src/lock.rs
# crates/pipeline/src/spots.rs
# docs/parity-checklist.md
2026-10-13 11:06:26 +07:00
bflatastic
692ab7f7c2
Merge PR #1235
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:05:55 +07:00
bflatastic
32253d862a
Merge PR #1017
...
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/gaps.md
# docs/parity-checklist.md
2026-10-13 11:05:54 +07:00
bflatastic
4e78514948
Merge PR #1324
...
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
2026-10-13 11:05:53 +07:00
bflatastic
bac147a460
Merge PR #1189
...
# Conflicts:
# docs/parity-checklist.md
2026-10-13 11:05:48 +07:00
bflatastic
2181c69162
Merge PR #1151
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:05:47 +07:00
bflatastic
963d4f327a
Merge PR #1114
2026-10-13 11:05:45 +07:00
bflatastic
97f8b8c87c
Merge PR #1024
...
# Conflicts:
# crates/ui-egui/locales/es.json
2026-10-13 11:05:45 +07:00
bflatastic
8df468bfc6
Merge PR #1246
...
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/parity-checklist.md
2026-10-13 11:05:44 +07:00
bflatastic
8ca6a835ec
Merge PR #1411
...
# Conflicts:
# crates/ui-egui/locales/pt-br.json
# docs/whats-new.md
2026-10-13 11:05:35 +07:00
bflatastic
251397694e
Merge PR #1302
...
# Conflicts:
# crates/preview/src/tests.rs
2026-10-13 11:04:34 +07:00
bflatastic
94808da369
Merge PR #1250
...
# Conflicts:
# crates/ui-egui/src/tests_panels.rs
2026-10-13 11:04:33 +07:00
bflatastic
edfe7c6351
Merge PR #1242
...
# Conflicts:
# crates/ui-egui/src/tests_panels.rs
# docs/parity-checklist.md
2026-10-13 11:04:32 +07:00
bflatastic
95d519ae64
Batch 32: cargo fmt
2026-10-13 11:04:18 +07:00
bflatastic
1c473ed64c
Merge PR #1361
2026-10-13 11:03:53 +07:00