Michael Anderson
296e2ce73c
Merge remote-tracking branch 'origin/fix/colour-fit-lens-geometry' into feat/nikon-z6ii-camera-profile
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# crates/engine/src/tests_xmp.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-15 00:55:18 -05:00
Michael Anderson
9ad2c1766b
Merge remote-tracking branch 'upstream/main' into fix/colour-fit-lens-geometry
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# crates/engine/src/files.rs
# docs/whats-new.md
2026-10-15 00:48:09 -05:00
Brandon Thomas
3d003e8c64
Merge pull request #1852 from storytold/claude/integrate-batch-37
...
Integration batch 37: 20 rebased community PRs (print module, decode speed-ups, camera coverage, Italian)
2026-10-15 01:37:33 -04:00
Brandon Thomas and Claude Opus 5.5
a981538d05
Batch 37: the #1506 What's New entry once
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:36:59 -04:00
Brandon Thomas
c870c32ce5
Merge PR #1469 (updated head)
2026-10-15 01:36:27 -04:00
Brandon Thomas
81849a499e
Merge PR #1773 (updated head)
2026-10-15 01:36:27 -04:00
Brandon Thomas and Claude Opus 5.5
2a4b53f86c
Batch 37: parity summary refreshed
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:34:43 -04:00
Brandon Thomas and Claude Opus 5.5
b00d7c0267
Batch 37: the contact-sheet export test's deadline is a hang guard (it queues behind other tests' demo scenes)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:33:01 -04:00
cookingwithsimon and Claude Opus 5.5
77a37683bc
LR-IMP-PROFILES: merge main into presets-apply-imported-profile ( #1469 )
...
Resolves conflicts with integration batch 36 (local adjustment presets):
the preset.import help and docs now describe both the mask-effect import
and the profile a preset names; both sides' tests are kept.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01GitCXGGRfeWqEhhnzH6s6D
2026-10-15 05:31:03 +00:00
Brandon Thomas
51a784cd95
Merge PR #1475 (rebased)
...
# Conflicts:
# crates/raw/examples/rawinfo.rs
# crates/raw/src/lib.rs
# crates/raw/src/vendor/arw.rs
# crates/raw/src/vendor/erf.rs
# crates/raw/src/vendor/mef.rs
# crates/raw/src/vendor/nef.rs
# crates/raw/tests/lossy_dng.rs
# crates/raw/tests/robust.rs
2026-10-15 01:13:36 -04:00
Brandon Thomas and Claude Opus 5.5
52a3b0ed84
Batch 37: #1471 's test mosaic sets #1176 's lens_metadata
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:12:03 -04:00
Brandon Thomas
cf0002b484
Merge PR #1471 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-15 01:10:17 -04:00
Brandon Thomas and Claude Opus 5.5
e5cc449bd1
Batch 37: the contact-sheet export and batch-merge tests wait longer on a busy machine (they pass alone, timed out under the full test run)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:10:07 -04:00
Brandon Thomas and Claude Opus 5.5
edfd4bc80a
Batch 37: conflict markers left in three tracker headers by the #1327 merge resolved
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:07:22 -04:00
Brandon Thomas
66a0cd826c
Merge PR #1475
...
# Conflicts:
# crates/merge/src/output.rs
# crates/raw/src/vendor/nef.rs
2026-10-15 01:05:31 -04:00
Brandon Thomas
7f7401713a
Merge PR #1471
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# crates/engine/src/merge.rs
# crates/merge/src/frame.rs
# crates/merge/src/hdr.rs
# docs/parity-checklist.md
2026-10-15 00:56:52 -04:00
Brandon Thomas
fbb9583d41
Merge PR #1810 (rebased)
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:56:51 -04:00
Brandon Thomas and Claude Opus 5.5
3c489dc408
Batch 37: the print commands ( #1215 ) take the Result that Session::targets returns since #1773
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 00:56:44 -04:00
Brandon Thomas and Claude Opus 5.5
4468917a1b
Merge PR #1810
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 00:54:13 -04:00
Brandon Thomas and Claude Opus 5.5
60b938ab52
Batch 37: format catalogs list the strings this batch adds, in English until translated
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 00:53:53 -04:00
Brandon Thomas
3b6d15355b
Merge PR #1298 (rebased)
...
# Conflicts:
# crates/ui-egui/src/panels/dialogs.rs
2026-10-15 00:53:53 -04:00
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
Michael Anderson
e48d5d428d
Merge remote-tracking branch 'upstream/main' into fix/1506-explicit-targets
...
# Conflicts:
# crates/engine/src/cmd/library.rs
# crates/engine/src/tests.rs
# crates/ui-egui/src/panels/grid.rs
# crates/ui-egui/src/panels/keywording.rs
# crates/ui-egui/src/panels/right.rs
# docs/whats-new.md
2026-10-14 23:38:19 -05: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
ab96593df5
Merge PR #1298
...
# Conflicts:
# crates/ui-egui/locales/de.json
# crates/ui-egui/locales/es.json
# crates/ui-egui/locales/fr.json
# crates/ui-egui/locales/pt-br.json
# crates/ui-egui/locales/ru.json
# crates/ui-egui/locales/uk.json
# crates/ui-egui/src/panels/dialogs.rs
# crates/ui-egui/src/panels/faces.rs
# crates/ui-egui/src/shortcuts.rs
2026-10-15 00:29:27 -04:00
Michael Anderson
68ef6ff3b3
Merge remote-tracking branch 'upstream/main' into feat/nikon-z6ii-camera-profile
...
# Conflicts:
# README.md
# README.zh-hans.md
# crates/engine/src/camera_preview.rs
# docs/camera-preview-colour.md
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 23:26:01 -05:00
Michael Anderson
f9076514e7
Merge remote-tracking branch 'upstream/main' into fix/colour-fit-lens-geometry
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 23:22:42 -05: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
Michael Anderson