Jason Baldwin
a89daef74a
Merge slideshow-titles into slideshow-templates (origin/main: batch 32; toast clear of the slideshow controls)
2026-10-13 06:55:03 +02:00
Jason Baldwin
fd685e7680
Merge slideshow-overlays into slideshow-titles (origin/main: batch 32; toast clear of the slideshow controls)
2026-10-13 06:55:02 +02:00
Jason Baldwin
38d53ccaee
Merge slideshow-composer into slideshow-overlays (origin/main: batch 32; toast clear of the slideshow controls)
2026-10-13 06:55:02 +02:00
Jason Baldwin
2faee15203
Merge slideshow-playback into slideshow-composer (origin/main: batch 32; toast clear of the slideshow controls)
2026-10-13 06:55:02 +02:00
Jason Baldwin
5c41859778
Merge remote-tracking branch 'origin/main' into slideshow-playback
2026-10-13 06:53:37 +02:00
sanyamsingh001 and Codex
056b0f7a28
LR-MASK-OBJECTS: open the configured model folder and preserve retry
...
Open the configured SAM directory itself and preserve the pending mask
action and existing files when folder creation or the opener fails.
Run the Linux desktop opener in a background task and deliver failures
to the UI for retry. Directory creation remains synchronous.
Cover configured paths, creation and opener failures, retry state and
worker completion.
Partially addresses #366 ; model download hosting remains unresolved.
Credit: sanyamsingh001
Co-authored-by: Codex <codex@openai.com >
2026-10-13 04:22:23 +00: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
bflatastic
ecf1236b7c
Merge PR #1150
...
# Conflicts:
# docs/whats-new.md
2026-10-13 11:01:46 +07:00
bflatastic
f28b9c46d3
Merge PR #1051
...
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/gaps.md
# docs/parity-checklist.md
2026-10-13 11:01:45 +07:00
bflatastic
6aabe43386
Merge PR #1023
...
# Conflicts:
# ROADMAP.md
# crates/pipeline/src/spots.rs
# docs/gaps.md
# docs/parity-checklist.md
2026-10-13 11:01:44 +07:00
bflatastic
b9b6bf57de
Merge PR #1020
...
# Conflicts:
# docs/parity-checklist.md
2026-10-13 11:01:43 +07:00
bflatastic
64b3361125
Merge PR #1340
...
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-13 11:01:42 +07:00
bflatastic
44684b7950
Merge PR #1288
...
# Conflicts:
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
2026-10-13 11:01:41 +07:00
bflatastic
61c3042efe
Merge PR #1280
...
# Conflicts:
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
2026-10-13 11:01:40 +07:00
bflatastic
2fc2419fa1
Merge PR #1193
...
# Conflicts:
# docs/parity-checklist.md
2026-10-13 11:01:37 +07:00
bflatastic
5cec4d0720
Merge PR #992
2026-10-13 11:01:10 +07:00
bflatastic
1543fef701
Merge PR #1268
2026-10-13 11:01:01 +07:00
bflatastic
ac19325c57
Merge PR #978
2026-10-13 11:01:01 +07:00
bflatastic
b56f052a59
Merge PR #1387
2026-10-13 11:00:58 +07:00
bflatastic
b2a5997e55
Merge PR #1412
2026-10-13 11:00:53 +07:00
bflatastic
43799cc903
Merge PR #1296
2026-10-13 11:00:48 +07:00
bflatastic
a6369c4009
Merge PR #1264
2026-10-13 11:00:47 +07:00
Jason Baldwin