 Brandon Thomas
|
6b9b9205e4
|
Merge PR #472
|
2026-10-15 00:35:27 -04:00 |
|
|
Brandon Thomas
|
33e93c93a6
|
Merge PR #311
|
2026-10-15 00:35:27 -04:00 |
|
|
Brandon Thomas
|
6132b60e9b
|
Merge PR #170
|
2026-10-15 00:35:26 -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 Thomas
|
450503f538
|
Merge EPUB/docx/datamerge cluster
|
2026-10-14 23:36:46 -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
|
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
|
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
|
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
|
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 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
|
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
|
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
|
e6d6affb37
|
Merge PR #796
|
2026-10-14 22:33:52 -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
|
88fee015ce
|
Merge PR #958
|
2026-10-14 22:05:13 -04:00 |
|
|
Brandon Thomas
|
cb3fbde5de
|
Merge PR #940
|
2026-10-14 22:05:12 -04:00 |
|
|
Brandon Thomas
|
79a5c52e9d
|
Merge PR #933
|
2026-10-14 22:05:12 -04:00 |
|
|
Brandon Thomas
|
b14b1fd805
|
Merge PR #913
|
2026-10-14 22:05:12 -04:00 |
|
|
Brandon Thomas
|
5839d5c7a4
|
Merge PR #894
|
2026-10-14 22:05:12 -04:00 |
|
|
Brandon Thomas
|
f4333338b3
|
Merge PR #889
|
2026-10-14 22:05:12 -04:00 |
|
|
Brandon Thomas
|
9449d6c293
|
Merge PR #832
|
2026-10-14 22:05:12 -04:00 |
|
|
Brandon Thomas
|
e6660efb7a
|
Merge PR #801
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
3adc568fc3
|
Merge PR #799
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
a593ae07af
|
Merge PR #795
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
a666a9f00a
|
Merge PR #793
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
4bd1fbab37
|
Merge PR #765
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
9f5e8cebf1
|
Merge PR #760
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
7b76b28a54
|
Merge PR #759
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
650aaf3440
|
Merge PR #751
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
02dd8ade8d
|
Merge PR #704
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
ab115db100
|
Merge PR #703
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
63c3e36644
|
Merge PR #698
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
412ce96ff0
|
Merge PR #691
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
8d254120e7
|
Merge PR #658
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
3cdda36680
|
Merge PR #657
|
2026-10-14 22:05:11 -04:00 |
|
|
Brandon Thomas
|
4cd3a8fa5e
|
Merge PR #648
|
2026-10-14 22:05:11 -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 |
|