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
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
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
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
Claude
8380415222
Merge PR #874
...
# Conflicts:
# docs/parity-checklist.md
2026-10-11 12:00:17 +00:00
Claude
da008ce53c
LR-IMP-PROFILES: .cube-only imports report their profiles and failures ( #942 )
...
File > Import Profiles & Presets... now builds one toast for both halves
(a second toast replaced the first, so a .cube-only import said "No new
presets"). The preset half is skipped when no preset files were picked,
and profile.import's failures are shown with their reason. profile.import
also reports .cube files and zips it couldn't read instead of dropping
them silently. The command's result carries the profile half under
"profiles".
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 12:00:08 +00:00
Claude
7ecb0b0191
Merge PR #915
...
# Conflicts:
# crates/engine/src/media.rs
# crates/raw/src/vendor/crx.rs
# crates/ui-egui/locales/de.json
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
2026-10-11 11:58:15 +00:00
Claude
17dfa9709e
Merge PR #926
...
# Conflicts:
# Cargo.lock
# Cargo.toml
# 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
# xtask/src/layers.rs
2026-10-11 11:57:45 +00:00
Claude
05939cbc54
Merge PR #928
...
# Conflicts:
# 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
2026-10-11 11:53:13 +00:00
Claude
b8d39063db
Merge PR #930
2026-10-11 11:53:12 +00:00
Claude
5861591307
Merge PR #948
...
On merge: metadata.downloadPlaceNames accepts plain http only for the loopback address itself
(http://127.0.0.1.example.com/ and http://127.0.0.1@host/ are refused; test
download_base_is_https_or_loopback_only).
2026-10-11 11:52:57 +00:00
Claude
6c18c0a7c6
LR-PREF-PERFORMANCE: preview builds render the larger of view and thumbnail first (a view under 512 px no longer feeds an upscaled thumbnail, follow-up to #927 )
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 11:52:24 +00:00
Claude
95007492cc
Merge PR #927
2026-10-11 11:52:07 +00:00
Claude
62ece65ac9
Merge PR #664
...
# Conflicts:
# crates/engine/src/tests_export.rs
# crates/mcp/src/headless.rs
# crates/mcp/src/tools.rs
2026-10-11 11:50:59 +00:00
Claude
44acde3a41
Merge PR #666
...
# Conflicts:
# apps/lightcraft/src/main.rs
# crates/engine/src/config.rs
2026-10-11 11:50:35 +00:00
Claude
b6ad706aa6
Merge PR #712
...
# Conflicts:
# crates/engine/src/export.rs
2026-10-11 11:50:06 +00:00
Claude
31734dea86
Merge PR #689
...
# Conflicts:
# crates/engine/src/media.rs
# crates/raw/src/vendor/arw.rs
2026-10-11 11:50:05 +00:00
Claude
4e6cd5d7b9
Merge PR #704
...
# Conflicts:
# docs/parity-checklist.md
2026-10-11 11:49:37 +00:00
Claude
40492d238e
Merge PR #690
...
# Conflicts:
# 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/tests_panels.rs
# docs/parity-checklist.md
2026-10-11 11:48:06 +00:00
Claude
edb95894b4
Merge PR #695
...
# Conflicts:
# crates/engine/src/media.rs
2026-10-11 11:47:51 +00:00
Claude
16bbaff14c
Merge PR #700
...
# Conflicts:
# crates/engine/src/media.rs
# docs/parity-checklist.md
2026-10-11 11:47:50 +00:00
Claude
db8b82c6d7
Merge PR #703
2026-10-11 11:47:28 +00:00