2845 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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)	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	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	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
GadflyFang	c062f27081	fix: Dispose _autoFetchTimer before _setting set to null (#792) ... Signed-off-by: Gadfly <gadfly@gadfly.vip>	2024-12-06 15:09:14 +08:00
Bernat Borràs Civil	c2252266ce	Update Spanish translation (#791) ... * 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)	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