aiongg
d5cdd2ea2b
Integration: track t15
...
# Conflicts:
# contributors/people.toml
# crates/engine/src/tests.rs
# docs/file-format-parity.md
# docs/localization-parity.md
2026-10-22 03:05:39 +00:00
aiongg
561382cc6d
Integration: track t14
...
# Conflicts:
# ROADMAP.md
# contributors/people.toml
# crates/formula/src/tests.rs
# docs/file-format-parity.md
# docs/localization-parity.md
# docs/ui-parity.md
2026-10-22 03:05:30 +00:00
aiongg
ca1cdd4229
Integration: track t13
...
# Conflicts:
# ROADMAP.md
# contributors/people.toml
# crates/engine/src/cmd/data.rs
# crates/xlsx/src/tests/mod.rs
# docs/chart-parity.md
# docs/file-format-parity.md
# docs/function-parity.md
# docs/gaps.md
# docs/localization-parity.md
# docs/target-app-parity.md
2026-10-22 03:05:18 +00:00
aiongg
c7fd66d807
Integration: track t12
...
# Conflicts:
# ROADMAP.md
# crates/calc/src/tests.rs
# crates/chart/src/tests.rs
# crates/engine/src/tests.rs
# crates/xlsx/src/tests/mod.rs
# docs/chart-parity.md
2026-10-22 03:05:03 +00:00
aiongg
9350ab1def
Integration: track t11
...
# Conflicts:
# ROADMAP.md
# apps/gridcraft-web/Cargo.toml
# crates/ui-egui/src/i18n.rs
# docs/control-protocol.md
# docs/gaps.md
# docs/target-app-parity.md
# docs/ui-parity.md
2026-10-22 03:04:52 +00:00
aiongg
4c5c345c31
Integration: track t10
...
# Conflicts:
# ROADMAP.md
# crates/ui-egui/tests/sheet_tabs.rs
# crates/xlsx/src/tests/roundtrip.rs
# docs/gaps.md
# docs/ui-parity.md
2026-10-22 03:04:30 +00:00
aiongg
6dda6be2c6
Integration: track t09
...
# Conflicts:
# crates/engine/src/tests.rs
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/i18n/pt.rs
# docs/file-format-parity.md
# docs/target-app-parity.md
# docs/ui-parity.md
2026-10-22 03:04:21 +00:00
aiongg
d3201e7cea
Integration: track t08
...
# Conflicts:
# ROADMAP.md
# crates/engine/src/tests.rs
# docs/file-format-parity.md
# docs/localization-parity.md
2026-10-22 03:03:55 +00:00
aiongg
a680ac59f0
Integration: track t07
...
# Conflicts:
# crates/calc/src/tests.rs
# docs/function-parity.md
2026-10-22 03:03:23 +00:00
aiongg
cfda01c831
Integration: track t06
...
# Conflicts:
# ROADMAP.md
# contributors/people.toml
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/tests/interaction.rs
# docs/gaps.md
# docs/localization-parity.md
2026-10-22 03:03:17 +00:00
aiongg
4c81d658ec
Integration: track t05
...
# Conflicts:
# crates/ui-egui/tests/keyboard_shortcuts.rs
# docs/ui-parity.md
2026-10-22 03:01:39 +00:00
aiongg
512b2aa9fd
Integration: track t04
...
# Conflicts:
# ROADMAP.md
# crates/engine/src/cmd/edit.rs
# crates/engine/src/cmd/formulas.rs
# crates/engine/src/tests.rs
# crates/formula/src/lib.rs
# crates/formula/src/parser.rs
# crates/formula/src/tests.rs
# crates/ui-egui/src/control.rs
# crates/ui-egui/src/formula_bar.rs
# crates/ui-egui/src/grid.rs
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/ribbon.rs
# crates/ui-egui/tests/selection.rs
# docs/function-parity.md
# docs/ui-parity.md
2026-10-22 03:01:31 +00:00
aiongg
b0b6409112
Integration: track t03
...
# Conflicts:
# ROADMAP.md
# crates/ui-egui/tests/keyboard_shortcuts.rs
# docs/file-format-parity.md
# docs/localization-parity.md
# docs/ui-parity.md
2026-10-22 03:00:13 +00:00
aiongg
54d0f7cfc0
Integration: track t02
...
# Conflicts:
# ROADMAP.md
# crates/core/src/lib.rs
# crates/ui-egui/src/editor.rs
# crates/ui-egui/src/grid.rs
# crates/ui-egui/src/tabs.rs
# docs/chart-parity.md
# docs/localization-parity.md
# docs/ui-parity.md
2026-10-22 02:59:55 +00:00
aiongg
f193f0d834
Integration: track t01
2026-10-22 02:58:49 +00:00
aiongg
d056570d97
Integration: cargo fmt
2026-10-22 02:57:51 +00:00
aiongg
21c3ec248c
Integration: cargo fmt
2026-10-22 02:51:29 +00:00
aiongg
ec61d59b41
Integration: cargo fmt
2026-10-22 02:50:46 +00:00
aiongg
55aeed6f1a
Integration: cargo fmt
2026-10-22 02:48:11 +00:00
aiongg
1b4b51225d
Integration: #1912 restore the end of add_page lost in the merge resolution
2026-10-22 02:47:32 +00:00
aiongg
b35b5a8b9d
Integration: cargo fmt
2026-10-22 02:46:29 +00:00
aiongg
7b47c5a846
Integration: #995 test builds Image.data as Arc<Vec<u8>> (after #1629 )
...
shared_media.rs predates the Arc change; literals and comparisons use .into() and to_vec().
2026-10-22 02:46:21 +00:00
aiongg
55877df80f
Integration: cargo fmt
2026-10-22 02:46:00 +00:00
aiongg
f02f446905
Integration: #1194 drop the duplicate Cut and Copy German arms ( #1830 already translates them)
2026-10-22 02:45:54 +00:00
aiongg
4ac3f2fa64
Integration: cargo fmt
2026-10-22 02:45:35 +00:00
aiongg
1d9b29ff57
Integration: cargo fmt
2026-10-22 02:45:22 +00:00
aiongg
c37298b468
Integration: #1151 test literal gains the category_levels field from #1088
2026-10-22 02:40:38 +00:00
aiongg
36c9df453f
Integration: order localization-parity revision rows newest first
2026-10-22 02:39:29 +00:00
aiongg
47bf083d0a
Integration: #2116 move name_sort_key and its test into the existing tests module
2026-10-22 02:39:21 +00:00
aiongg
a1c1fc05de
Merge PR #2116 : Backstage: list the languages alphabetically by their own name
2026-10-22 02:39:08 +00:00
aiongg
d4eabcee96
Merge PR #2106 : Translate form-dialog field labels, choices and notes
2026-10-22 02:39:04 +00:00
aiongg
10ac46c243
Integration: #2102 fill Romanian catalog gap (Options|Editing, English text)
2026-10-22 02:39:04 +00:00
aiongg
0eeaeec0c1
Merge PR #2102 : Romanian (ro) interface language
...
Conflicts:
- crates/ui-egui/src/i18n.rs: language registration lines kept from both sides (Language::ALL has 18 entries).
- crates/ui-egui/tests/file_menu.rs: both language rows kept.
- docs/localization-parity.md: one Last updated line naming all changes; both revision rows kept, newest first.
2026-10-22 02:38:43 +00:00
aiongg
e72d5f290a
Merge PR #2061 : i18n: Dutch (nl) interface language
...
Conflicts:
- crates/ui-egui/src/i18n.rs: language registration lines kept from both sides (Language::ALL has 17 entries).
- ROADMAP.md: one Last updated line naming both changes; both progress-log rows kept.
- docs/localization-parity.md: one Last updated line naming both changes; both revision rows kept.
2026-10-22 02:38:32 +00:00
aiongg
905ef6a6a5
Integration: #2000 remove duplicated Spanish financial alias block
2026-10-22 02:38:15 +00:00
aiongg
4286ac2930
Merge PR #2000 : Spanish formula aliases for financial functions ( #1986 )
2026-10-22 02:38:09 +00:00
aiongg
7649a762ff
Merge PR #1772 : i18n: add Vietnamese interface translations
...
Conflicts:
- crates/ui-egui/src/i18n.rs: language registration lines kept from both sides (Language::ALL has 16 entries).
- docs/localization-parity.md: both revision rows kept.
2026-10-22 02:38:09 +00:00
aiongg
e4c406dbcf
Merge PR #1194 : fix(ui): ribbon tooltips show each platform's shortcuts (Ctrl+B on Windows, ⌘B on macOS) ( #1191 )
...
crates/ui-egui/src/widgets.rs: both test modules kept.
2026-10-22 02:37:51 +00:00
aiongg
8bfe310208
Integration: #1770 register Ukrainian (Language::Uk) and fill 573 missing keys with English text
2026-10-22 02:37:49 +00:00
aiongg
a9a8fe7d20
Integration: #1754 translate the sheet-tab Delete button; Spanish Hide and Autoguardado; test that the sheet-tab and AutoSave labels translate in es, de, fr, ko, ru, zh, sr
2026-10-22 02:37:48 +00:00
aiongg
3a01ce689e
Integration: i18n drop duplicate Unprotect Sheet… entries (added by #1373 and #1754 )
2026-10-22 02:37:43 +00:00
aiongg
9d3252189d
Merge PR #1180 : fix(ui): menu items highlight under the pointer ( #1174 )
...
crates/ui-egui/src/grid.rs: list picker button combines frame_when_inactive(false) with main's LIST_PICKER_ROW_H min size.
2026-10-22 02:37:42 +00:00
aiongg
1316d39865
Merge PR #1151 : Charts: a huge trendline forecast no longer collapses the chart ( #1148 )
...
ROADMAP.md: all rows kept.
crates/chart/src/tests.rs: both tests kept.
2026-10-22 02:37:37 +00:00
aiongg
56c31b0b31
Merge PR #1993 : Grid: the selection outline follows a mouse drag at once
...
Conflicts:
- docs/ui-parity.md: header keeps main's change list plus the outline entry; both log rows kept
2026-10-22 02:37:23 +00:00
aiongg
169c78dda8
Merge PR #1111 : Respect workbook structure protection in sheet rename, move, copy, hide and unhide ( #1049 )
2026-10-22 02:37:22 +00:00
aiongg
d8b73ecb4e
Merge PR #1110 : Size the list validation dropdown to up to 8 rows ( #1089 )
2026-10-22 02:37:19 +00:00
aiongg
f5b35fb3ac
Merge PR #1109 : fix(ui): commit a pointed formula on the sheet it was started on ( #996 )
...
crates/ui-egui/src/lib.rs: sheet re-activation first, then main's unchanged-empty-commit check and the commit chain.
crates/ui-egui/src/tabs.rs: union of test imports.
2026-10-22 02:37:19 +00:00
aiongg
470a2ae2c1
Merge PR #1765 : Sheet protection: obey the Sort and Use AutoFilter boxes
...
Conflicts:
- crates/engine/src/cmd/data.rs: do_sort keeps #1284 's sheet parameter and checks Sorting on it; toggle_filter checks Filtering after #1285 's data_target
- crates/engine/src/tests.rs: adjacent tests, both kept
2026-10-22 02:37:16 +00:00
aiongg
ad1899e1ca
Merge PR #1770 : Add Ukrainian localization (uk.rs)
2026-10-22 02:37:08 +00:00
aiongg
01485e2b66
Merge PR #1838 : Added multi-column/row selection in formulas & column/row selection highlighting.
...
crates/ui-egui/src/editor.rs: kept both appended tests
crates/ui-egui/src/grid.rs: kept the Table heading filter-button check, then point_header(.., mods.shift, mods.command); kept format_painter_apply and the extend/add point_header
2026-10-22 02:37:08 +00:00
aiongg