Brandon Thomas
9ca113defa
Merge PR #1135 (rebased)
...
# Conflicts:
# xtask/src/main.rs
2026-10-15 00:53:45 -04:00
Brandon Thomas
76881c977e
Merge PR #1327 (rebased)
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/parity-checklist.md
# docs/target-app-parity.md
2026-10-15 00:53:22 -04:00
Brandon Thomas
02000d98a4
Merge PR #1198 (rebased)
...
# Conflicts:
# crates/ui-egui/src/panels/keyword_list.rs
2026-10-15 00:52:53 -04:00
Brandon Thomas
8591cdfa6b
Merge PR #1469 (rebased)
...
# Conflicts:
# crates/engine/src/lib.rs
# docs/parity-checklist.md
2026-10-15 00:52:33 -04:00
Brandon Thomas
0af2d36442
Merge PR #1320 (rebased)
2026-10-15 00:52:32 -04:00
Brandon Thomas
cab59313fd
Merge PR #1316 (rebased)
2026-10-15 00:52:32 -04:00
Brandon Thomas
b3012745d5
Merge PR #1215 (rebased)
...
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
2026-10-15 00:52:31 -04:00
Brandon Thomas
f7204aa8dd
Merge PR #1176 (rebased)
2026-10-15 00:52:31 -04:00
Brandon Thomas
8b73a2ec2f
Merge PR #1138 (rebased)
...
# Conflicts:
# docs/gaps.md
2026-10-15 00:52:30 -04:00
Brandon Thomas
05aa012f37
Merge PR #1802 (rebased)
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:52:30 -04:00
Brandon Thomas
a690478e52
Merge PR #1773 (rebased)
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:52:29 -04:00
Brandon Thomas
2f58918162
Merge PR #1762 (rebased)
...
# Conflicts:
# crates/ui-egui/src/lib.rs
2026-10-15 00:52:29 -04:00
Brandon Thomas
7c5f36bd8c
Merge PR #1761 (rebased)
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:52:29 -04:00
Brandon Thomas
30168d759d
Merge PR #1755 (rebased)
2026-10-15 00:52:28 -04:00
Brandon Thomas
bc7abfae14
Merge PR #1708 (rebased)
2026-10-15 00:52:28 -04:00
Brandon Thomas
7b49657a26
Merge PR #1705 (rebased)
2026-10-15 00:52:27 -04:00
Brandon Thomas
12eab11cf5
Merge PR #1469
...
# Conflicts:
# crates/engine/src/cmd/preset_files.rs
# crates/engine/src/tests_import.rs
# docs/parity-checklist.md
# docs/xmp-interop.md
2026-10-15 00:50:08 -04:00
Brandon Thomas
f27ca795c7
Merge PR #1327
...
# Conflicts:
# ROADMAP.md
# crates/raw/tests/corpus.rs
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/raw/coverage.tsv
# docs/raw/evidence.tsv
# docs/target-app-parity.md
2026-10-15 00:44:42 -04:00
Brandon Thomas and Claude Opus 5.5
81a9569301
Batch 36: rustfmt after merging #1802
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 00:42:56 -04:00
Brandon Thomas and Claude Opus 5.5
1e49095146
Merge PR #1802
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 00:42:40 -04:00
Brandon Thomas
372f39f8f7
Merge PR #1320
...
# Conflicts:
# crates/engine/src/files.rs
# crates/raw/src/demosaic/ahd.rs
2026-10-15 00:38:16 -04:00
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
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
7af7b31af6
Merge pull request #1843 from storytold/claude/integrate-batch-36
...
Integration batch 36: 110 reviewed community PRs (slideshow, camera verification, translations, never-crash, UI)
2026-10-15 00:16:05 -04:00
Brandon Thomas
26a3ae09a1
Merge PR #1009 (updated head)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-15 00:15:42 -04:00
Brandon Thomas
77dc170ede
Merge PR #1053 (updated head)
...
# Conflicts:
# crates/engine/examples/raw_frame.rs
# crates/raw/src/vendor/nef.rs
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
# xtask/src/main.rs
2026-10-15 00:10:37 -04:00
Brandon Thomas and Claude Opus 5.5
b333199eb1
Merge PR #1762
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 00:09:51 -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
e3a13438e9
Merge PR #1062 (updated head)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-15 00:07:34 -04:00
Brandon Thomas
431194d5fd
Merge origin/main into batch 36
2026-10-15 00:07:19 -04:00
Brandon Thomas
57503c9a4e
Merge PR #1198
...
# Conflicts:
# ROADMAP.md
# assets/ATTRIBUTION.md
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/menus.rs
# crates/ui-egui/src/panels/keyword_list.rs
# crates/ui-egui/src/panels/settings.rs
# docs/localization-parity.md
# docs/localization.md
2026-10-15 00:04:52 -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
a0b55e66bb
Merge PR #1755
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 23:48:20 -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
eb4cfe6c56
Batch 36: Canon RP C-RAW sample listed once ( #1029 and #1453 both pinned it); the face-tile test waits up to a minute for its pictures on a busy machine
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 23:39:57 -04:00
Brandon Thomas and Claude Opus 5.5
a0401d6949
Merge PR #1708
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 23:33:18 -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
56022ffc2a
Batch 36: D600/D610 measured areas listed once ( #1053 and #1770 both added them, with the same crops)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 22:51:38 -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 and Claude Opus 5.5
a740c1f390
Batch 36: format catalogs list the strings this batch adds, in English until translated
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 22:33:28 -04:00
Brandon Thomas
32e870d589
Merge PR #1694
...
# Conflicts:
# docs/cr3.md
# docs/whats-new.md
2026-10-14 22:33:20 -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
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
084d95d630
Merge PR #1665
...
# Conflicts:
# docs/parity-checklist.md
2026-10-14 22:33:15 -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
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
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
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
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
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
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
61fa2237f6
Merge PR #1521
2026-10-14 22:32:29 -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
052aa9dccb
Merge PR #1479
2026-10-14 22:32:20 -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
75e0a6dd2a
Merge PR #1835
2026-10-14 22:32:07 -04:00
Brandon Thomas
5c60c3656d
Merge PR #1831
2026-10-14 22:32:04 -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
7ab2f2bfb4
Merge PR #1808
2026-10-14 22:31:56 -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
f7fc3abb2f
Merge PR #1797
2026-10-14 22:31:51 -04:00
Brandon Thomas
084c99bd8e
Merge PR #1796
2026-10-14 22:31:51 -04:00
Brandon Thomas
556f3d040f
Merge PR #1795
2026-10-14 22:31:48 -04:00
Brandon Thomas
6dab4bdc1b
Merge PR #1793
2026-10-14 22:31:47 -04:00
Brandon Thomas
c809c249d1
Merge PR #1792
2026-10-14 22:31:46 -04:00
Brandon Thomas
fe2ba9191a
Merge PR #1791
2026-10-14 22:31:46 -04:00
Brandon Thomas
e4ad628398
Merge PR #1784
2026-10-14 22:31:45 -04:00
Brandon Thomas
19f094c952
Merge PR #1782
...
# Conflicts:
# docs/whats-new.md
2026-10-14 22:31:44 -04:00
Brandon Thomas
b476affb6b
Merge PR #1780
...
# Conflicts:
# docs/whats-new.md
2026-10-14 22:31:43 -04:00
Brandon Thomas
fdd05f4141
Merge PR #1779
...
# Conflicts:
# docs/whats-new.md
2026-10-14 22:31:42 -04:00
Brandon Thomas
260d03ced6
Merge PR #1777
...
# Conflicts:
# docs/whats-new.md
2026-10-14 22:31:41 -04:00
Brandon Thomas
2c4390e2d0
Merge PR #1776
...
# Conflicts:
# docs/whats-new.md
2026-10-14 22:31:40 -04:00
Brandon Thomas and Claude Opus 5.5
6cc0072843
Batch 36: the Czech and Polish format catalogs list the strings this batch adds, in English until translated
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 22:31:00 -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
622f9e6492
Merge PR #1769
...
# Conflicts:
# contributors/people.toml
2026-10-14 22:29:48 -04:00
Brandon Thomas
2011d19792
Merge PR #1767
2026-10-14 22:29:47 -04:00
Brandon Thomas
b985090c90
Merge PR #1758
2026-10-14 22:29:45 -04:00
Brandon Thomas
2a5fae54b0
Merge PR #1753
...
# Conflicts:
# crates/ui-egui/src/panels/edit.rs
2026-10-14 22:29:43 -04:00