bflatastic
9f935718fe
Merge branch 'rb-578' into batch/t6
...
# Conflicts:
# crates/text/src/fontdb_tests.rs
2026-10-16 02:37:43 +07:00
bflatastic
1c863aa9f5
Merge branch 'rb-568' into batch/t6
2026-10-16 02:36:56 +07:00
bflatastic
891f0acb3c
Merge branch 'rb-560' into batch/t6
2026-10-16 02:36:56 +07:00
bflatastic
55c05338a1
Merge branch 'rb-554' into batch/t6
2026-10-16 02:36:55 +07:00
bflatastic
4e3fd82bd1
Merge branch 'rb-549' into batch/t6
2026-10-16 02:36:55 +07:00
bflatastic
41b08a2393
Merge branch 'rb-528' into batch/t6
2026-10-16 02:36:54 +07:00
bflatastic
730e377418
Merge branch 'rb-487' into batch/t6
2026-10-16 02:36:53 +07:00
bflatastic
175fdfa428
Merge remote-tracking branch 'origin/main' into rb-478
...
# Conflicts:
# crates/ui-egui/src/idle_tests.rs
# crates/ui-egui/src/lib.rs
2026-10-16 02:36:34 +07:00
bflatastic
d60a27b675
Merge main into #554 : one id map for the copy, and #562 's flows, prototype and guides follow it
...
page.duplicate copies every layer with duplicate_all_into (navigation between
copied frames points at the copies) and builds the old-to-new list for flows
from that copy, instead of copying each layer separately.
2026-10-16 02:34:54 +07:00
bflatastic
fd6a7e0ba3
Merge main into #549 : keep #539 's whole URL and add the empty-URL arm
2026-10-16 02:33:05 +07:00
bflatastic
db8bf6ba33
Merge main into #560 ; normalise the replacement where findReplace reads it
...
Main's case-insensitive replace loop (from an earlier PR) took the place of the
loop this change edited, so the replacement text is normalised once, where
the parameter is read.
2026-10-16 02:31:34 +07:00
bflatastic
0a84dee777
Merge remote-tracking branch 'origin/main' into rb-578
...
# Conflicts:
# crates/text/src/fontdb.rs
# crates/text/src/fontdb_tests.rs
2026-10-16 02:27:50 +07:00
bflatastic
46316c9895
Merge remote-tracking branch 'origin/main' into rb-568
...
# Conflicts:
# ROADMAP.md
# crates/text/src/fontdb_tests.rs
2026-10-16 02:26:29 +07:00
bflatastic
0e1ccb55d2
Merge remote-tracking branch 'origin/main' into rb-487
...
# Conflicts:
# crates/doc/src/tests.rs
2026-10-16 02:25:11 +07:00
bflatastic
ec8a506353
Merge remote-tracking branch 'origin/main' into rb-528
2026-10-16 02:23:46 +07:00
BFlat
eb741a362d
Community batch 5: #312 's sturdier zoom-preview test; record four rebased heads ( #588 )
...
Lands #312 's test-only follow-up commit and records #326 , #317 and #306 's rebased heads (no content change) so they show as merged.
2026-10-16 02:23:45 +07:00
BFlat
97e422226f
Merge pull request #591 from storytold/community/batch-5
...
Community batch 5: 59 reviewed PRs (#482 and up)
2026-10-16 02:15:47 +07:00
BFlat
8ba09001cd
M0.9: a control line that isn't JSON ends the connection ( #589 )
...
The control server answered a line that wasn't JSON with an error and read
on. A web page can make the browser send an HTTP request to the loopback
port; its request and header lines were skipped that way and the JSON lines
of its body ran as commands. The first line that isn't JSON now closes the
connection before anything after it is read. Clients that send JSON lines
(MCP --attach, scripts) are unaffected.
2026-10-16 02:15:18 +07:00
bflatastic
ecad646330
Merge branch 'pr-584' into batch/t5
2026-10-16 01:36:24 +07:00
bflatastic
87cb799783
Merge branch 'pr-583' into batch/t5
...
# Conflicts:
# docs/ui-parity.md
2026-10-16 01:36:24 +07:00
bflatastic
466fd249fe
Merge branch 'pr-579' into batch/t5
...
# Conflicts:
# docs/ui-parity.md
2026-10-16 01:36:18 +07:00
bflatastic
a4ba67ac22
Merge branch 'pr-577' into batch/t5
2026-10-16 01:36:13 +07:00
bflatastic
99b6495b7d
Merge branch 'pr-576' into batch/t5
2026-10-16 01:36:12 +07:00
bflatastic
6eb9f38487
Merge branch 'pr-566' into batch/t5
2026-10-16 01:36:12 +07:00
bflatastic
bf4d9e0f6f
Merge branch 'pr-565' into batch/t5
2026-10-16 01:36:11 +07:00
bflatastic
9418e2c8bb
Merge branch 'pr-564' into batch/t5
2026-10-16 01:36:10 +07:00
bflatastic
c4c88900c4
Merge branch 'pr-563' into batch/t5
2026-10-16 01:36:10 +07:00
bflatastic
aadaa2d975
Merge branch 'pr-562' into batch/t5
2026-10-16 01:36:09 +07:00
bflatastic
580eee3572
Merge branch 'pr-561' into batch/t5
2026-10-16 01:36:08 +07:00
bflatastic
e359d856f2
Merge branch 'pr-559' into batch/t5
2026-10-16 01:36:07 +07:00
bflatastic
e08c1c598f
Merge branch 'pr-558' into batch/t5
2026-10-16 01:36:06 +07:00
bflatastic
4df3702dbb
Merge branch 'pr-556' into batch/t5
2026-10-16 01:36:05 +07:00
bflatastic
b7c692171d
Merge branch 'pr-551' into batch/t5
2026-10-16 01:36:03 +07:00
bflatastic
d95aef1d0c
Merge branch 'pr-547' into batch/t5
2026-10-16 01:36:02 +07:00
bflatastic
887e374c58
Merge branch 'pr-545' into batch/t5
2026-10-16 01:36:00 +07:00
bflatastic
34dcf852d5
Merge branch 'pr-542' into batch/t5
2026-10-16 01:35:59 +07:00
bflatastic
5e7eb51e46
Merge branch 'pr-539' into batch/t5
2026-10-16 01:35:58 +07:00
bflatastic
d40fd80be7
Merge branch 'pr-536' into batch/t5
2026-10-16 01:35:58 +07:00
bflatastic
1c5b4d8450
Merge branch 'pr-534' into batch/t5
2026-10-16 01:35:57 +07:00
bflatastic
ef69a7f8e9
Merge branch 'pr-533' into batch/t5
2026-10-16 01:35:57 +07:00
bflatastic
a1849aae15
Merge branch 'pr-531' into batch/t5
2026-10-16 01:35:56 +07:00
bflatastic
1e25e239c2
Merge branch 'pr-527' into batch/t5
2026-10-16 01:35:55 +07:00
bflatastic
7bda68876b
Merge branch 'pr-526' into batch/t5
2026-10-16 01:35:55 +07:00
bflatastic
362bdce73b
Merge branch 'pr-525' into batch/t5
2026-10-16 01:35:54 +07:00
bflatastic
5e99e71728
Merge branch 'pr-523' into batch/t5
2026-10-16 01:35:53 +07:00
bflatastic
09e85240ea
Merge branch 'pr-522' into batch/t5
2026-10-16 01:35:52 +07:00
bflatastic
7998845515
Merge branch 'pr-521' into batch/t5
2026-10-16 01:35:51 +07:00
bflatastic
e8eca728fe
Merge branch 'pr-519' into batch/t5
2026-10-16 01:35:50 +07:00
bflatastic
438d468c76
Merge branch 'pr-518' into batch/t5
...
# Conflicts:
# contributors/people.toml
2026-10-16 01:35:50 +07:00
bflatastic
07130947f9
Merge branch 'pr-517' into batch/t5
2026-10-16 01:35:45 +07:00
bflatastic