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 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 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
|
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
|
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
|
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
|
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
|
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
|
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 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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
6508be38f6
|
Merge PR #704 from NikitkaRa: Undo: cap the history by memory as well as by steps
# Conflicts:
# crates/engine/src/tests.rs
|
2026-10-14 13:09:10 -04:00 |
|
Brandon Thomas
|
a567c328cd
|
Merge PR #681 from NikitkaRa: Export: image exports keep the whole slide; partial failures say what was written
# Conflicts:
# crates/engine/src/tests.rs
|
2026-10-14 13:09:07 -04:00 |
|
Brandon Thomas
|
a5ce62fe28
|
Merge PR #672 from NikitkaRa: Review: previous and next comment
|
2026-10-14 13:09:06 -04:00 |
|
Brandon Thomas
|
9eed1b4532
|
Merge PR #641 from NikitkaRa: UI: Size and Position dialog sets geometry in one step
|
2026-10-14 13:09:03 -04:00 |
|
Brandon Thomas
|
a87f84526f
|
Merge PR #625 from NikitkaRa: Insert: a gallery of Lucide icons as stroked shapes
|
2026-10-14 13:09:01 -04:00 |
|
Brandon Thomas
|
8080e5a285
|
Merge PR #620 from NikitkaRa: Animations: check effect options and accept direction words
|
2026-10-14 13:09:01 -04:00 |
|
Brandon Thomas
|
15b9ae0267
|
Merge PR #578 from NikitkaRa: PPTX: round-trip 3-D models and animation bounce end
|
2026-10-14 13:08:56 -04:00 |
|
Brandon Thomas
|
2bd01910dc
|
Merge PR #558 from NikitkaRa: Edit: Paste Special (destination theme, keep source, picture, text only)
# Conflicts:
# crates/engine/src/tests.rs
|
2026-10-14 13:08:54 -04:00 |
|
Brandon Thomas
|
4dea355f02
|
Merge PR #554 from NikitkaRa: Pptx: round-trip comments, links, shows, groups and inherited placeholders
|
2026-10-14 13:08:53 -04:00 |
|
Brandon Thomas
|
6e294a0eaa
|
Merge PR #553 from NikitkaRa: Text: Bullets and Numbering dialog
# Conflicts:
# crates/engine/src/tests.rs
|
2026-10-14 13:08:53 -04:00 |
|
Brandon Thomas
|
e171e47a81
|
Merge PR #551 from NikitkaRa: Animations: add 34 PowerPoint motion path presets
# Conflicts:
# crates/engine/src/tests.rs
|
2026-10-14 13:08:52 -04:00 |
|
Brandon Thomas
|
a67b005ae5
|
Merge PR #550 from NikitkaRa: Pictures: Remove Background with a classical matte
|
2026-10-14 13:08:52 -04:00 |
|