8339028a80
Merge PR #794
...
# Conflicts:
# crates/engine/src/media.rs
# crates/pipeline/src/optics.rs
# docs/parity-checklist.md
2026-10-11 12:00:57 +00:00
6308ca1088
Merge PR #547
...
# Conflicts:
# crates/ui-egui/src/panels/detail.rs
2026-10-11 12:00:46 +00:00
11f41cbe97
Merge PR #813
2026-10-11 12:00:21 +00:00
7ff683f037
Merge PR #750
2026-10-11 12:00:20 +00:00
477c078b35
Merge PR #834
2026-10-11 12:00:20 +00:00
5ba413baf2
Merge PR #625
...
# Conflicts:
# crates/engine/src/media.rs
# docs/parity-checklist.md
2026-10-11 12:00:20 +00:00
421000916e
Merge PR #667
...
# Conflicts:
# docs/parity-checklist.md
2026-10-11 12:00:19 +00:00
860b0d69c6
Merge PR #749
2026-10-11 12:00:19 +00:00
111bb42aa3
Merge PR #825
...
# Conflicts:
# docs/parity-checklist.md
2026-10-11 12:00:17 +00:00
8380415222
Merge PR #874
...
# Conflicts:
# docs/parity-checklist.md
2026-10-11 12:00:17 +00:00
5df7f733d3
Batch 29: tracker rows for content-aware Fill ( #926 ), printer ICC soft proofing ( #928 ) and the lensfun-format lens database ( #930 )
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 11:58:25 +00:00
7ecb0b0191
Merge PR #915
...
# Conflicts:
# crates/engine/src/media.rs
# crates/raw/src/vendor/crx.rs
# crates/ui-egui/locales/de.json
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
2026-10-11 11:58:15 +00:00
17dfa9709e
Merge PR #926
...
# Conflicts:
# Cargo.lock
# Cargo.toml
# 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
# xtask/src/layers.rs
2026-10-11 11:57:45 +00:00
3b0131aaea
Merge batch 28 fix
2026-10-11 11:57:35 +00:00
2efa01767f
Batch 28: resolve the leftover #685 test conflict in tests_panels.rs (both album tests kept)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 11:57:29 +00:00
05939cbc54
Merge PR #928
...
# 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-11 11:53:13 +00:00
b8d39063db
Merge PR #930
2026-10-11 11:53:12 +00:00
5861591307
Merge PR #948
...
On merge: metadata.downloadPlaceNames accepts plain http only for the loopback address itself
(http://127.0.0.1.example.com/ and http://127.0.0.1@host/ are refused; test
download_base_is_https_or_loopback_only).
2026-10-11 11:52:57 +00:00
6c18c0a7c6
LR-PREF-PERFORMANCE: preview builds render the larger of view and thumbnail first (a view under 512 px no longer feeds an upscaled thumbnail, follow-up to #927 )
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 11:52:24 +00:00
95007492cc
Merge PR #927
2026-10-11 11:52:07 +00:00
5ce115a505
Merge PR #959
2026-10-11 11:51:56 +00:00
62ece65ac9
Merge PR #664
...
# Conflicts:
# crates/engine/src/tests_export.rs
# crates/mcp/src/headless.rs
# crates/mcp/src/tools.rs
2026-10-11 11:50:59 +00:00
44acde3a41
Merge PR #666
...
# Conflicts:
# apps/lightcraft/src/main.rs
# crates/engine/src/config.rs
2026-10-11 11:50:35 +00:00
c04eec3f9d
Merge PR #721
...
# Conflicts:
# apps/lightcraft/src/main.rs
2026-10-11 11:50:22 +00:00
b6ad706aa6
Merge PR #712
...
# Conflicts:
# crates/engine/src/export.rs
2026-10-11 11:50:06 +00:00
31734dea86
Merge PR #689
...
# Conflicts:
# crates/engine/src/media.rs
# crates/raw/src/vendor/arw.rs
2026-10-11 11:50:05 +00:00
76cf8ca4c9
Merge PR #694
...
# Conflicts:
# crates/gpu/src/backend.rs
# docs/parity-checklist.md
2026-10-11 11:49:53 +00:00
4e6cd5d7b9
Merge PR #704
...
# Conflicts:
# docs/parity-checklist.md
2026-10-11 11:49:37 +00:00
9dc0d0b62b
Merge PR #685
...
# Conflicts:
# crates/ui-egui/src/panels/grid.rs
# crates/ui-egui/src/tests_panels.rs
# docs/parity-checklist.md
2026-10-11 11:49:25 +00:00
efd29ef21a
Merge branch 'claude/integrate-batch-27' into claude/integrate-batch-28
2026-10-11 11:48:59 +00:00
72d77d7b41
Batch 27: close two tests in tests_masking.rs (the merges of #884 and #766 dropped their braces)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 11:48:59 +00:00
2fedd92077
Batch 28: close the faces-toggle test (the merge of #690 dropped its brace)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
2026-10-11 11:48:32 +00:00
40492d238e
Merge PR #690
...
# 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
# crates/ui-egui/src/tests_panels.rs
# docs/parity-checklist.md
2026-10-11 11:48:06 +00:00
8d319563ca
Merge PR #710
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-11 11:48:05 +00:00
edb95894b4
Merge PR #695
...
# Conflicts:
# crates/engine/src/media.rs
2026-10-11 11:47:51 +00:00
16bbaff14c
Merge PR #700
...
# Conflicts:
# crates/engine/src/media.rs
# docs/parity-checklist.md
2026-10-11 11:47:50 +00:00
db8b82c6d7
Merge PR #703
2026-10-11 11:47:28 +00:00
7c4fd3abaa
Merge PR #686
2026-10-11 11:47:28 +00:00
7afbc3ecb3
Merge PR #687
2026-10-11 11:47:28 +00:00
0f9415b320
Merge PR #688
2026-10-11 11:47:28 +00:00
27d2bfda86
Merge PR #663
...
# Conflicts:
# docs/gaps.md
2026-10-11 11:47:28 +00:00
d098ffac42
Merge PR #665
2026-10-11 11:47:27 +00:00
ae2d936c4d
Merge PR #679
2026-10-11 11:47:27 +00:00
96988afe6d
Merge PR #696
2026-10-11 11:47:26 +00:00
1f3bfbdb25
Merge PR #698
2026-10-11 11:47:26 +00:00
9847383bf2
Merge PR #711
...
# Conflicts:
# docs/parity-checklist.md
2026-10-11 11:47:26 +00:00
ab86ed7c84
Merge PR #716
...
# Conflicts:
# docs/gaps.md
2026-10-11 11:47:26 +00:00
b46adf0640
Merge PR #720
...
# Conflicts:
# docs/parity-checklist.md
2026-10-11 11:47:25 +00:00
c97b2790d3
Merge PR #843
...
# Conflicts:
# crates/engine/src/export.rs
# docs/parity-checklist.md
2026-10-11 11:46:15 +00:00
82f74e31fd
Merge PR #727
...
# Conflicts:
# crates/raw/src/vendor/nef.rs
# docs/parity-checklist.md
2026-10-11 11:46:01 +00:00
Claude