 Jason Baldwin
|
bc9d8a21b5
|
Merge slideshow-templates into slideshow-export (origin/main: batches 32–33)
|
2026-10-13 17:03:26 +02:00 |
|
|
Jason Baldwin
|
d747c9e0f6
|
Merge slideshow-titles into slideshow-templates (origin/main: batches 32–33)
|
2026-10-13 17:01:24 +02:00 |
|
|
Jason Baldwin
|
f30e4af838
|
Merge slideshow-overlays into slideshow-titles (origin/main: batches 32–33)
|
2026-10-13 16:59:34 +02:00 |
|
|
Jason Baldwin
|
ba9262a4a0
|
Merge slideshow-composer into slideshow-overlays (origin/main: batches 32–33)
|
2026-10-13 16:57:38 +02:00 |
|
|
Jason Baldwin
|
a021ad2c56
|
Merge slideshow-playback into slideshow-composer (origin/main: batches 32–33)
|
2026-10-13 16:55:11 +02:00 |
|
|
Jason Baldwin
|
09ea6a3f77
|
Merge origin/main into slideshow-playback (painted toast from batch 33, kept at the top during a slideshow; both Slot variants; tracker rows)
|
2026-10-13 16:52:50 +02:00 |
|
|
Brandon Thomas
|
b3d392b499
|
Merge pull request #1438 from storytold/claude/integrate-batch-32
Integration batch 32-2: 7 reviewed contributor PRs
|
2026-10-13 02:18:34 -04:00 |
|
|
Brandon ThomasandClaude Opus 5.5
|
ae9b09d3c2
|
Batch 32: rustfmt after merges
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-13 02:07:07 -04:00 |
|
|
Brandon Thomas
|
c94ebae470
|
Merge PR #1185
|
2026-10-13 02:06:07 -04:00 |
|
|
Brandon Thomas
|
4ee6a4888b
|
Merge PR #1126
|
2026-10-13 02:05:14 -04:00 |
|
|
Brandon Thomas
|
68bacba288
|
Merge PR #1113
|
2026-10-13 02:04:31 -04:00 |
|
|
Brandon Thomas
|
8a640dc70b
|
Merge PR #1077
|
2026-10-13 02:04:06 -04:00 |
|
|
Brandon Thomas
|
478f20054b
|
Merge PR #1056
|
2026-10-13 02:02:17 -04:00 |
|
|
Brandon Thomas
|
d8f10a1ef7
|
Merge PR #919
|
2026-10-13 02:01:30 -04:00 |
|
|
Brandon Thomas
|
643bc7f909
|
Merge PR #850
|
2026-10-13 01:57:40 -04:00 |
|
|
BFlat
|
68c924047d
|
Merge pull request #1431: integration batch 33 (85 reviewed contributor PRs)
Integration batch 33: main green again, 85 reviewed contributor PRs
|
2026-10-13 12:16:54 +07:00 |
|
|
bflatastic
|
2397927681
|
Merge main (batch 32a landed)
# Conflicts:
# apps/lightcraft-cli/src/main.rs
# crates/codecs/src/lib.rs
# crates/mcp/src/headless.rs
|
2026-10-13 12:09:34 +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 |
|
|
Jason Baldwin
|
3f9bf67eae
|
Merge slideshow-templates into slideshow-export (toast clear of dialog buttons)
|
2026-10-13 07:04:13 +02:00 |
|
|
Jason Baldwin
|
ed5c7d38eb
|
Merge slideshow-titles into slideshow-templates (toast clear of dialog buttons)
|
2026-10-13 07:04:13 +02:00 |
|
|
Jason Baldwin
|
db876a0a3d
|
Merge slideshow-overlays into slideshow-titles (toast clear of dialog buttons)
|
2026-10-13 07:04:13 +02:00 |
|
|
Jason Baldwin
|
75c4b5c920
|
Merge slideshow-composer into slideshow-overlays (toast clear of dialog buttons)
|
2026-10-13 07:04:13 +02:00 |
|
|
Jason Baldwin
|
39de3777fa
|
Merge slideshow-playback into slideshow-composer (toast clear of dialog buttons)
|
2026-10-13 07:04:13 +02:00 |
|
|
Jason Baldwin
|
21b417fe3c
|
LRC-SS-PLAYBACK: the toast also goes to the top while a dialog is open, clear of its buttons
|
2026-10-13 07:04:13 +02:00 |
|
|
Jason Baldwin
|
4ea05a85ae
|
Merge slideshow-templates into slideshow-export (toast clear of the slideshow controls)
|
2026-10-13 06:55:21 +02:00 |
|
|
Jason Baldwin
|
f36020c3cf
|
Merge origin/main into slideshow-export (batch 32: state.rs keeps the SlideshowExport dialog and New Album's include_selected)
|
2026-10-13 06:55:21 +02:00 |
|
|
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
|
6246ea67a4
|
LRC-SS-PLAYBACK: during a slideshow the toast shows at the top, clear of the playback controls (toasts take the pointer since #7ccff3b9)
|
2026-10-13 06:55:01 +02:00 |
|
|
bflatastic
|
7693cbf3ae
|
Revert "Merge PR #1262": the toast as a widget takes the clicks meant for what is under it (a dialog's button)
|
2026-10-13 11:54:39 +07:00 |
|
|
Jason Baldwin
|
5c41859778
|
Merge remote-tracking branch 'origin/main' into slideshow-playback
|
2026-10-13 06:53:37 +02:00 |
|
|
bflatastic
|
2e877ad476
|
Batch 32: arrows over a slider nudge it (#1264), the toast area doesn't fade in (#1262), #1282's test runs on Windows
|
2026-10-13 11:42:47 +07:00 |
|
|
Brandon Thomas
|
b709180587
|
Merge pull request from storytold/claude/integrate-batch-32 (batch 32a)
Integration batch 32a: 8 reviewed contributor PRs
|
2026-10-13 00:27:00 -04:00 |
|
|
bflatastic
|
1d70cf6358
|
Batch 32: the import tool tests date their fixtures (undated files take the file's date, #1216)
|
2026-10-13 11:20:47 +07:00 |
|
|
Brandon ThomasandClaude Opus 5.5
|
2f0931d3ca
|
Batch 32: rustfmt after merges
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-13 00:13:49 -04:00 |
|
|
Brandon Thomas
|
a1035f1372
|
Merge PR #997
|
2026-10-13 00:13:41 -04:00 |
|
|
Brandon Thomas
|
d5b8d52e1d
|
Merge PR #1262
|
2026-10-13 00:13:41 -04:00 |
|
|
Brandon Thomas
|
6568a7ae16
|
Merge PR #1260
|
2026-10-13 00:13:40 -04:00 |
|
|
bflatastic
|
d752076339
|
Batch 32: fixes for PRs merged together (#984 leap-year lint, #1344 ColorData field, #1187 preset panel builds)
|
2026-10-13 11:11:02 +07:00 |
|
|
bflatastic
|
702f90bfc9
|
Batch 32: close the tests two merges added at one place; cargo fmt
|
2026-10-13 11:08:16 +07: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 |
|