github-actions[bot]
0ac1031c4c
doc: Update translation status and missing keys
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-12 02:03:49 +00:00
leo
2053ce033d
feature: supports merge selected commit to current branch ( #800 )
2024-12-12 10:03:34 +08:00
leo
e17b53da42
enhance: block-navigation in text diff view
...
* It is not necessary to re-calculate all the contents when `UseBlockNavigation` changed
* Redraw the text view after `block-navigation` has turned off
2024-12-12 09:44:55 +08:00
leo
9dd4166009
refactor: use MultiBinding instead of code to control visibility of Commit & Push button
2024-12-11 16:08:23 +08:00
leo
a10f9e0dd0
enhance: popup will be closed when cherry-pick or revert failed
2024-12-11 15:27:00 +08:00
leo
0dd6692cd8
enhance: supports --skip while reverting commits
2024-12-11 15:12:25 +08:00
leo
dcaeaef48a
refactor: re-design conflict panel
2024-12-11 11:33:20 +08:00
leo
36ecbcc4e0
enhance: supports self-host git server ( #733 )
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-12-10 21:38:06 +08:00
leo
55ad194e0e
code_style: remove unused code
2024-12-10 21:09:26 +08:00
github-actions[bot]
9b88db290d
doc: Update translation status and missing keys
2024-12-10 12:57:28 +00:00
leo
93d9a04460
enhance: show reverting commit in banner while reverting is in-progress
2024-12-10 20:57:10 +08:00
leo
2dd9cab695
enhance: try to use friendly name instead of commit hash
2024-12-10 20:23:46 +08:00
leo
3b5d87391d
ux: use Views.NameHighlightedTextBlock instead of plan text for FileCM.ResolveUsing
2024-12-10 16:56:05 +08:00
github-actions[bot]
767de75512
doc: Update translation status and missing keys
2024-12-10 08:44:55 +00: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
github-actions[bot]
3cecb3f888
doc: Update translation status and missing keys
2024-12-10 07:38:27 +00: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
github-actions[bot]
4dd3b7f412
doc: Update translation status and missing keys
2024-12-10 07:18:11 +00: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
github-actions[bot]
0a486a90d9
doc: Update translation status and missing keys
2024-12-10 03:17:52 +00: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
1644b4c8ce
readme: remove unnecessary tips
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-12-10 09:28:35 +08:00
Bernat Borràs Civil
967429cea6
doc: add repository instructions to readme ( #797 )
2024-12-10 09:27:26 +08:00
Данил Бизимов
33625b58da
readme: added appimagehub link ( #798 )
2024-12-10 09:26:15 +08:00
leo
64bedd2ae9
ux: layout for Views.MergeMultiple
2024-12-09 21:21:16 +08:00
github-actions[bot]
2b6210e61c
doc: Update translation status and missing keys
2024-12-09 13:13:16 +00: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
github-actions[bot]
4eed9674b4
doc: Update translation status and missing keys
2024-12-09 13:04:39 +00: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
github-actions[bot]
c9c7fb5d5b
doc: Update translation status and missing keys
2024-12-09 08:44:36 +00: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
github-actions[bot]
3990cc9452
doc: Update translation status and missing keys
2024-12-09 08:36:52 +00: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
leo
a9011ddc2c
readme: update tooltips for Linux users
2024-12-09 10:24:59 +08:00
leo
9f5cbaba09
fix: publish-packages should depends on package and version
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-12-09 09:56:07 +08:00
leo
a263002c83
Merge branch 'master' into develop
2024-12-09 09:36:03 +08:00
leo
4a3ef6267f
Merge branch 'release/v8.42'
2024-12-09 09:35:18 +08:00
leo
3196bd41a6
version: Release 8.42
2024-12-09 09:35:08 +08:00
github-actions[bot]
076ab95614
doc: Update translation status and missing keys
2024-12-09 01:31:58 +00: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
github-actions[bot]
ea130967fb
doc: Update translation status and missing keys
2024-12-08 13:02:51 +00: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
github-actions[bot]
0c04cccd52
doc: Update translation status and missing keys
2024-12-08 09:50:45 +00: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
