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
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
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
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
ea0bec16da
refactor: use control instead of DataContext to get input string
2024-12-03 09:35:32 +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
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
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
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
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
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
leo
c70f94cba1
ux: change Height of repository search bar
2024-11-27 10:08:20 +08:00
leo
cb9110baef
ux: new style for repository sub-view switcher
2024-11-27 10:02:26 +08:00
leo
bb41fcea3e
fix: DisplayRange is not updated when text diff view is opened for the first time
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-11-26 19:52:13 +08:00
leo
78fcc0117e
ux: style for tooltip
...
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
Signed-off-by: leo <longshuang@msn.cn>
2024-11-25 11:42:48 +08:00
Nils van Rijsinge
bf4080b773
fix: crash on goto to SHA, NullReferenceException ( #741 )
2024-11-25 09:24:16 +08:00
leo
4160f8ab9c
fix: only set tooltip if commit exists
...
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
Signed-off-by: leo <longshuang@msn.cn>
2024-11-24 21:43:31 +08:00
leo
b2e01f0d3e
feature: add tooltip for SHA in commit message presenter ( #734 )
...
Signed-off-by: leo <longshuang@msn.cn>
2024-11-24 21:22:04 +08:00
leo
637f138d63
code_style: remove Rider warning
...
Signed-off-by: leo <longshuang@msn.cn>
2024-11-24 20:28:32 +08:00
leo
457a1e79c7
code_review: PR #734
...
* remove unnecessary namespace using
* do NOT set tooltip currently, because CommitDetail.GetParent may cause UI lags and the tooltip DataTemplate is not provided.
* add translations for zh_CN and zh_TW
Signed-off-by: leo <longshuang@msn.cn>
2024-11-24 11:05:55 +08:00
Dmitrij D. Czarkoff
12f75315bd
feat: context menu for a commit in commit message ( #734 )
...
* feat: context menu for a commit in commit message
When a commit message happens to contain a commit link and the user elects to right-click it, instead of navigating them to the commit, present a menu with options to navigate to it or to copy SHA.
* feat: show commit tooltip as well
`_lastHover` in the `if` is also swapped for `match`for consistency with the block body
2024-11-24 10:53:16 +08:00
leo
cd96a28545
fix: typo in English ( #731 )
...
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
Signed-off-by: leo <longshuang@msn.cn>
2024-11-22 18:47:06 +08:00
leo
153a1f30b2
feature: supports toggle --force option for git fetch command ( #721 )
...
* Background auto fetch will always disable this option
* This option is not add to pull operation
Signed-off-by: leo <longshuang@msn.cn>
2024-11-22 09:39:50 +08:00
leo
22157a5c98
fix: tooltip of parent SHA textblock is not closed properly ( #727 )
...
Signed-off-by: leo <longshuang@msn.cn>
2024-11-21 10:06:16 +08:00
leo
839dab494b
ux: expand height of commit message box in commit template settings ( #720 )
...
Signed-off-by: leo <longshuang@msn.cn>
2024-11-20 14:39:53 +08:00
leo
ab2156bfc2
code_review: PR #710
...
* SourceGit.Commands.* should not reference SourceGit.ViewModels.*
* remove unused namespace using
* update translations for zh_CN and zh_TW
* use WrapPanel instead of inner ScrollViewer
* some other UI/UX changes
Signed-off-by: leo <longshuang@msn.cn>
2024-11-20 09:42:48 +08:00
Dmitrij D. Czarkoff
cc5bb5f6d4
Show the list of children in the commit details ( #710 )
...
* feature: add children list to the commit base info view
Useful for navigation between the commits.
* feature: use repository filters to limit children search
* feature: execute children search asynchronously
* feature: respect global commit limit for a good measure
* fix: input lines may contain several commits
The first commit is always the immediate child, so take only 40 initial characters of the line
* fix: hide children behind the preference
* feature: make parents and children scrollable
2024-11-20 09:17:36 +08:00
leo
7a9c8d7444
ux: enable TextTrimming for author name in FileHistories
...
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
Signed-off-by: leo <longshuang@msn.cn>
2024-11-19 20:07:49 +08:00
leo
73687689ce
ux: min height of change block in minimap
...
Signed-off-by: leo <longshuang@msn.cn>
2024-11-19 16:45:07 +08:00
leo
814529a690
feature: add hotkeys to stage/unstage/discard block or selected lines in text diff view ( #718 )
...
Signed-off-by: leo <longshuang@msn.cn>
2024-11-19 12:12:54 +08:00
leo
b25f9bdb6c
feature: supports switch histories order mode ( #705 )
...
Signed-off-by: leo <longshuang@msn.cn>
2024-11-19 11:32:13 +08:00
leo
f45bed6f92
fix: avoid NRE
...
Signed-off-by: leo <longshuang@msn.cn>
2024-11-19 10:31:17 +08:00
