Brandon Thomas
f7204aa8dd
Merge PR #1176 (rebased)
2026-10-15 00:52:31 -04:00
Brandon Thomas
7c5f36bd8c
Merge PR #1761 (rebased)
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:52:29 -04:00
Brandon Thomas
d08d8896b8
Merge PR #1832 (updated head)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-15 00:07:48 -04:00
Brandon Thomas and Claude Opus 5.5
1a120a86a2
Merge PR #1761
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 23:59:13 -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 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
133d575b8a
Merge PR #1770
...
# Conflicts:
# crates/raw/src/vendor/nef.rs
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
2026-10-14 22:33:17 -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
ad23861454
Merge PR #1625
...
# Conflicts:
# apps/lightcraft/src/main.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 22:33:14 -04:00
Brandon Thomas
f306bff0dc
Merge PR #1556
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 22:33:12 -04:00
Brandon Thomas
4d4a537079
Merge PR #1555
...
# Conflicts:
# docs/gaps.md
# docs/library-shortcuts.md
# docs/parity-checklist.md
# docs/ui-parity.md
2026-10-14 22:33:11 -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
56cff6b11c
Merge PR #1491
...
# Conflicts:
# crates/ui-egui/src/menus.rs
# docs/parity-checklist.md
# docs/ui-parity.md
2026-10-14 22:33:08 -04:00
Brandon Thomas
f933851a9e
Merge PR #1482
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 22:33:07 -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
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
c8c97883cd
Merge PR #1548
...
# 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
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 22:32:39 -04:00
Brandon Thomas
5734d2e71c
Merge PR #1540
...
# Conflicts:
# docs/file-format-parity.md
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 22:32:33 -04:00
Brandon Thomas
1d006f7703
Merge PR #1538
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 22:32:30 -04:00
Brandon Thomas
7f8232e12c
Merge PR #1495
2026-10-14 22:32:27 -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
5d1fade3d0
Merge PR #1473
...
# Conflicts:
# crates/ui-egui/src/menubar.rs
# docs/parity-checklist.md
# docs/ui-parity.md
2026-10-14 22:32:17 -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
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
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
2011d19792
Merge PR #1767
2026-10-14 22:29:47 -04:00
Brandon Thomas
e2f6555220
Merge PR #1750
2026-10-14 22:29:42 -04:00
Brandon Thomas
da677cd440
Merge PR #1832
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 22:29:41 -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
0bdb55cb4b
Merge PR #1465
2026-10-14 22:29:13 -04:00
Brandon Thomas
9854ca24cb
Merge PR #1308
...
# Conflicts:
# crates/ui-egui/src/lib.rs
# docs/parity-checklist.md
2026-10-14 22:29:06 -04:00
Brandon Thomas
9131ff7000
Merge PR #1166
2026-10-14 22:28:56 -04: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
d3edca8000
Merge PR #1081
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/raw/coverage.tsv
# xtask/src/main.rs
2026-10-14 21:59:29 -04:00
Brandon Thomas
6ab5e2b0d4
Merge PR #1108
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/raw/evidence.tsv
# xtask/src/main.rs
2026-10-14 21:59:28 -04:00
Brandon Thomas
d0d9aa7df9
Merge PR #1038
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/parity-checklist.md
# docs/target-app-parity.md
2026-10-14 21:59:17 -04:00
Brandon Thomas
381b57dd0b
Merge PR #1096
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# xtask/src/main.rs
2026-10-14 21:59:10 -04:00
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
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
Michael Anderson
9e597bf6dd
Merge remote-tracking branch 'upstream/main' into fix/1627-d610-image-area
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 20:58:11 -05: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