Brandon Thomas
|
cccd1852a9
|
Merge PR #308
|
2026-10-15 00:35:27 -04:00 |
|
Brandon Thomas
|
f62985064d
|
Merge PR #307
|
2026-10-15 00:35:27 -04:00 |
|
Brandon Thomas
|
d2e40f6b6f
|
Merge PR #306
|
2026-10-15 00:35:27 -04:00 |
|
Brandon Thomas
|
41e7a023da
|
Merge PR #304
|
2026-10-15 00:35:26 -04:00 |
|
Brandon Thomas
|
bdda458b5b
|
Merge PR #302
|
2026-10-15 00:35:26 -04:00 |
|
Brandon Thomas
|
515b689127
|
Merge PR #171
|
2026-10-15 00:35:26 -04:00 |
|
Brandon Thomas
|
6132b60e9b
|
Merge PR #170
|
2026-10-15 00:35:26 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
26137acbb2
|
fix: integrate batched community PRs (#588's blend-space test uses as_chunks for clippy)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-15 00:01:41 -04:00 |
|
Brandon Thomas
|
84dbba029f
|
Merge IDML/text cluster
# Conflicts:
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/i18n/ar.rs
# crates/ui-egui/src/i18n/it.rs
# crates/ui-egui/src/i18n/ja.rs
# crates/ui-egui/src/i18n/pt_br.rs
# crates/ui-egui/src/i18n/uk.rs
|
2026-10-14 23:54:49 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
0697b39a3a
|
fix: integrate batched community PRs (rustfmt after the IDML/text cluster merges)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 23:45:50 -04:00 |
|
Brandon Thomas
|
afd8c0a0de
|
Merge PR #789
# Conflicts:
# crates/engine/src/cmd/style.rs
|
2026-10-14 23:42:34 -04:00 |
|
Brandon Thomas
|
450503f538
|
Merge EPUB/docx/datamerge cluster
|
2026-10-14 23:36:46 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
5112019053
|
fix: integrate batched community PRs (quick-xml 0.41 from #687 in main's IDML attribute reader; #610's text-link reads pass #604's file guard; wasm-only unused re-export)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 23:36:14 -04:00 |
|
Brandon Thomas
|
4b88d7d29c
|
Merge PR #959
# Conflicts:
# crates/engine/src/cmd/text.rs
|
2026-10-14 23:31:51 -04:00 |
|
Brandon Thomas
|
067b339991
|
Merge PR #887
# Conflicts:
# crates/engine/src/cmd/text.rs
|
2026-10-14 23:31:45 -04:00 |
|
Brandon Thomas
|
d35887f494
|
Merge PR #825 (gradient text paint goes through #657's stroke-behind-fill painting)
|
2026-10-14 23:31:39 -04:00 |
|
Brandon Thomas
|
e7d8d5be62
|
Merge PR #960
# Conflicts:
# crates/engine/src/cmd/anchors.rs
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/i18n/ar.rs
# crates/ui-egui/src/i18n/it.rs
# crates/ui-egui/src/i18n/ja.rs
# crates/ui-egui/src/i18n/pt_br.rs
# crates/ui-egui/src/i18n/uk.rs
# crates/ui-egui/src/icons.rs
# docs/target-app-parity.md
|
2026-10-14 23:17:31 -04:00 |
|
Brandon Thomas
|
94d0c57236
|
Merge PR #937
# Conflicts:
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/i18n/ar.rs
# crates/ui-egui/src/i18n/it.rs
# crates/ui-egui/src/i18n/ja.rs
# crates/ui-egui/src/i18n/pt_br.rs
# crates/ui-egui/src/i18n/uk.rs
|
2026-10-14 23:14:44 -04:00 |
|
Brandon Thomas
|
35ec71f04f
|
Merge PR #935
# Conflicts:
# crates/fonts/src/fontdb.rs
# crates/fonts/src/tests_docfonts.rs
|
2026-10-14 23:09:43 -04:00 |
|
Brandon Thomas
|
d47e7a186c
|
Merge PR #929
# Conflicts:
# crates/tools/src/tests.rs
# crates/ui-egui/src/icons.rs
|
2026-10-14 23:08:32 -04:00 |
|
Brandon Thomas
|
47e9e576d4
|
Merge PR #610 (linked text files read through crate::io, so the automation roots apply)
|
2026-10-14 23:07:27 -04:00 |
|
Brandon Thomas
|
528264a4a9
|
Merge PR #823 (with main's radial ellipse: linear gradients go through #823's linear_axis)
|
2026-10-14 23:07:06 -04:00 |
|
Brandon Thomas
|
2aeeea345a
|
Merge PR #918
# Conflicts:
# crates/compose/src/notes.rs
|
2026-10-14 23:05:24 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
0faf63b92b
|
fix: integrate batched community PRs (#973's Flex Layout panel in Window › Object & Layout; Georgian for its menu labels)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 23:00:55 -04:00 |
|
Brandon Thomas
|
2805b3d041
|
Merge PR #764
# Conflicts:
# crates/ui-egui/src/lib.rs
|
2026-10-14 23:00:55 -04:00 |
|
Brandon Thomas
|
0923c8247a
|
Merge PR #797
# Conflicts:
# crates/textimport/src/docx.rs
|
2026-10-14 22:57:54 -04:00 |
|
Brandon Thomas
|
bfd2c59867
|
Merge PR #687
# Conflicts:
# crates/textimport/src/docx.rs
|
2026-10-14 22:57:24 -04:00 |
|
Brandon Thomas
|
0e5dac86f1
|
Merge PR #783
# Conflicts:
# crates/engine/src/cmd/datamerge/mod.rs
# crates/engine/src/cmd/export.rs
# crates/epub/src/lib.rs
|
2026-10-14 22:56:50 -04:00 |
|
Brandon Thomas
|
33816b916d
|
Merge PR #757
# Conflicts:
# crates/ui-egui/src/lib.rs
|
2026-10-14 22:56:34 -04:00 |
|
Brandon Thomas
|
d4a65a5ea5
|
Merge PR #688
# Conflicts:
# crates/engine/src/cmd/paths.rs
|
2026-10-14 22:56:29 -04:00 |
|
Brandon Thomas
|
af45138718
|
Merge PR #588
# Conflicts:
# crates/render/src/lib.rs
|
2026-10-14 22:54:18 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
8a98451d2d
|
fix(flex): flex.reorder clamps a huge by instead of overflowing (#973)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 22:49:37 -04:00 |
|
Brandon Thomas
|
f726d40ff4
|
Merge PR #787
# Conflicts:
# crates/engine/src/cmd/export.rs
# crates/epub/src/lib.rs
|
2026-10-14 22:46:55 -04:00 |
|
Brandon Thomas
|
aa979dab79
|
Merge PR #785
# Conflicts:
# crates/engine/src/cmd/export.rs
# crates/epub/src/lib.rs
|
2026-10-14 22:45:44 -04:00 |
|
Brandon Thomas
|
131c4f417f
|
Merge PR #972
# Conflicts:
# crates/idml/src/export.rs
# crates/idml/src/tests.rs
|
2026-10-14 22:44:44 -04:00 |
|
Brandon Thomas
|
999bb848cc
|
Merge PR #963
# Conflicts:
# crates/idml/src/import.rs
# crates/idml/src/tests/assets.rs
|
2026-10-14 22:44:14 -04:00 |
|
Brandon Thomas
|
072ae1d948
|
Merge PR #975
# Conflicts:
# crates/idml/src/import.rs
# crates/idml/src/tests.rs
|
2026-10-14 22:43:41 -04:00 |
|
Brandon Thomas
|
bd023252b2
|
Merge PR #798
# Conflicts:
# crates/epub/src/lib.rs
|
2026-10-14 22:43:39 -04:00 |
|
Brandon Thomas
|
d5cea4f3de
|
Merge PR #971
# Conflicts:
# crates/idml/src/import.rs
# crates/idml/src/tests.rs
|
2026-10-14 22:42:51 -04:00 |
|
Brandon Thomas
|
9ee2eb2c7a
|
Merge PR #791
# Conflicts:
# crates/epub/src/lib.rs
|
2026-10-14 22:41:18 -04:00 |
|
Brandon Thomas
|
ee498ac68f
|
Merge PR #973
# Conflicts:
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/i18n/ar.rs
# crates/ui-egui/src/i18n/it.rs
# crates/ui-egui/src/i18n/ja.rs
# crates/ui-egui/src/i18n/pt_br.rs
# crates/ui-egui/src/i18n/uk.rs
# crates/ui-egui/src/panels/properties.rs
|
2026-10-14 22:38:58 -04:00 |
|
Brandon Thomas
|
e192fc17d9
|
Merge PR #780
# Conflicts:
# crates/epub/src/lib.rs
|
2026-10-14 22:38:58 -04:00 |
|
Brandon Thomas
|
ce222cd8a6
|
Merge PR #921
# Conflicts:
# crates/idml/src/import.rs
|
2026-10-14 22:38:53 -04:00 |
|
Brandon Thomas
|
7ed56979c7
|
Merge PR #977
# Conflicts:
# crates/compose/src/tests.rs
|
2026-10-14 22:33:58 -04:00 |
|
Brandon Thomas
|
f9b4660ca2
|
Merge PR #976
# Conflicts:
# crates/engine/src/tests.rs
|
2026-10-14 22:33:58 -04:00 |
|
Brandon Thomas
|
2dbf60be6f
|
Merge PR #925
# Conflicts:
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/i18n/ar.rs
# crates/ui-egui/src/i18n/it.rs
# crates/ui-egui/src/i18n/ja.rs
# crates/ui-egui/src/i18n/pt_br.rs
# crates/ui-egui/src/i18n/uk.rs
|
2026-10-14 22:33:55 -04:00 |
|
Brandon Thomas
|
895a656321
|
Merge PR #901
|
2026-10-14 22:33:54 -04:00 |
|
Brandon Thomas
|
3bf5cb58a6
|
Merge PR #828
# Conflicts:
# crates/compose/src/tests.rs
|
2026-10-14 22:33:54 -04:00 |
|
Brandon Thomas
|
290ea6c19c
|
Merge PR #824
# Conflicts:
# contributors/people.toml
|
2026-10-14 22:33:53 -04:00 |
|
Brandon Thomas
|
e6d6affb37
|
Merge PR #796
|
2026-10-14 22:33:52 -04:00 |
|