Brandon Thomas
1495575c19
Merge PR #589
2026-10-14 22:05:10 -04:00
Brandon Thomas
54400d8d91
Merge PR #584
2026-10-14 22:05:10 -04:00
Brandon Thomas
b379a5f0a5
Merge PR #577
2026-10-14 22:05:10 -04:00
Brandon Thomas
7a9570b56e
Merge PR #570
2026-10-14 22:05:10 -04:00
Brandon Thomas
0c3e140be3
Merge PR #567
2026-10-14 22:05:10 -04:00
Brandon Thomas
71cf3671f1
Merge PR #565
2026-10-14 22:05:10 -04:00
Brandon Thomas
f268e17986
Merge PR #559
2026-10-14 22:05:10 -04:00
Brandon Thomas
3921c71e65
Merge PR #548
2026-10-14 22:05:10 -04:00
Brandon Thomas
f49716fc9c
Merge PR #509
2026-10-14 22:05:10 -04:00
Brandon Thomas
bfe0cfe6e8
Merge PR #504
2026-10-14 22:05:10 -04:00
Brandon Thomas
a9038cf262
Merge PR #497
2026-10-14 22:05:10 -04:00
Brandon Thomas
dd8c9c5783
Merge PR #495
2026-10-14 22:05:10 -04:00
Brandon Thomas
e0d1ed5f52
Merge PR #491
2026-10-14 22:05:10 -04:00
skylar taylor-barrick
694e662547
fix(pdf): reconcile shared writer with main (PDFW)
...
Preserve the shared writer migration while incorporating the pinned main
changes and resolving the roadmap entry.
PR #875 .
2026-10-14 18:18:19 -06:00
Brandon Thomas and Claude Opus 5.5
d07cbbe94c
Merge PR #859 (with main's 255-click limit kept inside its event budget)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 12:58:52 -04:00
Brandon Thomas
0df9238c73
Merge PR #850
2026-10-14 12:56:09 -04:00
Brandon Thomas and Claude Opus 5.5
23ac4ce3f1
fix: integrate batched community PRs ( #845 's Find scope test uses the Page tool's double-click from #862 )
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 12:51:12 -04:00
Brandon Thomas
4f193834bd
Merge PR #870 (with #869 )
2026-10-14 12:40:07 -04:00
Brandon Thomas
50a6b60072
Merge PR #868
2026-10-14 12:39:59 -04:00
Brandon Thomas
c8a8a1868d
Merge PR #867
2026-10-14 12:39:59 -04:00
Brandon Thomas
b8d975b094
Merge PR #866
2026-10-14 12:39:59 -04:00
Brandon Thomas
23aeddb354
Merge PR #864
2026-10-14 12:39:58 -04:00
Brandon Thomas
c1a1970168
Merge PR #862
2026-10-14 12:39:58 -04:00
Brandon Thomas
a6e7e2a0c7
Merge PR #838
2026-10-14 12:39:58 -04:00
Brandon Thomas
e8a3cda237
Merge PR #836
2026-10-14 12:39:58 -04:00
Brandon Thomas
d67fb28456
Merge PR #840
2026-10-14 12:39:58 -04:00
Brandon Thomas
6ceb57d4f5
Merge PR #845
2026-10-14 12:39:58 -04:00
Brandon Thomas
24e86db864
Merge PR #855
2026-10-14 12:39:58 -04:00
Claude
23105a6df9
Merge upstream main (0.8.0) into small-frame-wrap
...
Conflict: crates/compose/src/tests.rs, both sides added tests at the same place (upstream's #83 Jump Object tests, our tombstone tests); kept both.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01CgGsJkVe5GYG9qK6VFdECa
2026-10-14 15:50:20 +00:00
sanyamsingh001 and Codex
44485e08da
Merge tested main 0f4f382b0e into PR #845
...
Preserve the reviewed PR behavior and tested upstream base.
Co-Authored-By: Codex <codex@openai.com >
2026-10-14 19:33:57 +10:00
moppeeer and Claude Opus 5.5
23e1680e7d
feat(ui): Swatches panel header like InDesign's; swatches go to the fill or stroke in front
...
LYH Studio episode 6 colours the "1969" headline (8:28) and the loop's
stroke (9:15) from the Swatches panel, whose header holds InDesign's
Fill/Stroke proxy, Formatting Affects Container/Text and the Tint field.
- Header: a Fill/Stroke proxy showing the colours of what colour edits
apply to (panels::color_target; a click brings the other to the front,
as X does), the container/text buttons (app.formattingAffectsText) and
the tint of the colour in front.
- The Tint field sends only the tint, so each selected object (or run of
text) keeps its own swatch: object.fill takes a tint without a swatch,
and a stroke tint alone doesn't give a stroke-less object a stroke.
- Clicking a swatch applies it to the fill or stroke in front
(panels::apply_swatch, to the text when colours affect text); that row
is highlighted.
- Bottom row: New Color Group, New Swatch, Delete Swatch (the swatch last
clicked). Rows and the proxy are named for accessibility (and tests).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 10:27:38 +02:00
aiongg
1758642a96
Integration: #870 the page menu always offers Delete Page for the clicked page, Delete Spread separately for multi-page spreads
...
(cherry picked from commit 9912a386a8
2026-10-14 09:43:18 +02:00
moppeeer
02ddeb86da
Merge branch 'codex/pages-panel-duplicate' into codex/pages-panel-menu
2026-10-14 09:43:10 +02:00
aiongg
f4efb7cc5c
Integration: #869 Alt-drag copies a page in one command and one undo step (layout.pages.duplicateSpread takes to)
...
(cherry picked from commit 7889b25a37
2026-10-14 09:43:06 +02:00
moppeeer
15fccae6b8
Merge remote-tracking branch 'origin/main' into codex/pages-panel-duplicate
...
# Conflicts:
# crates/engine/src/tests.rs
2026-10-14 09:39:45 +02:00
moppeeer
2a9e29f6ff
Merge branch 'codex/page-tool-control-panel' into codex/liquid-object-pins
...
# Conflicts:
# crates/engine/src/tests.rs
2026-10-14 09:39:24 +02:00
moppeeer
70a50e70b9
Merge branch 'codex/page-tool-control-panel' into codex/liquid-layout-panel
2026-10-14 09:38:32 +02:00
aiongg
7d601b5903
Integration: #864 drops the Controlled by Parent rule from the menus and the Objects Move with Page checkbox (neither has an effect yet)
...
(cherry picked from commit 47b51d6377
2026-10-14 09:38:25 +02:00
moppeeer
3f1eb00bb3
Merge branch 'codex/page-tool' into codex/page-tool-control-panel
...
# Conflicts:
# crates/engine/src/tests.rs
2026-10-14 09:38:16 +02:00
moppeeer
65dbf3c3a2
Merge remote-tracking branch 'origin/main' into codex/page-tool
...
# Conflicts:
# crates/engine/src/tests.rs
2026-10-14 09:37:32 +02:00
aiongg
87682c3674
Integration: #836 a grey stop beside a CMYK stop exports as the K ink, keeping the PDF shading in DeviceCMYK
...
(cherry picked from commit f28456d9d3
2026-10-14 09:18:00 +02:00
moppeeer
16d8027d89
Merge remote-tracking branch 'origin/main' into codex/page-tool-liquid-guides
2026-10-14 09:13:24 +02:00
moppeeer
25dadce9c8
Merge remote-tracking branch 'origin/main' into codex/fitting-shortcuts
2026-10-14 09:13:08 +02:00
moppeeer
ed6bcae877
Merge remote-tracking branch 'origin/main' into codex/gradient-cmyk-blend
2026-10-14 09:12:51 +02:00
skylar taylor-barrick
c68cb357e9
fix(pdf): preserve writer integration with main (PDFW)
...
Retain the PDF writer adoption and upstream text-threading changes. Keep both roadmap entries and use the accepted-socket fixture comment from main.
2026-10-14 00:18:33 -06:00
Brandon Thomas
43a46c04bf
Merge PR #843
2026-10-14 01:54:43 -04:00
Brandon Thomas
80663cccfd
Merge PR #846
2026-10-14 01:54:43 -04:00
Brandon Thomas
b30b67dae3
Merge PR #834
2026-10-14 01:54:42 -04:00
Brandon Thomas
0421455b22
Merge PR #854
2026-10-14 01:54:41 -04:00
Brandon Thomas
9dc2068580
Merge PR #857
2026-10-14 01:54:41 -04:00
Brandon Thomas