Brandon Thomas
|
1e80cd5547
|
Merge PR #440 from NikitkaRa: Palette: skip commands that need a value
# Conflicts:
# crates/ui-egui/src/menus.rs
|
2026-10-14 14:01:08 -04:00 |
|
Brandon Thomas
|
b3c9cc099c
|
Merge the PPTX writer, notes/handout master, PDF and slide-show PRs integrated on land-r3 (#518 #531 #535 #533 #572 #573 #577 #580 #583 #592 #685 #528 #483 #490 #441 #671 #679 #649 #656 #660 #664 #224)
# Conflicts:
# crates/engine/src/tests.rs
# crates/model/src/lib.rs
# crates/pptx/src/write/mod.rs
# crates/render/src/lib.rs
# crates/ui-egui/src/canvas.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/thumbs.rs
|
2026-10-14 13:56:41 -04:00 |
|
Brandon Thomas
|
126029db40
|
Merge PR #254 from xmaks82: Text: honour spcFirstLastPara (space before the first paragraph)
# Conflicts:
# crates/pptx/src/read/dml.rs
# crates/text/src/lib.rs
# crates/text/src/tests.rs
|
2026-10-14 13:55:43 -04:00 |
|
Brandon Thomas
|
912598fa46
|
Merge PR #675 from NikitkaRa: View: Zoom dialog applies a percent or Fit
# Conflicts:
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:54:33 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
5c7e9fc6c3
|
Format the merged PRs (cargo fmt)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:53:13 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
f9c1000e35
|
Fix up merged PRs: rustfmt; drop doc rows the union merge left twice
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:51:53 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
0ac222a543
|
Fix up merged PRs: split ribbon buttons carry their label once (#512's label predates main's)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:51:49 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
6902c4bf92
|
Fix up merged PRs: every presenter-view button uses the light-on-dark style (#221)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:50:27 -04:00 |
|
Brandon Thomas
|
d2bf428362
|
Merge PR #224 from justinjohn0306: Notes and Presenter View: long notes scroll, presenter controls show (#221)
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:50:20 -04:00 |
|
Brandon Thomas
|
bc62c58b17
|
Merge PR #664 from NikitkaRa: Show: show the slide number while typing it
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:49:49 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
b61cf33836
|
Fix up merged PRs: custom-show links carry 'returns'; prefetch follows the show's own order
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:49:36 -04:00 |
|
Brandon Thomas
|
e74015490b
|
Merge PR #660 from NikitkaRa: Show: play a custom show
# Conflicts:
# crates/anim/src/show.rs
# crates/engine/src/cmd/review.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/show.rs
|
2026-10-14 13:49:10 -04:00 |
|
Brandon Thomas
|
3e89fbbaa6
|
Merge PR #656 from NikitkaRa: Presenter view: pause and reset the timer, and notes size
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:48:31 -04:00 |
|
Brandon Thomas
|
6c605be582
|
Merge PR #649 from NikitkaRa: Show: See All Slides and zoom
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:47:54 -04:00 |
|
Brandon Thomas
|
d6d7e91c47
|
Merge PR #679 from NikitkaRa: Show: Show Media Controls hides the playback bar
# Conflicts:
# crates/engine/src/cmd/review.rs
# crates/ui-egui/src/show.rs
|
2026-10-14 13:46:55 -04:00 |
|
Brandon Thomas
|
d3ebe57a02
|
Merge PR #671 from NikitkaRa: Show: a first animation set to With/After Previous plays when the slide appears
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:46:32 -04:00 |
|
Brandon Thomas
|
ee991563c9
|
Merge PR #441 from NikitkaRa: Show: a laser pointer that leaves no ink
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:45:58 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
0a470c3b1f
|
Fix up merged PRs: prefetch GIF check passes the document uid
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:45:41 -04:00 |
|
Brandon Thomas
|
23ac41f191
|
Merge PR #490 from NikitkaRa: Show: render the next slide in the background while the current one rests (#240)
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:45:21 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
7d87b6e668
|
Fix up merged PRs: transition sounds and media cues pass the document uid
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:45:01 -04:00 |
|
Brandon Thomas
|
0ed74b684a
|
Merge the SmartArt and dialog PRs integrated on land-r1 (#596 #601 #606 #610 #613 #617 #621 #623 #627 #634 #557 #689 #668)
# Conflicts:
# crates/engine/src/tests.rs
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:44:43 -04:00 |
|
Brandon Thomas
|
8d429a23e9
|
Merge PR #483 from NikitkaRa: Media: keep playback with the document and the clip (#415)
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:44:40 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
0376c0b0e1
|
Fix up merged PRs: one parity summary, one dialogs gap entry, no duplicated architecture rows
Recomputed docs/parity-checklist.md's summary with cargo xtask parity.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:41:30 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
2f6629c4cb
|
Fix up merged PRs: theme browsing's importer sets vml_previews (#530 after #209-era field)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:37:42 -04:00 |
|
Brandon Thomas
|
5b017f4590
|
Merge PR #682 from NikitkaRa: UI: Alt Text's decorative checkbox follows the selection
# Conflicts:
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:36:55 -04:00 |
|
Brandon Thomas
|
f52bcfa1c8
|
Merge PR #530 from NikitkaRa: Design: Browse for Themes from a .thmx, .pptx or .potx file
# Conflicts:
# crates/ui-egui/src/lib.rs
|
2026-10-14 13:36:45 -04:00 |
|
Brandon Thomas
|
d00b01b5a1
|
Merge PR #540 from NikitkaRa: Table: borders, cell margins and cell text alignment
# Conflicts:
# crates/engine/src/cmd/table.rs
# crates/engine/src/tests.rs
|
2026-10-14 13:36:34 -04:00 |
|
Brandon Thomas
|
9ed995d8d8
|
Merge PR #699 from NikitkaRa: Media: damaged MP4 sample tables no longer abort the app
# Conflicts:
# ATTRIBUTION.md
# crates/media/src/audio.rs
# crates/media/src/probe.rs
# crates/media/tests/decode.rs
|
2026-10-14 13:35:26 -04:00 |
|
Brandon Thomas
|
0f3495e55d
|
Merge PR #512 from NikitkaRa: Home: Replace Fonts dialog and font.replace command
# Conflicts:
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/ribbon.rs
|
2026-10-14 13:34:06 -04:00 |
|
Brandon Thomas
|
62fe8571f6
|
Merge PR #687 from NikitkaRa: UI: Create New Theme Fonts dialog edits the theme in one step
# Conflicts:
# crates/engine/src/cmd/design.rs
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:33:36 -04:00 |
|
Brandon Thomas
|
9b8871c86b
|
Merge PR #528 from NikitkaRa: Format: bound total embedded media when opening a .deckcraft
# Conflicts:
# crates/format/src/lib.rs
|
2026-10-14 13:31:49 -04:00 |
|
Brandon Thomas
|
7f9b508296
|
Merge PR #685 from NikitkaRa: PPTX: keep the notes master's own placeholders and colour map on save
# Conflicts:
# crates/pptx/src/write/mod.rs
# crates/pptx/tests/roundtrip.rs
|
2026-10-14 13:31:17 -04:00 |
|
Brandon Thomas
|
76bfc19dfa
|
Merge PR #592 from NikitkaRa: Notes Page view draws master text wrapped (stacked on #583)
|
2026-10-14 13:30:54 -04:00 |
|
Brandon Thomas
|
4cd6412a3c
|
Merge PR #583 from NikitkaRa: PDF master header/footer text wraps and keeps mixed formatting (stacked on #580)
# Conflicts:
# crates/render/src/lib.rs
# crates/render/src/placed.rs
|
2026-10-14 13:30:43 -04:00 |
|
Brandon Thomas
|
18be662a2a
|
Merge PR #668 from NikitkaRa: UI: Date and Time dialog inserts a format in one step
# Conflicts:
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:30:31 -04:00 |
|
Brandon Thomas
|
6f634a9809
|
Merge PR #580 from NikitkaRa: Notes Master slide preview; master header/footer text keeps its formatting (stacked on #577)
|
2026-10-14 13:30:28 -04:00 |
|
Brandon Thomas
|
2d8014c706
|
Merge PR #577 from NikitkaRa: Notes pages and PDF handouts follow their masters (stacked on #573)
# Conflicts:
# crates/pdf/src/lib.rs
# crates/pdf/src/tests.rs
|
2026-10-14 13:30:22 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
4653cb4e18
|
Fix up merged PRs: Hyperlink dialog tests fill main's new sound fields
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:30:15 -04:00 |
|
Brandon Thomas
|
e0ec02d62c
|
Merge PR #689 from NikitkaRa: UI: Hyperlink dialog follows the selection
# Conflicts:
# crates/engine/src/cmd/insert.rs
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:30:10 -04:00 |
|
Brandon Thomas
|
63c32b89b8
|
Merge PR #573 from NikitkaRa: Add the Notes Master view (stacked on #572 / #533)
# Conflicts:
# crates/pptx/src/write/mod.rs
|
2026-10-14 13:29:52 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
4c1357b2e6
|
Fix up merged PRs: shape.action fills main's new Hyperlink sound fields and CustomShow returns
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:29:52 -04:00 |
|
Brandon Thomas
|
f685deef57
|
Merge PR #557 from NikitkaRa: Insert: Action Settings dialog and shape.action
# Conflicts:
# crates/engine/src/tests.rs
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:29:43 -04:00 |
|
Brandon Thomas
|
875df7674c
|
Merge PR #572 from NikitkaRa: Add the Handout Master view (stacked on #533)
# Conflicts:
# crates/engine/src/tests.rs
|
2026-10-14 13:29:33 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
47cf76f32c
|
Fix up merged PRs: handout master csld takes tags; corpus test hyperlink gains sound fields
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:29:27 -04:00 |
|
Brandon Thomas
|
085ba98d47
|
Merge PR #533 from NikitkaRa: Pptx: round-trip tables, charts, animation, media, sections and masters
# Conflicts:
# crates/pptx/src/write/mod.rs
|
2026-10-14 13:29:06 -04:00 |
|
Brandon Thomas
|
5fd7984088
|
Merge PR #634 from NikitkaRa: SmartArt: layout gallery thumbnails and hover preview
|
2026-10-14 13:29:01 -04:00 |
|
Brandon Thomas
|
fd1b62bded
|
Merge PR #627 from NikitkaRa: SmartArt: Convert to SmartArt gallery on Home; Convert to Text keeps the text size
|
2026-10-14 13:29:01 -04:00 |
|
Brandon Thomas
|
510fb4b0b7
|
Merge PR #623 from NikitkaRa: SmartArt: Name and Title org chart, closer Half Circle, ten more layouts, convert to/from text and shapes
|
2026-10-14 13:29:01 -04:00 |
|
Brandon Thomas
|
aa56910de8
|
Merge PR #621 from NikitkaRa: SmartArt: organisation charts with assistants, segmented/multidirectional cycles, cycle matrix, segmented pyramid, pie
|
2026-10-14 13:29:01 -04:00 |
|
Brandon Thomas
|
981b09da83
|
Merge PR #617 from NikitkaRa: SmartArt: six more layouts, clear Venn labels, read back older Picture Accent Process files
|
2026-10-14 13:29:01 -04:00 |
|