Brandon Thomas
af8843bf01
Merge PR #1316
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# crates/engine/src/media.rs
2026-10-15 00:33:33 -04:00
Brandon Thomas and Claude Opus 5.5
2475cf5e32
Merge PR #1773
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 00:31:26 -04:00
Ege Gursel
f906998174
Merge branch 'main' into fix/xmp-import-local-grain-luminance-range
2026-10-15 00:25:35 -04:00
Ege Gursel
1130bda456
fix(import): keep Lightroom luminance ranges open at white, report unmapped local sliders
...
Two of the three problems reported in #1840 :
- A luminance range at full strength up to white (LumRange "a b 1 1",
a typical highlights mask) ended at our scene white (0 EV) with no
feather, so anything brighter (the sun, speculars, a sky after a
positive exposure) fell out of the mask along a hard edge. That end
now stays open.
- Correction sliders we have no counterpart for (LocalGrain, ...) were
dropped silently. They are now listed in `unmapped` as
"Mask: LocalGrain"; LocalCurveRefineSaturation 100 counts as neutral.
Adobe base looks, the third problem, are handled by #1469 .
Also adds my entry to contributors/people.toml.
2026-10-15 00:23:41 -04:00
Brandon Thomas
b29a1a8cc2
Merge PR #1215
...
# Conflicts:
# crates/engine/src/lib.rs
# crates/engine/src/pdf.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/menus.rs
# crates/ui-egui/src/panels/dialogs.rs
# crates/ui-egui/src/state.rs
# docs/gaps.md
# docs/parity-checklist.md
2026-10-15 00:22:08 -04:00
Brandon Thomas
f613aeba59
Merge PR #1176
...
# Conflicts:
# crates/raw/src/vendor/arw.rs
# docs/parity-checklist.md
# docs/sony-lens-corrections.md
2026-10-14 23:54:06 -04:00
Brandon Thomas
e6b2e6eefb
Merge PR #1138
...
# Conflicts:
# crates/catalog/src/lib.rs
# crates/catalog/src/query.rs
# crates/engine/src/cmd/library.rs
# crates/ui-egui/src/tests_keywording.rs
# docs/gaps.md
2026-10-14 23:46:16 -04:00
Brandon Thomas and Claude Opus 5.5
851aedc64d
Batch 36: tests and tracker after the merges
...
- Visualize HDR (#1555 ) has no default key: ⇧H cycles the Tool Overlay (#1473 , issue #224 )
- CR3 tests (#1461 , #1462 ) accept adaptive QP 131–175, as #1694 decodes; cr3.md says the R6 Mark II files decode
- English fallbacks in the Czech and Polish catalogs use → for the menu triangle; Polish in the keyword-label test
- canvas handle tests show pins (Tool Overlay Always); a focused handle keeps its pins shown in Auto
- the model-install test and demo deadlock guards wait on deadlines long enough for a busy machine
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 23:25:29 -04:00
Brandon Thomas
9ca3cd0926
Merge PR #1135
...
# Conflicts:
# Cargo.lock
# Cargo.toml
# README.md
# crates/raw/Cargo.toml
# crates/ui-egui/src/theme.rs
# xtask/src/main.rs
2026-10-14 23:23:18 -04:00
Brandon Thomas and Claude Opus 5.5
b8c5913afe
Merge PR #1705
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 23:11:45 -04:00
Brandon Thomas and Claude Opus 5.5
211255770f
Batch 36: #1510 's rename follows the optional name #1665 gave person_from; #1780 's test sets #974 's preview_checked; rustfmt
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 22:35:34 -04:00
Brandon Thomas
a2784ff9b3
Merge PR #1738
...
# Conflicts:
# docs/lightroom-catalog-import.md
2026-10-14 22:33:19 -04:00
Brandon Thomas
4660e7079e
Merge PR #1820
...
# Conflicts:
# crates/ui-egui/src/lib.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 22:33:18 -04:00
Brandon Thomas
2fd769963e
Merge PR #1549
...
# Conflicts:
# crates/engine/src/tests_merge.rs
# 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
# docs/merge.md
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 22:33:16 -04:00
Brandon Thomas
5b3856ba2b
Merge PR #1613
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 22:33:13 -04:00
Brandon Thomas
f306bff0dc
Merge PR #1556
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 22:33:12 -04:00
Brandon Thomas
87f0abbdb0
Merge PR #1547
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 22:33:11 -04:00
Brandon Thomas
f8d1585c6f
Merge PR #1510
...
# 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
# crates/ui-egui/src/lib.rs
# docs/parity-checklist.md
2026-10-14 22:33:10 -04:00
Brandon Thomas
9562532695
Merge PR #1662
2026-10-14 22:32:55 -04:00
Brandon Thomas
31f1f559dd
Merge PR #1660
2026-10-14 22:32:54 -04:00
Brandon Thomas
43f9d51207
Merge PR #1656
...
# Conflicts:
# crates/engine/src/library.rs
# crates/engine/src/tests_library.rs
# crates/ui-egui/src/menubar.rs
# docs/parity-checklist.md
2026-10-14 22:32:53 -04:00
Brandon Thomas
65f51751a1
Merge PR #1637
2026-10-14 22:32:52 -04:00
Brandon Thomas
3698f76c40
Merge PR #1601
...
# Conflicts:
# crates/ui-egui/src/headless.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/state.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 22:32:47 -04:00
Brandon Thomas
bde5385a6f
Merge PR #1590
...
# Conflicts:
# crates/meta/src/exif.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 22:32:44 -04:00
Brandon Thomas
18db8588b9
Merge PR #1490
...
# Conflicts:
# docs/parity-checklist.md
# docs/ui-parity.md
2026-10-14 22:32:25 -04:00
Brandon Thomas
de5ec99f61
Merge PR #1489
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 22:32:24 -04:00
Brandon Thomas
75e0a6dd2a
Merge PR #1835
2026-10-14 22:32:07 -04:00
Brandon Thomas
f03c4529c2
Merge PR #1818
...
# 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/whats-new.md
2026-10-14 22:32:01 -04:00
Brandon Thomas
5e1a951008
Merge PR #1817
2026-10-14 22:31:59 -04:00
Brandon Thomas
33c321c6fb
Merge PR #1816
...
# Conflicts:
# crates/engine/src/tests.rs
2026-10-14 22:31:58 -04:00
Brandon Thomas
bbf8fc0f0b
Merge PR #1813
2026-10-14 22:31:57 -04:00
Brandon Thomas
213b09a2e9
Merge PR #1804
2026-10-14 22:31:55 -04:00
Brandon Thomas
327e67af9e
Merge PR #1798
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 22:31:53 -04:00
Brandon Thomas
6dab4bdc1b
Merge PR #1793
2026-10-14 22:31:47 -04:00
Brandon Thomas
b476affb6b
Merge PR #1780
...
# Conflicts:
# docs/whats-new.md
2026-10-14 22:31:43 -04:00
Brandon Thomas
f815f88958
Merge PR #1772
...
# Conflicts:
# crates/engine/src/tests_xmp.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 22:29:50 -04:00
Brandon Thomas
e2f6555220
Merge PR #1750
2026-10-14 22:29:42 -04:00
Brandon Thomas
a8f0f5d60b
Merge PR #1715
...
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
# docs/target-app-parity.md
2026-10-14 22:29:33 -04:00
Brandon Thomas
3be25e7559
Merge PR #1686
2026-10-14 22:29:25 -04:00
Brandon Thomas and Claude Opus 5.5
da7534a2ed
Batch 36: the slideshow template test drops the cached listing after writing a file by hand (flaky when the write lands in the listing's clock tick)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 22:28:53 -04:00
Michael Anderson
2953b63576
Merge remote-tracking branch 'upstream/main' into feat/brush-shift-click
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 21:05:05 -05:00
Michael Anderson
ca6077ab81
Merge remote-tracking branch 'upstream/main' into fix/1524-faces-after-relink
...
# Conflicts:
# crates/engine/src/lib.rs
2026-10-14 21:03:02 -05:00
Michael Anderson
453757773d
Merge remote-tracking branch 'upstream/main' into fix/xmp-write-retry
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 20:59:59 -05:00
Brandon Thomas
d8b52d9405
Merge PR #1105
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
2026-10-14 21:59:32 -04:00
Brandon Thomas
aba04aaf5c
Merge PR #1087
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/raw/coverage.tsv
# docs/raw/evidence.tsv
# xtask/src/main.rs
2026-10-14 21:59:31 -04:00
Brandon Thomas
a993758693
Merge PR #1106
...
# 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/whats-new.md
2026-10-14 21:58:45 -04:00
Michael Anderson
6c5eacc839
Merge remote-tracking branch 'upstream/main' into fix/1392-browse-forgets-deleted
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 20:58:44 -05: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