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
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
48b9a5e21f
Merge PR #1132
...
# Conflicts:
# crates/engine/src/lightroom_job.rs
2026-10-14 01:40:32 -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
694ce5b42b
Merge PR #1537
...
# Conflicts:
# docs/gaps.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
cc7179c560
Merge PR #1667
...
# Conflicts:
# docs/whats-new.md
2026-10-14 01:39:03 -04:00
Brandon Thomas
4fe0466942
Merge PR #1666
...
# Conflicts:
# docs/whats-new.md
2026-10-14 01:39:02 -04:00
Brandon Thomas
93bd81a480
Merge PR #1557
...
# Conflicts:
# docs/whats-new.md
2026-10-14 01:38:57 -04:00
Brandon Thomas
1dd41b1872
Merge PR #1550
...
# Conflicts:
# docs/whats-new.md
2026-10-14 01:38:56 -04:00
Brandon Thomas
deb7831083
Merge PR #1542
...
# Conflicts:
# docs/whats-new.md
2026-10-14 01:38:53 -04:00
Brandon Thomas
992e67188b
Merge PR #1539
...
# Conflicts:
# docs/whats-new.md
2026-10-14 01:38:51 -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
skybluu
bcfda31678
Merge current main into DNG identity fix
2026-10-13 21:34:33 -05:00
skybluu
83a89ff271
Merge current main into source build guidance
2026-10-13 21:31:07 -05:00
skybluu
f12cf65ab7
LR-BUILD: document command-local low-memory release overrides ( #1196 )
2026-10-13 21:19:28 -05:00
skybluu
ce607d5a49
LR-LIB-CONVERT: avoid duplicated DNG camera make ( #840 )
2026-10-13 21:13:51 -05: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
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
cd59698798
Merge PR #1583
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:49:24 -04:00
Brandon Thomas
3f9b3b20cb
Merge PR #1579
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:49:22 -04:00
Brandon Thomas
9f8a17277e
Merge PR #1574
2026-10-13 11:49:20 -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
5ece09aa6c
Merge PR #1562
2026-10-13 11:49:13 -04:00
Brandon Thomas
2fd0530beb
Merge PR #1561
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:49:13 -04:00
Brandon Thomas
8bcbcd918b
Merge PR #1560
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:49:12 -04:00
Brandon Thomas
6b00656df8
Merge PR #1559
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:49:11 -04:00
Brandon Thomas
2341132b35
Merge PR #1558
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:49:11 -04:00
Brandon Thomas
c6b2686ba0
Merge PR #1410
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:49:05 -04:00
Brandon Thomas
02bdad38d2
Merge PR #1439
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:48:58 -04:00
Brandon Thomas
6d124d701b
Merge PR #1451
2026-10-13 11:48:38 -04:00
Brandon Thomas
f0493fa11b
Merge PR #1419
2026-10-13 11:48:36 -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
Brandon Thomas