Brandon Thomas
a19cbdb17b
Merge PR #1045
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/target-app-parity.md
2026-10-14 21:59:07 -04:00
Brandon Thomas
89a51be77f
Merge PR #1029
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/target-app-parity.md
2026-10-14 21:59:06 -04:00
Brandon Thomas
28a6d97434
Merge PR #1062
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 21:58:37 -04:00
Brandon Thomas
e0ed8c0270
Merge PR #1033
...
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
2026-10-14 21:58:33 -04:00
Brandon Thomas
ff66d188e8
Merge PR #996
...
# 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
# docs/parity-checklist.md
2026-10-14 21:58:01 -04:00
Brandon Thomas
260a460c11
Merge PR #1019
...
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
2026-10-14 21:57:59 -04:00
Brandon Thomas
58dc540cc0
Merge PR #1010
...
# Conflicts:
# docs/gaps.md
2026-10-14 21:57:58 -04:00
Brandon Thomas
cbf3664e4f
Merge PR #824
...
# Conflicts:
# crates/engine/src/files.rs
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
2026-10-14 21:56:53 -04:00
Brandon Thomas
2138dc6e7d
Merge PR #1009
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 21:55:05 -04:00
Brandon Thomas
0bef63b6eb
Merge PR #974
...
# Conflicts:
# crates/engine/src/cmd/mod.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/mcp.md
# docs/parity-checklist.md
2026-10-14 21:55:01 -04:00
Brandon Thomas
e78e165594
Merge PR #929
2026-10-14 21:54:54 -04:00
Brandon Thomas
d837ab1455
Merge PR #912
...
# Conflicts:
# crates/ui-egui/locales/de-formats.json
# crates/ui-egui/locales/es-formats.json
# crates/ui-egui/locales/fr-formats.json
# crates/ui-egui/locales/ja-formats.json
# crates/ui-egui/locales/pt-br-formats.json
# crates/ui-egui/locales/ru-formats.json
# crates/ui-egui/locales/uk-formats.json
# crates/ui-egui/locales/zh-hans-formats.json
# crates/ui-egui/locales/zh-hant-formats.json
2026-10-14 21:54:53 -04:00
Brandon Thomas
6ce8d5a571
Merge PR #904
...
# Conflicts:
# crates/ui-egui/locales/ru.json
2026-10-14 21:54:51 -04:00
Brandon Thomas
618b4c723a
Merge PR #821
...
# 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-14 21:54:47 -04:00
skylar taylor-barrick
af4c5e102c
fix(import): report and optimize Lightroom catalogs ( #1406 )
...
Task: LRC-LIB-CATALOG-IMPORT
Count offline records, Local promotions and virtual copies correctly. Keep destination, warnings and errors in a persistent import result, with Show in Library clearing filters. Preserve library-switch ownership, reimport identities, existing edits and one-step undo.
Avoid repeated missing-original probes and unnecessary staged-photo, catalog-operation and develop-patch copies. Preserve upstream phased progress and typed cancellation. Address Astra review findings with regression coverage.
Validated the combined main tree with all eight cargo xtask ci gates (3,462 passing test executions; zero failures), fresh 30k import/persistence/metadata checks, duplicate-free same-session and reopened reimports, and visually inspected headless screenshots. Historical performance comparisons apply to the f730805d
2026-10-15 03:44:15 +02:00
Jason Baldwin
3aa6b3ba31
Merge slideshow-templates into slideshow-export (origin/main: batch 35)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 14:42:03 +02:00
Jason Baldwin
5f3bdbcb73
Merge slideshow-titles into slideshow-templates (origin/main: batch 35)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 14:39:47 +02:00
Jason Baldwin
7919c1471d
Merge slideshow-overlays into slideshow-titles (origin/main: batch 35)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 14:37:20 +02:00
Jason Baldwin
f776d98167
Merge slideshow-composer into slideshow-overlays (origin/main: batch 35)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 14:35:02 +02:00
Jason Baldwin
b60c74a6d7
Merge slideshow-playback into slideshow-composer (origin/main: batch 35)
...
# Conflicts:
# crates/engine/src/import.rs
# crates/engine/src/media.rs
# docs/parity-checklist.md
2026-10-14 14:31:53 +02:00
Jason Baldwin
3aaadd1456
Merge origin/main into slideshow-playback (batch 35: tracker summary refreshed, slideshow rows kept)
2026-10-14 14:29:54 +02:00
Andrew Frahn and Claude Opus 5.5
78b014fb79
Merge upstream/main into pr/pen-pressure
...
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com >
2026-10-14 20:04:19 +11:00
Andrew Frahn and Claude Opus 5.5
e5efaea6a8
Merge upstream/main into pr/file-writes
...
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com >
2026-10-14 19:23:00 +11:00
Andrew Frahn and Claude Opus 5.5
065818f524
Merge upstream/main into pr/more-verified-bodies
...
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com >
2026-10-14 19:19:31 +11:00
Val Enfys and Claude Opus 5.5
f29a340fa6
LR-IMP-FORMATS: recheck stale preview-only raws when a library opens ( #662 )
...
A raw imported while its format couldn't be decoded kept preview_only until a
manual Reload, so new decoders in a release never reached existing photos.
When a library opens in another app version, its preview-only photos whose
stamp differs are probed again in the background and get exactly what Reload
from Disk gives them (shared reload_ops): a file that decodes now loses the
flag, one that still doesn't gets the current reason and a fresh stamp. The
result is one journaled system batch, not an undo step; develop settings and
history are kept. Unreadable files are left for next time, photos changed
while probing are skipped, and a result for a library closed meanwhile is
dropped. A toast says how many raws now develop from their raw data.
- engine: cmd/recheck.rs (stale / probe / apply) and
library.recheckPreviewOnly {all?} -> {checked, updated, cleared}; refused
without file access, where every probe would clear every flag
- desktop: recheck::tick once per library generation, through tasks::spawn
("Checking raw files" in the activity stack)
- the preview-only notice (Edit, Info) gains a Reload from Disk button
- strings translated in all nine catalogs; docs/mcp.md and the parity row
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 08:19:43 +01:00
Andrew Frahn and Claude Opus 5.5
1181b89048
Merge upstream/main into pr/cr3-variants
...
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com >
2026-10-14 18:12:20 +11:00
Brandon Thomas and Claude Opus 5.5
180d400cdd
Batch 35: one header line per tracker doc, one 2026-10-13 section in What's New, parity summary refreshed, rustfmt after merges
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 01:59:55 -04:00
Brandon Thomas
5fe332c7b4
Merge PR #1570 (updated head)
...
# Conflicts:
# README.md
# crates/raw/src/vendor/nef_lens.rs
# docs/gaps.md
# docs/nikon-lens-corrections.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
2026-10-14 01:54:50 -04:00
Brandon Thomas
418f6255be
Merge PR #1543
...
# Conflicts:
# crates/engine/src/export.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 01:40:03 -04:00
Brandon Thomas
9085eb4b23
Merge PR #1653
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 01:39:50 -04:00
Brandon Thomas
aa0f9a5666
Merge PR #1536
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 01:39:49 -04:00
Brandon Thomas
07f73c44da
Merge PR #1443
...
# Conflicts:
# crates/engine/src/files.rs
# docs/raw-preview-reads.md
# docs/whats-new.md
2026-10-14 01:29:30 -04:00
Brandon Thomas
b4d5b47617
Merge PR #1453 (rebased onto main)
2026-10-14 01:27:32 -04:00
Fabio Lussi
d5b79bf9a1
Merge remote-tracking branch 'origin/main' into lc-956
...
# 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/panels/dialogs.rs
# crates/ui-egui/src/tests_dialog_fit.rs
# docs/control-protocol.md
# docs/parity-checklist.md
2026-10-13 23:53:00 +02:00
eliets2
3ad5eadab2
LR-REM-HEAL: checkpoint zero-feather spot edge correction
...
Treat a zero-width feather transition as a hard edge so exact-radius pixels remain unchanged, including at zero opacity. Add actual image regressions for all spot modes, image corners and two clone output sizes.
Validation: both new regressions failed on the original implementation and pass here. Formatting, workspace Clippy, HEIF and a generated-photo app smoke test pass. The unfiltered workspace gate remains blocked by the existing all-masks overlay test tracked by #1599 ; later parity, layers, assets and WASM stages are pending. This is a source checkpoint, not a green release candidate.
Contributor: @eliets2
2026-10-14 00:51:56 +03:00
Andrew Frahn and Claude Opus 5.5
363a1e2a67
Merge upstream/main into pr/file-writes
...
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com >
2026-10-14 08:08:53 +11:00
Andrew Frahn and Claude Opus 5.5
9b9676ca85
Merge upstream/main into pr/more-verified-bodies
...
Coverage regenerated with docs/raw/coverage.py: 354 verified, 824 unverified,
230 preview, 38 unsupported; ~86% / ~58% use-weighted.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com >
2026-10-14 08:06:27 +11:00
Andrew Frahn and Claude Opus 5.5
83d388002d
Merge upstream/main into pr/pen-pressure
...
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com >
2026-10-14 07:58:20 +11:00
Andrew Frahn and Claude Opus 5.5
f2f6f1386f
Merge upstream/main into pr/cr3-variants
...
Keeps upstream's ColorData 66 handling (white level from the data); recounts
coverage (259 verified, 919 unverified, 232 preview); drops the duplicate
raw-parity rows; notes high-QP R6 Mark II C-RAW and unverified R7 C-RAW.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com >
2026-10-14 07:27:04 +11:00
Michael Anderson
1ee751ebdf
LR-EDIT-OPTICS-PROFILE: Apply Nikon's in-file distortion correction for the Z 6II, Z 8 and Z f
...
Read the polynomial, zoom and optical center offset from NikonNEFInfo.
2026-10-13 11:10:46 -05:00
Brandon Thomas
93f8ee7c0d
Merge PR #1427
...
# Conflicts:
# crates/ui-egui/src/lib.rs
# docs/parity-checklist.md
2026-10-13 11:52:07 -04:00
Brandon Thomas
642662d90f
Merge PR #1570
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-13 11:49:17 -04:00
Brandon Thomas
2294329b0c
Merge PR #1565
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-13 11:49:15 -04:00
Brandon Thomas
7627b2b2b8
Merge PR #1563
...
# Conflicts:
# docs/parity-checklist.md
2026-10-13 11:49:14 -04:00
Brandon Thomas
c6b2686ba0
Merge PR #1410
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:49:05 -04:00
Brandon Thomas
836bc449f0
Merge PR #1454
2026-10-13 11:48:35 -04:00
Brandon Thomas
03b6c8a95d
Merge PR #1423
2026-10-13 11:48:34 -04:00
Michael Anderson
853a92e2de
LR-EDIT-OPTICS-PROFILE: Apply Nikon's in-file distortion correction for the Z 6II and Z f
...
Read the polynomial, zoom and optical center offset from NikonNEFInfo.
2026-10-13 10:47:57 -05:00
Michael Anderson
271bc41842
Never crash: Repair damaged catalog snapshots on open
...
Fix ids, stacks, album folders and counters that don't agree, and stop album trees at 64 deep.
2026-10-13 10:46:47 -05:00
Michael Anderson
27d1e9b04d
Never crash: Cap enlarged exports at 512 MP and check memory first
...
A huge enlargement failed to allocate and took the app down.
2026-10-13 10:45:39 -05:00
Brandon Thomas