bflatastic
97d38486b7
Merge PR #999
...
# Conflicts:
# crates/pipeline/src/spots.rs
# crates/ui-egui/src/tests_panels.rs
# docs/parity-checklist.md
# docs/ui-parity.md
# docs/whats-new.md
2026-10-13 12:40:35 +07:00
bflatastic
d18c8454b1
Batch 34: CI checkouts don't keep credentials ( #1148 ); drop a local-run note from the catalog import doc ( #842 ); cargo fmt
2026-10-13 12:30:25 +07:00
bflatastic
ca5292f883
Merge PR #1165
...
# Conflicts:
# crates/mcp/src/headless.rs
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
2026-10-13 12:29:12 +07:00
bflatastic
e6d4ea7c60
Merge PR #1223
...
# Conflicts:
# crates/catalog/src/lock.rs
# docs/parity-checklist.md
2026-10-13 12:29:10 +07:00
bflatastic
2f5ba5e69a
Merge PR #1148
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/gpu-pipeline.md
# docs/target-app-parity.md
2026-10-13 12:28:57 +07:00
bflatastic
a92066c47c
Merge PR #842
...
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/gaps.md
# docs/parity-checklist.md
2026-10-13 12:28:56 +07:00
bflatastic
ac40fa3882
Merge PR #1195
...
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
# docs/ui-parity.md
2026-10-13 12:28:52 +07:00
bflatastic
5f81dfcdde
Merge PR #1014
...
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/gaps.md
# docs/parity-checklist.md
2026-10-13 12:28:48 +07:00
bflatastic
9b5f38039d
Merge PR #1002
...
# Conflicts:
# crates/pipeline/src/spots.rs
2026-10-13 12:28:46 +07:00
bflatastic
789eb13f8a
Merge PR #1056
2026-10-13 12:28:43 +07:00
bflatastic
6690034b10
Merge PR #1067
...
# 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/gaps.md
2026-10-13 12:28:42 +07:00
bflatastic
cc0df6474a
Merge PR #1313
2026-10-13 12:28:38 +07:00
bflatastic
d84b295e23
Merge PR #1124
...
# 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-13 12:28:38 +07:00
bflatastic
e0c1c415e5
Merge PR #1128
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-13 12:28:36 +07:00
bflatastic
1ea573ebfd
Merge PR #1152
...
# Conflicts:
# docs/parity-checklist.md
2026-10-13 12:28:33 +07:00
bflatastic
3eb3722e2c
Merge PR #1147
2026-10-13 12:28:32 +07:00
bflatastic
b7714cfc68
Merge PR #1289
2026-10-13 12:28:31 +07:00
bflatastic
5f44b7f4b3
Merge PR #1287
2026-10-13 12:28:31 +07:00
bflatastic
639ff976e2
Merge PR #1117
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-13 12:28:31 +07:00
bflatastic
ece9bd83e4
Batch 32: one tracker row per id (rows two PRs both edited), parity summary refreshed
2026-10-13 12:05:26 +07:00
Alex Chambers
a8f0db17ea
LR-IMP-FORMATS: discover Sony SR2 and SRF files in folders
...
Reuse the engine's import extensions in MCP and CLI discovery. Add
recursive, case-insensitive discovery tests and record that DSC-F828
SRF import remains preview-only.
Co-Authored-By: Codex <noreply@openai.com>
2026-10-13 06:29:06 +02:00
bflatastic
fa3dfbbc4a
Merge PR #1238
...
# Conflicts:
# crates/pipeline/src/spots.rs
# crates/ui-egui/src/panels/edit.rs
# docs/parity-checklist.md
2026-10-13 11:06:46 +07:00
bflatastic
84d6849cf3
Merge PR #1216
...
# Conflicts:
# crates/engine/src/files.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/parity-checklist.md
2026-10-13 11:06:28 +07:00
bflatastic
ed1d641f22
Merge PR #1174
...
# Conflicts:
# crates/catalog/src/lock.rs
# crates/pipeline/src/spots.rs
# docs/parity-checklist.md
2026-10-13 11:06:26 +07:00
bflatastic
692ab7f7c2
Merge PR #1235
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:05:55 +07:00
bflatastic
32253d862a
Merge PR #1017
...
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/gaps.md
# docs/parity-checklist.md
2026-10-13 11:05:54 +07:00
bflatastic
4e78514948
Merge PR #1324
...
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
2026-10-13 11:05:53 +07:00
bflatastic
bac147a460
Merge PR #1189
...
# Conflicts:
# docs/parity-checklist.md
2026-10-13 11:05:48 +07:00
bflatastic
2181c69162
Merge PR #1151
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:05:47 +07:00
bflatastic
8df468bfc6
Merge PR #1246
...
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/parity-checklist.md
2026-10-13 11:05:44 +07:00
bflatastic
8ca6a835ec
Merge PR #1411
...
# Conflicts:
# crates/ui-egui/locales/pt-br.json
# docs/whats-new.md
2026-10-13 11:05:35 +07:00
bflatastic
94808da369
Merge PR #1250
...
# Conflicts:
# crates/ui-egui/src/tests_panels.rs
2026-10-13 11:04:33 +07:00
bflatastic
edfe7c6351
Merge PR #1242
...
# Conflicts:
# crates/ui-egui/src/tests_panels.rs
# docs/parity-checklist.md
2026-10-13 11:04:32 +07:00
bflatastic
1c473ed64c
Merge PR #1361
2026-10-13 11:03:53 +07:00
bflatastic
cb8aa0b017
Merge PR #1341
2026-10-13 11:03:11 +07:00
bflatastic
d3c024e4df
Merge PR #1047
...
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/gaps.md
2026-10-13 11:03:10 +07:00
bflatastic
74a0b5796a
Merge PR #1070
...
# Conflicts:
# crates/pipeline/src/spots.rs
2026-10-13 11:03:05 +07:00
bflatastic
76fd9b9ae8
Merge PR #805
...
# Conflicts:
# docs/camera-preview-colour.md
# docs/parity-checklist.md
2026-10-13 11:02:58 +07:00
bflatastic
62b1ba04d0
Merge PR #1367
2026-10-13 11:02:55 +07:00
bflatastic
6eb04f9a1c
Merge PR #1119
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:02:52 +07:00
bflatastic
c7e259b3ce
Merge PR #1297
...
# Conflicts:
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
2026-10-13 11:02:49 +07:00
bflatastic
bcbcf3b968
Merge PR #1357
...
# Conflicts:
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
2026-10-13 11:02:48 +07:00
bflatastic
695eb6acc5
Merge PR #1282
...
# Conflicts:
# docs/parity-checklist.md
2026-10-13 11:02:44 +07:00
bflatastic
5e430d057f
Merge PR #1301
2026-10-13 11:02:40 +07:00
bflatastic
9e0f00c557
Merge PR #1222
...
# Conflicts:
# docs/parity-checklist.md
2026-10-13 11:02:40 +07:00
bflatastic
33f03ba0f7
Merge PR #1094
...
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/gaps.md
# docs/hardware-parity.md
2026-10-13 11:01:54 +07:00
bflatastic
18bd8fd881
Merge PR #1397
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:01:53 +07:00
bflatastic
a39567306b
Merge PR #1071
...
# Conflicts:
# docs/parity-checklist.md
2026-10-13 11:01:52 +07:00
bflatastic
14b111f6f5
Merge PR #1344
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-13 11:01:49 +07:00
bflatastic
d3d55e8327
Merge PR #1413
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:01:48 +07:00