 Brandon ThomasandClaude Opus 5.5
|
dec7fd4eb2
|
Merge PR #1834
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-15 01:26:47 -04:00 |
|
 Brandon ThomasandClaude 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
|
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
|
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
|
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
|
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
|
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
|
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
|
75e0a6dd2a
|
Merge PR #1835
|
2026-10-14 22:32:07 -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
|
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
|
6dab4bdc1b
|
Merge PR #1793
|
2026-10-14 22:31:47 -04:00 |
|
Brandon Thomas
|
b476affb6b
|
Merge PR #1780
# Conflicts:
# docs/whats-new.md
|
2026-10-14 22:31:43 -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
|
e2f6555220
|
Merge PR #1750
|
2026-10-14 22:29:42 -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
|
3be25e7559
|
Merge PR #1686
|
2026-10-14 22:29:25 -04:00 |
|
Brandon Thomas
|
de137ef5fc
|
Merge PR #1311
|
2026-10-14 22:29:07 -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 |
|
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
|
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
|
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 |
|
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 |
|
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
|
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
|
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
|
e78e165594
|
Merge PR #929
|
2026-10-14 21:54:54 -04:00 |
|
Brandon Thomas
|
d837ab1455
|
Merge PR #912
# 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
|
2026-10-14 21:54:53 -04:00 |
|