Commit Graph
2291 Commits
Author SHA1 Message Date
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
NetterSilverandClaude Haiku 5.5 26b5578291 Skip .ase swatches with NaN or infinite colour components
Found while testing crates/color/src/ase.rs:83

Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-15 04:58:52 +02: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
Brandon ThomasandClaude Opus 5.5 8da5bb5bab fix: integrate batched community PRs (pt-BR/Arabic catalogs drop keys main already translates; Typography in Window › Type & Tables; Georgian for the new menu labels)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-14 22:26:51 -04:00
Brandon ThomasandClaude Opus 5.5 edfc98ffd7 fix: integrate batched community PRs (main's new tests with #559's FrameSpec.section_marker and #604's load_document_fonts guard)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-14 22:05:13 -04:00
Brandon Thomas ed3acb0f82 Merge PR #979 2026-10-14 22:05:13 -04:00
Brandon Thomas 35563d0f2f Merge PR #978 2026-10-14 22:05:13 -04:00
Brandon Thomas 8cbef21444 Merge PR #974 2026-10-14 22:05:13 -04:00
Brandon Thomas eb874d41fe Merge PR #968 2026-10-14 22:05:13 -04:00
Brandon Thomas 7a23e00482 Merge PR #967 2026-10-14 22:05:13 -04:00
Brandon Thomas fddb3538fa Merge PR #966 2026-10-14 22:05:13 -04:00
Brandon Thomas 774b07b238 Merge PR #965 2026-10-14 22:05:13 -04:00
Brandon Thomas c5ea51ec4d Merge PR #964 2026-10-14 22:05:13 -04:00
Brandon Thomas 88fee015ce Merge PR #958 2026-10-14 22:05:13 -04:00
Brandon Thomas 528ae789b1 Merge PR #954 2026-10-14 22:05:13 -04:00
Brandon Thomas 66531c8b63 Merge PR #952 2026-10-14 22:05:13 -04:00
Brandon Thomas 2e5e3c4000 Merge PR #951 2026-10-14 22:05:13 -04:00
Brandon Thomas 6c2064ae48 Merge PR #949 2026-10-14 22:05:12 -04:00
Brandon Thomas cb3fbde5de Merge PR #940 2026-10-14 22:05:12 -04:00
Brandon Thomas 212eee6d32 Merge PR #936 2026-10-14 22:05:12 -04:00
Brandon Thomas 79a5c52e9d Merge PR #933 2026-10-14 22:05:12 -04:00
Brandon Thomas 20df177996 Merge PR #930 2026-10-14 22:05:12 -04:00
Brandon Thomas 452b0920e6 Merge PR #917 2026-10-14 22:05:12 -04:00