Jason Baldwin
6ec7044ebf
Merge slideshow-templates into slideshow-export (origin/main: batch 31; whats-new keeps main's Reliability entry, parity summary refreshed)
2026-10-11 17:18:12 +02:00
Jason Baldwin
54c1048b57
Merge slideshow-titles into slideshow-templates (origin/main: batch 31; open_session keeps both the slide templates dir and main's apple_photos_background, formats locales merged, whats-new keeps main's Reliability entry, parity summary refreshed)
2026-10-11 17:16:36 +02:00
Jason Baldwin
d485dc9011
Merge slideshow-overlays into slideshow-titles (origin/main: batch 31; whats-new keeps main's Reliability entry)
2026-10-11 17:14:04 +02:00
Jason Baldwin
b2036ba50d
Merge slideshow-composer into slideshow-overlays (origin/main: batch 31; whats-new keeps main's Reliability entry)
2026-10-11 17:12:42 +02:00
Jason Baldwin
2138175826
Merge slideshow-playback into slideshow-composer (origin/main: batch 31; locales merged keeping main's values, whats-new keeps main's Reliability entry, parity summary refreshed)
2026-10-11 17:11:12 +02:00
Jason Baldwin
d14a44630d
Merge origin/main into slideshow-playback (whats-new: batch 31's Reliability entry kept, Slideshow playback after it under 2026-10-11; parity summary refreshed)
2026-10-11 17:09:28 +02:00
Jason Baldwin
ccfff38548
Merge slideshow-templates into slideshow-export (origin/main: sidebar and slideshow_export modules side by side; whats-new and tracker summary)
2026-10-11 16:33:00 +02:00
Claude
9e41805a12
M-edit-in: the many-photos test uses distinct files and edits before the second copy
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 14:31:29 +00:00
Jason Baldwin
b061563383
Merge slideshow-titles into slideshow-templates (origin/main: headless sessions load main's SAM3 model and the slide templates; format-locale keys from both; whats-new and tracker summary)
2026-10-11 16:30:20 +02:00
Jason Baldwin
41c9cd3817
Merge slideshow-overlays into slideshow-titles (origin/main: title-screen RenderResult gains main's gpu_fallback field; tracker summary refreshed)
2026-10-11 16:27:59 +02:00
Jason Baldwin
56d78344c1
Merge slideshow-composer into slideshow-overlays (origin/main: watermark draws through the shared TextLayout with main's quarter-turn rotation, separate insets and preview floor scale; overlay watermark sanitizes insetX/insetY/rotation and maps legacy inset)
2026-10-11 16:26:40 +02:00
Jason Baldwin
efaa39b8b5
Merge slideshow-playback into slideshow-composer (origin/main: geocode + slideshow crates side by side in the manifests, locale keys from both, tracker summary refreshed)
2026-10-11 16:22:50 +02:00
Jason Baldwin
7b0fc19ebb
Merge origin/main into slideshow-playback (icons: Play/Pause beside grading and appearance icons; settings: Slideshow tab beside appearance cards; render: Slide and CompareRegion slots; tracker summary and whats-new)
2026-10-11 16:19:50 +02:00
Claude
4ebb934c56
Merge PR #677
...
On merge: the HDR histogram is applied in develop_reporting (#712 split develop), is skipped for
draft renders (a second render per drag tick), and HdrBins::bin clamps a hand-built split so it
can't underflow (test hdr_bins_with_any_split_stay_in_range).
2026-10-11 13:09:34 +00:00
Claude
9cf47c86fe
Merge batch 30 fixes
2026-10-11 13:08:50 +00:00
Claude
7fe8f8dbd1
LR-BEHAV-UNDO: each rename-provenance fixture gets its own folder ( #874 's tests shared one and failed when run in parallel)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 13:08:37 +00:00
Jason Baldwin
b0972e4488
Merge slideshow-templates into slideshow-export (origin/main: integration batch 26, #975 ; no conflicts)
2026-10-11 15:05:18 +02:00
Jason Baldwin
7e4ff5fddf
Merge slideshow-titles into slideshow-templates (origin/main: integration batch 26, #975 ; no conflicts)
2026-10-11 15:05:04 +02:00
Jason Baldwin
857c15f3b3
Merge slideshow-overlays into slideshow-titles (origin/main: integration batch 26, #975 ; no conflicts)
2026-10-11 15:05:04 +02:00
Jason Baldwin
29203d6eec
Merge slideshow-composer into slideshow-overlays (origin/main: integration batch 26, #975 ; no conflicts)
2026-10-11 15:05:04 +02:00
Jason Baldwin
ee8b56f1db
Merge slideshow-playback into slideshow-composer (origin/main: integration batch 26, #975 ; Cargo.lock: lightcraft-slideshow 0.6.0)
2026-10-11 15:05:04 +02:00
Jason Baldwin
8d692ed0a9
Merge origin/main into slideshow-playback (menus.rs ui_enabled: keep main's compare.set and this branch's slideshow.* arm)
2026-10-11 14:51:59 +02:00
Claude
9978dc739d
Merge PR #643
...
# Conflicts:
# crates/engine/src/export.rs
# crates/engine/src/tests_export.rs
# crates/mcp/src/headless.rs
# crates/mcp/src/tools.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
# docs/whats-new.md
2026-10-11 12:43:20 +00:00
Claude
6bc25940b8
Merge PR #780 (via claude/integrate-780)
2026-10-11 12:41:50 +00:00
Claude
bd3b058a8f
M-export: bump RENDER_CACHE_VERSION for the XYB JPEG XL decode fix
...
PR #780 changes how lossy (XYB) wide-gamut JPEG XL files decode (crates/codecs/src/jxl.rs), so cached renders of those photos are stale.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 12:41:12 +00:00
Claude
255b23816d
LR-EXP-PSD: Edit In makes a copy of every selected photo and opens them all ( #920 )
...
photo.editExternal takes the selection (or ids, at most 50): each photo gets its own -Edit copy
stacked on its original, the copies are selected and returned in copies (path / id / original
still name the first). Photo ▸ Edit In opens each copy in the editor.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 12:40:58 +00:00
Claude
4a0d04b994
Merge PR #780
...
JPEG XL export via the pure-Rust jixel crate (robmdunn; fixes #247 ).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 12:40:55 +00:00
Claude
4ec3494733
Merge PR #434
...
On merge: Lightroom's default profiles (Adobe Standard, Adobe Color), named by nearly every sidecar,
give no camera-profile warning; other profiles still do (test default_lightroom_profiles_are_not_reported).
The import help string keeps main's onDeleted wording and gains warnings.
2026-10-11 12:38:16 +00:00
Claude
e4a248c91f
Merge PR #755
...
On merge: the quick preview path orients like the whole-file path (preview_orientation with the
raw's header prefix, so a portrait raw whose embedded JPEG carries no orientation is not sideways),
and its doc links point at preview_window.
2026-10-11 12:37:14 +00:00
Claude
44f86dc855
LRC-LIB-FOLDERS: drop an unused import ( #947 follow-up)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 12:33:07 +00:00
Claude
47b5e0ae1b
Batch 30: cargo fmt over the merged PRs
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 12:32:03 +00:00
Claude
37b26c56a3
Merge batch 29b ( #946 , #947 , #953 , #950 )
...
# Conflicts:
# Cargo.toml
# crates/engine/src/rename.rs
# crates/ui-egui/locales/de.json
# crates/ui-egui/locales/es.json
# crates/ui-egui/locales/fr.json
# crates/ui-egui/locales/ja.json
# crates/ui-egui/locales/pt-br.json
# crates/ui-egui/locales/ru.json
# crates/ui-egui/locales/uk.json
# crates/ui-egui/locales/zh-hans.json
# crates/ui-egui/locales/zh-hant.json
# crates/ui-egui/src/icons.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/menubar.rs
# crates/ui-egui/src/menus.rs
# crates/ui-egui/src/panels/left.rs
# docs/whats-new.md
2026-10-11 12:08:44 +00:00
Claude
b89fb8bbab
Merge branch 'claude/fix-942-cube-import-messages'
...
# Conflicts:
# docs/parity-checklist.md
2026-10-11 12:04:31 +00:00
Claude
d1e20f0292
LR-BEHAV-LOCALIZE: the Latin-only test face has a neutral name (follow-up to #750 )
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 12:04:23 +00:00
Claude
b04c2c831c
LR-CLOUD-SMARTPREVIEW: the shard folder name is taken with get(), not a slice (follow-up to #834 )
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 12:04:23 +00:00
Claude
e1016acc0f
Merge PR #953
...
# Conflicts:
# crates/codecs/src/lib.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-11 12:03:58 +00:00
Claude
8c4898ec04
Merge PR #645
...
# Conflicts:
# crates/engine/src/media.rs
# crates/pipeline/src/finish.rs
# crates/pipeline/src/local.rs
2026-10-11 12:03:53 +00:00
Claude
f7ffa1433c
Issue #947 : compare a cross-volume move's copy in 1 MiB chunks; Move to Folder… uses the shared folder picker
...
move_across_volumes read both whole files into memory to compare them; it now
compares lengths first, then streams 1 MiB chunks. The grid's Move to Folder…
asks through pick::ask (background dialog where the host has one) like the
other folder pickers.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 12:03:29 +00:00
Claude
33686e6951
Merge PR #734
...
# Conflicts:
# ROADMAP.md
# crates/engine/src/media.rs
# crates/raw/tests/corpus.rs
# docs/parity-checklist.md
2026-10-11 12:03:15 +00:00
Claude
45a6a42ebf
Merge PR #947
...
# Conflicts:
# 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
2026-10-11 12:02:51 +00:00
Claude
a0e422ce4a
Merge PR #752
...
# Conflicts:
# crates/engine/src/cmd/develop.rs
# crates/engine/src/files.rs
# docs/mcp.md
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-11 12:02:46 +00:00
Claude
56a62f6d8b
LRC-LIB-CATALOG-SWITCH: a failed library switch keeps the current library open; library names valid on Windows
...
Check the target (Lightroom catalog, file, unreadable folder, locked by another
program) with Session::check_library before closing the open library, and if
opening still fails, reopen the previous one (both errors reported if that fails
too). New Library names reject Windows-reserved characters and trailing dots.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 12:02:43 +00:00
Claude
c9d131bfbc
Merge PR #946
...
# Conflicts:
# crates/engine/src/library.rs
# crates/ui-egui/locales/de.json
# crates/ui-egui/locales/es.json
# crates/ui-egui/locales/fr.json
# crates/ui-egui/locales/ja.json
# crates/ui-egui/locales/pt-br.json
# crates/ui-egui/locales/ru.json
# crates/ui-egui/locales/uk.json
# crates/ui-egui/locales/zh-hans.json
# crates/ui-egui/locales/zh-hant.json
# crates/ui-egui/src/menus.rs
# crates/ui-egui/src/panels/settings.rs
# crates/ui-egui/src/state.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-11 12:01:18 +00:00
Claude
8339028a80
Merge PR #794
...
# Conflicts:
# crates/engine/src/media.rs
# crates/pipeline/src/optics.rs
# docs/parity-checklist.md
2026-10-11 12:00:57 +00:00
Claude
11f41cbe97
Merge PR #813
2026-10-11 12:00:21 +00:00
Claude
7ff683f037
Merge PR #750
2026-10-11 12:00:20 +00:00
Claude
477c078b35
Merge PR #834
2026-10-11 12:00:20 +00:00
Claude
5ba413baf2
Merge PR #625
...
# Conflicts:
# crates/engine/src/media.rs
# docs/parity-checklist.md
2026-10-11 12:00:20 +00:00
Claude
421000916e
Merge PR #667
...
# Conflicts:
# docs/parity-checklist.md
2026-10-11 12:00:19 +00:00
Claude
111bb42aa3
Merge PR #825
...
# Conflicts:
# docs/parity-checklist.md
2026-10-11 12:00:17 +00:00