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 |
|
Brandon Thomas
|
25eb575146
|
Merge PR #613 from NikitkaRa: SmartArt: node pictures from the data model, Brick Scene camera, four more layouts
|
2026-10-14 13:26:24 -04:00 |
|
Brandon Thomas
|
a19b199efc
|
Merge PR #610 from NikitkaRa: SmartArt: shrink text to fit, picture layouts, 3-D styles and more colours
|
2026-10-14 13:26:24 -04:00 |
|
Brandon Thomas
|
b4ea3b1df8
|
Merge PR #535 from NikitkaRa: PPTX: keep custom XML, the sensitivity label and custom properties
# Conflicts:
# crates/model/src/defaults.rs
# crates/model/src/lib.rs
# crates/pptx/src/read/mod.rs
# crates/pptx/src/write/mod.rs
|
2026-10-14 13:26:22 -04:00 |
|
Brandon Thomas
|
175142f1d3
|
Merge PR #606 from NikitkaRa: SmartArt: 15 layouts, SmartArt Styles and Change Colors
|
2026-10-14 13:26:21 -04:00 |
|
Brandon Thomas
|
eabcf47d09
|
Merge PR #601 from NikitkaRa: SmartArt: write the outline to .pptx as a diagram and read it back from the data model
# Conflicts:
# crates/engine/Cargo.toml
# crates/pptx/src/read/shapes.rs
# crates/pptx/src/write/shapes.rs
|
2026-10-14 13:26:21 -04:00 |
|
Brandon Thomas
|
d534343d6e
|
Merge PR #683 from NikitkaRa: UI: Create New Theme Colors dialog edits the theme in one step
# Conflicts:
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:26:11 -04:00 |
|
Brandon Thomas
|
a205d665b0
|
Merge PR #658 from NikitkaRa: UI: Edit Photo Album reflows the album in one step
|
2026-10-14 13:26:02 -04:00 |
|
Brandon Thomas
|
2834166904
|
Merge PR #647 from NikitkaRa: UI: Photo Album dialog inserts pictures as slides
# Conflicts:
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:26:02 -04:00 |
|
Brandon Thomas
|
55993247b4
|
Merge PR #191 from isaac-levine: Slides: Ctrl+A in the slide pane selects every slide (#188)
# Conflicts:
# crates/engine/src/tests.rs
# crates/ui-egui/src/lib.rs
|
2026-10-14 13:25:57 -04:00 |
|
Brandon Thomas
|
20392c955b
|
Merge PR #531 from NikitkaRa: PPTX: keep add-in tags on the presentation, slides and shapes
# Conflicts:
# crates/pptx/src/read/mod.rs
# crates/pptx/src/write/mod.rs
|
2026-10-14 13:25:50 -04:00 |
|
Brandon Thomas
|
84d60009be
|
Merge PR #596 from NikitkaRa: SmartArt: Text Pane, add and remove shapes, promote and demote
# Conflicts:
# crates/engine/src/tests.rs
# crates/ui-egui/src/panes.rs
|
2026-10-14 13:25:39 -04:00 |
|
Brandon Thomas
|
8da7862348
|
Merge PR #651 from NikitkaRa: Text: shrink on overflow gives up at once when even 10% overflows
# Conflicts:
# crates/text/src/lib.rs
# crates/text/src/tests.rs
|
2026-10-14 13:25:33 -04:00 |
|
Brandon Thomas
|
5a3bc1e294
|
Merge PR #532 from NikitkaRa: PPTX: read Office 2016 charts (waterfall, funnel, treemap…) and keep them
|
2026-10-14 13:25:05 -04:00 |
|
Brandon Thomas
|
534925bdf1
|
Merge PR #547 from NikitkaRa: Pictures: Recolor gallery and Set Transparent Color
# Conflicts:
# crates/engine/src/cmd/mod.rs
# crates/engine/src/tests.rs
# crates/ui-egui/src/ribbon.rs
|
2026-10-14 13:23:51 -04:00 |
|
Brandon Thomas
|
d0fb793954
|
Merge PR #545 from NikitkaRa: Pictures: Picture Styles gallery and Picture Border
# Conflicts:
# crates/engine/src/cmd/mod.rs
# crates/engine/src/tests.rs
|
2026-10-14 13:23:36 -04:00 |
|
Brandon Thomas
|
6af2b0ee21
|
Merge PR #618 from NikitkaRa: Text: underline an IME composition in a table cell
# Conflicts:
# crates/render/src/lib.rs
|
2026-10-14 13:23:32 -04:00 |
|
Brandon Thomas
|
3bfaeffa6c
|
Merge PR #695 from NikitkaRa: Outline: lay out only the slides in view
# Conflicts:
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/sorter.rs
|
2026-10-14 13:23:25 -04:00 |
|
Brandon Thomas
|
058890ed87
|
Merge PR #518 from NikitkaRa: Pictures: Artistic Effects — apply, change, remove and keep in PPTX
# Conflicts:
# crates/engine/src/cmd/mod.rs
# crates/engine/src/tests.rs
# crates/pptx/src/write/dml.rs
|
2026-10-14 13:23:07 -04:00 |
|
Brandon Thomas
|
d4d352622a
|
Merge PR #665 from NikitkaRa: Format: repair degenerate slide sizes on load
# Conflicts:
# crates/ui-egui/src/lib.rs
|
2026-10-14 13:22:57 -04:00 |
|
Brandon Thomas
|
1ac61262eb
|
Merge PR #495 from NikitkaRa: Animation Pane: advanced timeline with draggable bars
# Conflicts:
# crates/ui-egui/src/lib.rs
|
2026-10-14 13:22:52 -04:00 |
|
Brandon Thomas
|
72238c1b6e
|
Merge PR #678 from NikitkaRa: Merge Shapes: text merges as its letters, so a picture can fill them
# Conflicts:
# crates/render/src/lib.rs
|
2026-10-14 13:22:48 -04:00 |
|
Brandon Thomas
|
5c0630cba3
|
Merge PR #586 from NikitkaRa: UI: sections in the Slide Sorter
# Conflicts:
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/sorter.rs
|
2026-10-14 13:21:53 -04:00 |
|
Brandon Thomas
|
0f7dc3d336
|
Merge PR #593 from NikitkaRa: File: six original starter decks
# Conflicts:
# crates/engine/src/lib.rs
|
2026-10-14 13:21:23 -04:00 |
|
Brandon Thomas
|
32a2d9e6bd
|
Merge PR #560 from NikitkaRa: UI: View › New Window opens a second window
# Conflicts:
# crates/ui-egui/src/lib.rs
|
2026-10-14 13:21:19 -04:00 |
|
Brandon Thomas
|
ab3b1defbf
|
Merge PR #140 from alexanderalber: Slide show: media set to play in the click sequence starts on Next (#116)
# Conflicts:
# crates/anim/src/tests.rs
# crates/ui-egui/src/show.rs
|
2026-10-14 13:20:15 -04:00 |
|
Brandon Thomas
|
e80316eb76
|
Merge PR #85 from MarekSpodBiedry: Comments: browser-created comments and replies get a creation timestamp (#72)
# Conflicts:
# crates/engine/Cargo.toml
# crates/engine/src/cmd/review.rs
|
2026-10-14 13:19:07 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
edaef792e0
|
Fix up merged PRs: Edit Points hits select their shape on right click; Hyperlink sound fields in #713's tests
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:11:36 -04:00 |
|
Brandon Thomas
|
8a56ce8340
|
Merge PR #705 from NikitkaRa: PPTX: write Color Pulse emphasis as a colour change, not a scale
# Conflicts:
# crates/pptx/tests/roundtrip.rs
|
2026-10-14 13:09:10 -04:00 |
|