leo
1799de4907
code_review: PR #1173
...
- rename c-style `file_arg` to `fileArg`
- add missing translations for zh_CN and zh_TW
- re-design conflict view and add tooltip for `USE THEIRS` and `USE MINE`
- re-order unstaged toolbar buttons
Signed-off-by: leo <longshuang@msn.cn>
2025-04-11 10:02:33 +08:00
Göran W
47824dc27a
Add button for running external mergetool on ALL conflicts ( #1173 )
...
* Make a few non-translated strings localizable (in Conflict view)
* Add button and wiring to run mergetool on all conflicts
* Corrected spelling and wording in related code and exception msg
2025-04-11 09:33:07 +08:00
leo
3b18ee0b37
code_style: remove unused code
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-08 20:20:20 +08:00
leo
768b324356
ux: if there are no local changes, show different confirm message ( #1143 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-08 20:06:00 +08:00
leo
506af95963
enhance: new confirm empty commit dialog ( #1143 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-08 20:00:42 +08:00
leo
898a8bc69a
ux: resize confirm commit dialog
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-08 18:05:53 +08:00
leo
da38b72ee5
ux: disable commit button when commit message is empty
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-08 18:03:40 +08:00
leo
7cda7211f1
refactor: statistics dialog
...
- use `%aN+%aE` instead of `%aN` to get commit author
- show user avatar in statistics dialog
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 21:20:59 +08:00
Göran W
1555abd027
Added new ExternalMerger - Plastic SCM ( #1162 )
...
Motivation:
https://m-pixel.com/how-to-use-plastic-scms-merge-tool-with-p4v/
2025-04-07 20:22:53 +08:00
leo
2c5ee4fa99
localization: add keys deleted by sorter tools back
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 20:19:00 +08:00
leo
f5c213060e
localization: keep all keys in order and remove duplicated keys in fr_FR ( #1161 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 20:05:24 +08:00
leo
3275dd07d2
enhance: auto stash and re-apply local changes before squashing ( #1141 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 16:04:10 +08:00
leo
3049730dd5
feature: add Preferred Merge Mode
in repository configure ( #1156 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 14:42:46 +08:00
leo
ad9021e892
enhance: allow using +
character in branch name ( #1152 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 14:07:58 +08:00
leo
fa02c65da5
code_review: PR #1153
...
- use a single filter for both unstage and staged files
- show confirm dialog if staged files are displayed partially
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 11:48:38 +08:00
Göran W
a37c6b29ec
In Local Changes, added filter-box in Staged area, to match Unstaged area ( #1153 )
...
Also added minimal handling (RaiseException) if trying to commit with active filter (might commit more changes than visible, so disallow).
Minor unification in unstageChanges() to make it more similar to StageChanges().
2025-04-07 10:37:58 +08:00
leo
ac7b02590b
enhance: add comma between date and time ( #1150 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 10:23:37 +08:00
leo
8c9cf05c1d
fix: renamed files are missing in commit changes and stash changes ( #1151 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 10:14:02 +08:00
Sousi Omine
ef106e6909
Add Japanese localization ( #1157 )
...
* Initial Japanese translation
Only a small part was translated
* Unspecified words will be in English
When new words are added, they will be displayed in English even if Japanese support is delayed.
* Expanded translation scope
* Expanded translation scope
* Proceed with translation with a focus on overall settings
* Re-translated the outdated settings screen
* Add items that only exist in the latest en_US and remove items that do not exist in en_US
* A lot of translation work done
* A lot more translation work has been done
* ja_JP.axaml has been translated into Japanese
* Fixed three incomplete parts of the Japanese translation
2025-04-07 09:53:20 +08:00
UchiTesting
904432a8f1
style(locale): Add a few translations to the French locale ( #1158 )
2025-04-07 09:45:02 +08:00
Javier J. Martínez M.
2deb79f8ce
localization: update spanish translations ( #1142 )
...
add literal translation for 'CopyFullPath' string
2025-04-02 17:20:33 +08:00
leo
8e55ba1b47
enhance: avoid unhandled exceptions in timer
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-31 19:06:10 +08:00
leo
0045e06d78
project: upgrade AvaloniaUI
to 11.2.6
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-31 09:29:07 +08:00
qiufengshe
07d99f5fd2
enhance: get email hash code opimization ( #1137 )
...
(cherry picked from commit 839b92a284d6b103894f6a8a39e5ce1f99bb12fa)
2025-03-31 09:22:57 +08:00
AquariusStar
1482a005bb
localization: update and fix translation russian ( #1136 )
2025-03-31 09:20:54 +08:00
leo
276d000bcf
refactor: change Copy File Name
to Copy Full Path
for selected file or change ( #1132 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-28 18:01:53 +08:00
leo
56ebc182f2
enhance: try to reinstate not onl the working tree's change, but also the index's ones ( #1135 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-28 12:20:36 +08:00
Gadfly
1575ae977e
fix: improve font family name handling by collapsing multiple spaces ( #1131 )
2025-03-27 20:22:46 +08:00
leo
4fb853d1fd
localization: add translation Text.Configure.IssueTracker.AddSampleAzure
for Chinese ( #1128 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-26 09:30:41 +08:00
Iacopo Sbalchiero
ca0fb7ae10
Adding template for Azure DevOps workitems ( #1128 )
...
* feat: add Azure DevOps issue tracker integration
* localization: add Azure DevOps sample rule to issue tracker in multiple languages
2025-03-26 09:27:10 +08:00
leo
f37ac904b9
enhance: do not create crash log for unobserved task exceptions (#1121)
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-25 10:33:39 +08:00
Javier J. Martínez M.
380e6713b5
localization: update spanish translations ( #1124 )
2025-03-25 09:51:22 +08:00
leo
fc85dd3269
enhance: improve Repository.Open()
performance ( #1121 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-24 19:37:39 +08:00
leo
0a877c6730
project: upgrade OpenAI
and Azure.AI.OpenAI
to 2.2.0-beta.4
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-24 10:03:27 +08:00
leo
d335cac167
enhance: only raise BlockNavigationChangedEvent
when UseBlockNavigation
enabled
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-21 18:00:46 +08:00
leo
9590f96a44
enhance: clear highlight chunk while scrolling out of TextArea.TextView
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-21 17:46:11 +08:00
leo
03f49ccff0
refactor: text diff view block navigation
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-21 17:35:59 +08:00
leo
8c1e1a3e6a
fix: text diff view scrolling issue introduced by AvaloniaEdit 11.2.0
(commit 7caa03a09b
)
...
- `SyncScrollOffset` does not update in `side-by-side` mode while scrolling
- Highlighted chunk is not cleared when scroll by drag scrollbar
Signed-off-by: leo <longshuang@msn.cn>
2025-03-21 10:09:43 +08:00
Ilian Delagrange
5467703a6e
localization: add missing french translations ( #1113 )
...
Co-authored-by: Ilian Delagrange <ilian@MacBook-Air-de-Ilian.local>
2025-03-21 09:30:57 +08:00
leo
7cd5814410
enhance: better regex for output of Commands.CompareRevisions
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-20 21:18:51 +08:00
leo
38d87fa1a1
feature: use git stash show -u --name-status <stash_name>
command to query changes in selected stash if git >= 2.32.0
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-20 21:12:08 +08:00
leo
65dbfd336d
refactor: it's not necessary to store untracked file list for selected stash
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-20 20:53:30 +08:00
leo
891e1b2ec8
ux: show name of stash instead of SHA which is useless to user
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-20 19:56:06 +08:00
leo
145273b4a7
refactor: move Show tags in commit graph
to Preferences
( #1109 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-20 11:10:48 +08:00
leo
a5bdcab341
code_style: move dynamic context menu creation to view models
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-20 09:38:02 +08:00
AquariusStar
f7197e08eb
localization: update russian localization ( #1111 )
2025-03-20 09:14:07 +08:00
leo
2512d3be7a
feature: allow to hide tags in graph ( #1109 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-18 21:40:31 +08:00
leo
ae1e46b586
fix: layout horizontal not working since 2025.9 after switching away from history screen ( #1108 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-18 19:47:54 +08:00
leo
822452a20c
enhance: show inner exception message if possible when check update failed
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-18 15:55:32 +08:00
leo
760e44877b
fix: wrong split char
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-18 12:15:00 +08:00