leo
3b5d87391d
ux: use Views.NameHighlightedTextBlock instead of plan text for FileCM.ResolveUsing
2024-12-10 16:56:05 +08:00
leo
feb7e96b2c
enhance: show friendly name instead of --theirs or --mine while resolving conflicts
2024-12-10 16:44:37 +08:00
leo
c8cdda3477
ux: color for in processing target
2024-12-10 16:17:12 +08:00
leo
2504a52398
fix: wrong display when merge tag
...
* remove `Text.Merge.Source` translations from `de_DE`/`es_ES`/`fr_FR`/`it_IT`/`pt_BR`/`ru_RU` because its content has been changed
2024-12-10 15:38:06 +08:00
leo
ef40e4b738
enhance: show source branch/tag/commit in banner while merging request in progress
2024-12-10 15:17:54 +08:00
leo
e1df5c52f1
localization: update Text.InProgress.CherryPick.Head
2024-12-10 14:13:44 +08:00
leo
33ef9a612d
fix: avoid crash if fontfamily contains consecutive whitespace ( #799 )
2024-12-10 12:06:36 +08:00
leo
aee3abfffb
enhance: redesign in-progress banner ( #790 )
...
* show head for cherry-pick
* show stopped at for rebase
* supports `--skip` for cherry-pick and rebase
2024-12-10 11:17:30 +08:00
leo
64bedd2ae9
ux: layout for Views.MergeMultiple
2024-12-09 21:21:16 +08:00
leo
94daa46db9
code_review: PR #793
...
* do NOT modify the existing merge, and add a new constructor for `Commands.Merge` instead
* rewrite `ViewModels.MergeMultiple`
- since `_histories.Commits.Find` may returns null, use `List<object>` instead of `List<Models.Commits>`
- supports display merge target as both `Models.Commit` and `Models.Branch`
* rename translation key `Text.MergeMultiple.Commit` to `Text.MergeMultiple.Targets`, and add translations for zh_CN and zh_TW
* some UI/UX changes
2024-12-09 21:12:58 +08:00
Dmitrij D. Czarkoff
dce33fdf60
feature: merge multiple heads ( #793 )
...
* feature: allow merging multiple heads
* feature: allow merging multiple branches from branch tree
2024-12-09 21:04:25 +08:00
leo
ee3942fec6
code_review: PR #795
...
* update zh_CN and zh_TW translations
* simplify calling `Welcome.Clone`
2024-12-09 16:44:16 +08:00
Luigi Grilli
bea2a39feb
feature: added Ctrl+N/⌘+N shortcut ( #795 )
...
(cherry picked from commit 726cf0d376a9af9167145560977ec6e1bf748277)
2024-12-09 16:36:19 +08:00
leo
19307cebc0
ux: update icon for Block-Navigation
2024-12-09 16:11:20 +08:00
AquariusStar
33ff191212
localization: update ( #794 )
2024-12-09 09:31:45 +08:00
leo
962055dd2a
code_style: run dotnet format
...
Signed-off-by: leo <longshuang@msn.cn>
2024-12-08 21:51:33 +08:00
leo
723263d099
fix: wrong binding modes
...
Signed-off-by: leo <longshuang@msn.cn>
2024-12-08 21:47:20 +08:00
leo
15d3ad355d
code_review: PR #703
...
* change the name of this feature to `Enable Block-Navigation`
* change the icon of the toggle button used to enable this feature
* use a new class `BlockNavigation` to hold all the data about this feature
* create `BlockNavigation` data only when it is enabled
Signed-off-by: leo <longshuang@msn.cn>
2024-12-08 21:02:30 +08:00
Göran W
655d71b0bc
Add navigation and highlighting of change-blocks in Text Diff ( #616 , #717 ) ( #703 )
...
* Corrected misspelled local variable nextHigh(t)light
* Implemented change-block navigation
* Modified behavior of the Prev/Next Change buttons in DiffView toolbar.
* Well-defined change-blocks are pre-calculated and can be navigated between.
* Current change-block is highlighted in the Diff panel(s).
* Prev/next at start/end of range (re-)scrolls to first/last change-block
(I.e when unset, or already at first/last change-block, or at the only one.)
* Current change-block is unset in RefreshContent().
* Added safeguards for edge cases
* Added indicator of current/total change-blocks in DiffView toolbar
* Added new Icon and String (en-US) for Highlighted Diff Navigation
* Added Preference and ToggleButton for diff navigation style
2024-12-08 17:50:33 +08:00
GadflyFang
c062f27081
fix: Dispose _autoFetchTimer before _setting set to null ( #792 )
...
Continuous Integration / Build (push) Has been cancelled
Continuous Integration / Prepare version string (push) Has been cancelled
Continuous Integration / Package (push) Has been cancelled
Signed-off-by: Gadfly <gadfly@gadfly.vip>
2024-12-06 15:09:14 +08:00
Bernat Borràs Civil
c2252266ce
Update Spanish translation ( #791 )
...
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
Localization Check / localization-check (push) Has been cancelled
* Update spanish translation
* doc: Update translation status and missing keys
* Add missing key
(cherry picked from commit 2bf0641323325bf97d1fac9ed225228e5015a3ba)
* doc: Update translation status and missing keys
---------
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-12-06 09:13:45 +08:00
leo
e18d6d65e8
ux: style of MenuItem
2024-12-05 20:43:31 +08:00
leo
75e9f1e9a4
feature: show track status in Delete Multiple Branches panel ( #785 )
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
2024-12-04 19:14:48 +08:00
leo
1ddd348a40
feature: show tracking status in Delete Branch panel if possible ( #785 )
2024-12-04 18:04:57 +08:00
leo
d616d0897b
refactor: relative time display mode ( #777 )
2024-12-04 11:25:25 +08:00
leo
ca29a232e4
enhance: call gc after viewing commit changed
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
2024-12-03 10:44:27 +08:00
leo
ea0bec16da
refactor: use control instead of DataContext to get input string
2024-12-03 09:35:32 +08:00
leo
0160600c75
revert: changes about SystemAccentColor ( #776 )
...
This reverts commit db8ee3410b
2024-12-03 09:27:16 +08:00
leo
d1a1b4b2b9
enhance: do NOT show search suggestion if input string is empty ( #775 )
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
Localization Check / localization-check (push) Has been cancelled
2024-12-02 21:51:05 +08:00
leo
894f3e9b03
feature: supports searching revision files ( #775 )
2024-12-02 21:44:15 +08:00
leo
536f225867
feature: allow using Amend while rebasing ( #773 )
2024-12-02 10:38:40 +08:00
AquariusStar
d4c5306333
localiztion: update ( #772 )
2024-12-02 09:26:49 +08:00
Alberto de la Cruz
22de6673bc
fix: onSHAPressed avoid right click nav ( #770 )
...
Continuous Integration / Build (push) Has been cancelled
Continuous Integration / Prepare version string (push) Has been cancelled
Localization Check / localization-check (push) Has been cancelled
Continuous Integration / Package (push) Has been cancelled
- When the right click button is pressed it should not navigate to the parent. Navigation actions only should execute with the left button.
2024-11-30 19:31:13 +08:00
leo
c1368212df
feature: change the CONTINUE button to SplitButton to support editing/splitting original commit ( #767 )
...
Signed-off-by: leo <longshuang@msn.cn>
2024-11-30 19:25:20 +08:00
Nils van Rijsinge
58d1122046
localization: add de_DE key for FilterCommits ( #769 )
...
8bd5bd864e
2024-11-30 17:23:23 +08:00
leo
6e69c0567a
refactor: do not use ⌘ key to start fetch/pull/push/stash directly on macOS ( #766 )
...
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
Signed-off-by: leo <longshuang@msn.cn>
2024-11-29 21:15:12 +08:00
leo
7d857a49f7
ux: add margins for ListItem in InteractiveRebase window ( #764 )
...
Signed-off-by: leo <longshuang@msn.cn>
2024-11-29 21:03:11 +08:00
leo
938876e924
fix: wrong column indentation on right side of Interactive Rebase window, for wide commit messages ( #764 )
2024-11-29 19:12:27 +08:00
leo
e65ac18afc
fix: wrong column indentation on right side of Interactive Rebase window, for wide commit messages ( #764 )
2024-11-29 19:04:58 +08:00
leo
4cb9dbfd14
code_style: remove unused namespace using
2024-11-29 10:35:23 +08:00
leo
4aad6a7f86
fix: System.ArgumentException when hover the commit link multiple times before the first time tooltip shows ( #765 )
2024-11-29 10:26:36 +08:00
leo
db8ee3410b
refactor: users should change the SystemAccentColor from system-wide settings
2024-11-29 09:59:07 +08:00
leo
dfc03d7a8f
feature: allows to copy branch/tag name from the context menu of selected commit
2024-11-29 09:51:50 +08:00
leo
400aaacf18
fix: wrong column indentation on right side of Interactive Rebase window, for wide commit messages ( #764 )
2024-11-29 09:21:53 +08:00
leo
58eeeab67b
enhance: set core.autocrlf to false when run git diff to get detail changes of selected file ( #761 )
2024-11-28 19:36:23 +08:00
Efrem Ropelato
ccf03ce2de
fix ita locale: add ResourceInclude en_US.axaml ( #762 )
...
* Italian translation
* fix ita locale: add ResourceInclude en_US.axaml
2024-11-28 13:57:46 +08:00
leo
315a226365
code_review: PR #759
...
* code indent
* update README.md
2024-11-28 09:48:07 +08:00
Efrem Ropelato
e66179aeb8
Italian translation ( #759 )
2024-11-28 09:44:59 +08:00
leo
e224f59ea7
enhance: clear unhandled key modifer before running command ( #748 )
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
Localization Check / localization-check (push) Waiting to run
2024-11-27 20:21:01 +08:00
leo
1872148d98
fix: the way to deal with local changes did not update after radio toggle changed ( #748 )
2024-11-27 18:31:50 +08:00
