 Brandon Thomas
|
6f2ccf7e33
|
Merge PR #1693
|
2026-10-14 22:29:26 -04:00 |
|
|
Brandon Thomas
|
9107ea4bdf
|
Merge PR #1688
|
2026-10-14 22:29:25 -04:00 |
|
|
Brandon Thomas
|
3be25e7559
|
Merge PR #1686
|
2026-10-14 22:29:25 -04:00 |
|
|
Brandon Thomas
|
d9508ff909
|
Merge PR #1467
|
2026-10-14 22:29:15 -04:00 |
|
|
Brandon Thomas
|
aa384d62f7
|
Merge PR #1466
# Conflicts:
# docs/camera-preview-colour.md
|
2026-10-14 22:29:14 -04:00 |
|
|
Brandon Thomas
|
0bdb55cb4b
|
Merge PR #1465
|
2026-10-14 22:29:13 -04:00 |
|
|
Brandon Thomas
|
60696fe7c1
|
Merge PR #1462
|
2026-10-14 22:29:12 -04:00 |
|
|
Brandon Thomas
|
0f842c8f87
|
Merge PR #1461
# Conflicts:
# crates/raw/tests/robust.rs
|
2026-10-14 22:29:11 -04:00 |
|
|
Brandon Thomas
|
de137ef5fc
|
Merge PR #1311
|
2026-10-14 22:29:07 -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
|
8a406d0dfc
|
Merge PR #1211
|
2026-10-14 22:29:02 -04:00 |
|
|
Brandon Thomas
|
1449be9281
|
Merge PR #1190
# Conflicts:
# contributors/people.toml
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/menus.rs
|
2026-10-14 22:29:00 -04:00 |
|
|
Brandon Thomas
|
b70dcba75b
|
Merge PR #1180
|
2026-10-14 22:28:59 -04:00 |
|
|
Brandon Thomas
|
9131ff7000
|
Merge PR #1166
|
2026-10-14 22:28:56 -04:00 |
|
|
Brandon ThomasandClaude 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 |
|
|
OneSlipsandClaude Opus 5.5
|
8308ff2034
|
Merge upstream main into pr/mask-effects
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-15 12:06:26 +10:00 |
|
|
Brandon ThomasandClaude Opus 5.5
|
cfd14ea7c1
|
Batch 36: the Polish format catalog (#1100) lists the strings this batch's other PRs add, in English until translated; lockfile at 0.8.0 for the slideshow crate
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 22:05:23 -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 |
|
|
Brandon Thomas
|
b6eb559243
|
Merge PR #1053
# Conflicts:
# crates/raw/src/vendor/nef.rs
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
|
2026-10-14 22:01:32 -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 |
|
|
Brandon Thomas
|
0fc3155859
|
Merge PR #1111
# Conflicts:
# ROADMAP.md
# docs/gaps.md
|
2026-10-14 21:58:46 -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
|
39502d482c
|
Merge PR #1102
|
2026-10-14 21:58:43 -04:00 |
|
|
Brandon Thomas
|
c99be924da
|
Merge PR #1100
|
2026-10-14 21:58:43 -04: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
|
260a460c11
|
Merge PR #1019
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
|
2026-10-14 21:57:59 -04:00 |
|
|
Brandon Thomas
|
58dc540cc0
|
Merge PR #1010
# Conflicts:
# docs/gaps.md
|
2026-10-14 21:57:58 -04:00 |
|
|
Michael Anderson
|
e423d55ea1
|
Merge remote-tracking branch 'upstream/main' into fix/1373-jpeg-optimal-huffman
# Conflicts:
# docs/parity-checklist.md
|
2026-10-14 20:57:31 -05:00 |
|
|
Brandon Thomas
|
cbf3664e4f
|
Merge PR #824
# Conflicts:
# crates/engine/src/files.rs
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
|
2026-10-14 21:56:53 -04:00 |
|
|
Michael Anderson
|
15becc9eb4
|
Merge remote-tracking branch 'upstream/main' into feat/nikon-z8-d5300-profiles
# Conflicts:
# docs/parity-checklist.md
|
2026-10-14 20:56:06 -05:00 |
|
|
Michael Anderson
|
88455a837c
|
Merge remote-tracking branch 'upstream/main' into feat/nikon-dslr-lens-names
# Conflicts:
# docs/parity-checklist.md
|
2026-10-14 20:55:26 -05:00 |
|
|
Brandon Thomas
|
2138dc6e7d
|
Merge PR #1009
# Conflicts:
# docs/parity-checklist.md
|
2026-10-14 21:55:05 -04:00 |
|
|
Michael Anderson
|
a68da45fc3
|
Merge remote-tracking branch 'upstream/main' into fix/colour-fit-lens-geometry
# Conflicts:
# docs/parity-checklist.md
|
2026-10-14 20:55:01 -05:00 |
|
|
Brandon Thomas
|
0bef63b6eb
|
Merge PR #974
# Conflicts:
# crates/engine/src/cmd/mod.rs
# 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/mcp.md
# docs/parity-checklist.md
|
2026-10-14 21:55:01 -04:00 |
|
|
Brandon Thomas
|
8735468e81
|
Merge PR #966
# Conflicts:
# crates/engine/src/tests.rs
|
2026-10-14 21:54:57 -04:00 |
|
|
Brandon Thomas
|
4377bd4604
|
Merge PR #806
|
2026-10-14 21:54:55 -04:00 |
|
|
Brandon Thomas
|
e78e165594
|
Merge PR #929
|
2026-10-14 21:54:54 -04:00 |
|