Sina Hinderks
2eebe2eda7
localization: update German translations ( #1580 )
2025-07-15 10:12:17 +08:00
leo
b316f84bbe
ux: show hotkey of popup buttons
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-14 19:55:14 +08:00
leo
7627600939
fix: wrong editor configuration commandline passing to git ( #1576 )
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-14 17:22:58 +08:00
leo
79dc295183
ux: re-order commit context menu items
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-14 17:00:50 +08:00
leo
f487990bc0
feature: auto-open commit message editor
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-14 16:29:25 +08:00
github-actions[bot]
2d3e450afb
doc: Update translation status and sort locale files
2025-07-14 08:07:08 +00:00
leo
8cea7ac2aa
revert!: remove Squash Children into Here
...
Since `Children` is an ambiguous word for commits to a multi-branch repository, and users can do the same job with the `Interactive Rebase` feature, this context menu entry will be removed.
Signed-off-by: leo <longshuang@msn.cn >
2025-07-14 16:06:51 +08:00
github-actions[bot]
cbd9b70489
doc: Update translation status and sort locale files
2025-07-14 07:47:18 +00:00
leo
af758158e2
feature: add quick action entry for interactive rebase ( #1572 )
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-14 15:46:03 +08:00
leo
4d37e73f4a
ux: should not use friendly name for Squash Commits Since This
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-14 14:44:46 +08:00
github-actions[bot]
74d7e74100
doc: Update translation status and sort locale files
2025-07-14 06:10:36 +00:00
Javier J. Martínez M.
31635653ac
localization: update spanish translations ( #1573 )
...
add missing translations
2025-07-14 14:10:21 +08:00
github-actions[bot]
33daa97ba5
doc: Update translation status and sort locale files
2025-07-14 04:45:50 +00:00
leo
b670312522
ux: new tooltip for branch tree node ( #1562 )
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-14 12:45:35 +08:00
leo
a6b2e97607
code_review: PR #1570
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-14 11:44:34 +08:00
Nathan Baulch
d09ae6c55c
enhance: more readable command log duration ( #1570 )
2025-07-14 11:37:36 +08:00
leo
d406cb8d28
Merge branch 'master' into develop
2025-07-14 10:41:33 +08:00
leo
0a74dd64ce
Merge branch 'release/v2025.26'
v2025.26
2025-07-14 10:40:30 +08:00
leo
6fe245d73b
version: Release 2025.26
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-14 10:39:52 +08:00
github-actions[bot]
0bd71ca584
doc: Update translation status and sort locale files
2025-07-14 02:22:24 +00:00
leo
a752ad141d
code_review: PR #1568
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-14 10:22:04 +08:00
Nathan Baulch
a1e0ee5561
enhance: use commit friendly name in context menus ( #1568 )
2025-07-14 10:07:30 +08:00
github-actions[bot]
bbe388decb
doc: Update translation status and sort locale files
2025-07-14 02:06:46 +00:00
AquariusStar
28cd5c55fb
localization: update russian translate ( #1563 )
2025-07-14 10:06:34 +08:00
github-actions[bot]
920a89ea5b
doc: Update translation status and sort locale files
2025-07-14 02:06:29 +00:00
Sina Hinderks
b897e19487
localization: update German translations ( #1569 )
2025-07-14 10:06:06 +08:00
Nathan Baulch
a229a19b2e
fix: discard null process output data ( #1571 )
2025-07-14 10:03:43 +08:00
leo
6ae8c7c759
code_style: move class extensions to App.Extensions.cs to use these extensions anywhere
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-11 18:00:21 +08:00
Nathan Baulch
9c039215cf
fix: escape double quotes in quoted git command strings ( #1559 )
2025-07-11 15:53:42 +08:00
leo
bfd639c001
enhance: external merge tool can only used for both-added or both-modified conflict(s)
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-11 14:22:08 +08:00
Sina Hinderks
c60a2de324
ux: add hotkey for OPEN EXTERNAL MERGETOOL button ( #1558 )
...
When opening the context menu for a conflicted file in the unstaged
view, the displayed hotkey (Ctrl+Shift+D/⌘+⇧+D, added in #1547 ) for
opening the merge tool is working now.
2025-07-11 14:15:00 +08:00
leo
b1efd6527c
feature: allows to reword HEAD commit while keeping local changes
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-11 14:09:41 +08:00
leo
943a4ebfd4
code_review: PR #1556
...
New layout for interactive rebase window
Signed-off-by: leo <longshuang@msn.cn >
2025-07-11 13:36:30 +08:00
github-actions[bot]
a21d4fdf21
doc: Update translation status and sort locale files
2025-07-11 05:27:19 +00:00
Nathan Baulch
3f5f74d7ae
enhance: support --autostash on interactive rebase ( #1556 )
2025-07-11 13:27:07 +08:00
github-actions[bot]
7974bcaa70
doc: Update translation status and sort locale files
2025-07-11 04:28:33 +00:00
leo
8f6651119b
code_review: PR #1535
...
- Do not translate interactive rebase action description.
- For slider label in `BLEND` diff mode, it can not use `Text.Diff.Binary.New` or `Text.Diff.Binary.Old`. Because those keys are labels for size.
Signed-off-by: leo <longshuang@msn.cn >
2025-07-11 12:27:43 +08:00
github-actions[bot]
14bea8e00a
doc: Update translation status and sort locale files
2025-07-11 03:42:05 +00:00
Nathan Baulch
1d31f5f294
localization: move strings into resources ( #1535 )
2025-07-11 11:41:51 +08:00
leo
58e63b9b57
enhance: use different icon for Visual Studio Preview
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-11 11:18:53 +08:00
leo
b95523aa0d
feature: detect Visual Studio Preview as external tools ( #1553 )
...
Co-authored-by: Luis Frey <58328398+FreyLuis@users.noreply.github.com >
Signed-off-by: leo <longshuang@msn.cn >
2025-07-11 11:05:49 +08:00
leo
8f9094fc77
fix: should use File.Create instead of File.OpenWrite
...
Signed-off-by: leo <longshuang@msn.cn >
2025-07-11 10:39:33 +08:00
leo
aa803c3141
code_review: PR #1555
...
- Remove unnecessary reference to `System.Linq`
- Stop to auto-stage and commit when there is unsolved conflict(s)
Signed-off-by: leo <longshuang@msn.cn >
2025-07-11 09:59:19 +08:00
Sina Hinderks
7aa008372b
fix: prevent staging conflicted files ( #1555 )
...
It was possible to stage a file with conflicts (double tap, space,
enter, or a stage button). As a result it would no longer be shown as
conflicted, and the user could no longer solve the conflict in any way
(use theirs, use mine, or execute merge tool), not even after unstaging
again.
Now conflicted files are ignored when staging.
2025-07-11 09:43:49 +08:00
github-actions[bot]
862fe40b56
doc: Update translation status and sort locale files
2025-07-11 01:40:33 +00:00
AquariusStar
e998f78f3a
localization: update russian translate ( #1554 )
2025-07-11 09:40:20 +08:00
leo
d5745b4a65
enhance: do nothing if target is a binary file while blaming
2025-07-10 17:42:18 +08:00
Gadfly
44f7877926
feat: Add blame visibility condition and file size formatting ( #1552 )
...
- Add conditional visibility binding to blame data display using a negated binary file flag converter.
- Format size property as human-readable file size using LongConverters.ToFileSize converter in UI display.
2025-07-10 17:37:14 +08:00
leo
24d3998808
ux: add loading icon
2025-07-10 17:34:15 +08:00
leo
de0d0c15f8
enhance: it's not necessary to change thread's culture
2025-07-10 16:11:02 +08:00