2359 commits

Author	SHA1	Message	Date
Nils van Rijsinge	dd85760b7a	localization: add missing de_DE keys (#817) ... * localization: add missing de_DE keys BranchCM.MergeMultiBranches, CommitCM.MergeMultiple, MergeMultiple #793 CommitCM.Merge 2053ce033d CommitDetail.Files.Search 894f3e9b03 Diff.UseBlockNavigation #703 FileCM.ResolveUsing 3b5d87391d Hotkeys.Global.Clone bea2a39feb InProgress.CherryPick.Head e1df5c52f1 InProgress.Merge.Operating ef40e4b738 InProgress.Rebase.StoppedAt, Repository.Skip #790 InProgress.Revert.Head 93d9a04460 Merge.Source 2504a52398 WorkingCopy.CommitToEdit c1368212df * localization: consistently use clone with 'k' for most other keys a more "germanized" version with a k is used rather than a c	2024-12-16 09:50:59 +08:00
leo	f986e59a94	fix: tag filter hidden behind the scroll bar (#815) ... Signed-off-by: leo <longshuang@msn.cn>	2024-12-14 20:25:25 +08:00
leo	0a0e2bc044	enhance: only create squash menu item if it is needed	2024-12-13 16:24:39 +08:00
leo	24b6153226	ux: context menu of selected commits ... * update English translation * re-order the menu items	2024-12-13 16:02:10 +08:00
leo	751991c816	refactor: rewrite the way reading full message of commit	2024-12-13 11:00:03 +08:00
leo	a99bd2e973	enhance: only dispatch error message if it contains valid data	2024-12-13 10:43:39 +08:00
Ezra	26923435e7	enhance: improve readability of default clone dir errors. (#813)	2024-12-13 10:08:47 +08:00
leo	02658839c2	enhance: notification popup	2024-12-13 10:08:26 +08:00
leo	6eb226eb44	fix: wrong whitespace at start of the last commit message while interactive rebasing (#790)	2024-12-12 20:01:10 +08:00
leo	59f11e9aca	fix: original FullMessage missing line-endings (#790)	2024-12-12 19:38:02 +08:00
leo	c4c7bef93c	ux: update Icons.Commit	2024-12-12 17:14:04 +08:00
leo	27afe1871f	fix: tooltip of commit sha did not close properly (#810)	2024-12-12 14:40:47 +08: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)	2024-12-10 21:38:06 +08:00
leo	55ad194e0e	code_style: remove unused code	2024-12-10 21:09:26 +08: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
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) ... 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
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	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)	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) ... - 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) ... 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)	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	1c0d8a2697	fix: git rev-list do not support --decorate-refs-exclude (#746) ... Do not use histories filters to query commit children	2024-11-27 17:06:44 +08:00
leo	d38d1b11e8	fix: typo in Text.Preference.General.ShowChildren	2024-11-27 15:27:57 +08:00
leo	c5d82eb719	ux: new style for ToggleButton.toggle_untracked	2024-11-27 11:10:44 +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	4fc32b2b59	fix: crash due to font family name is an empty space (#745)	2024-11-27 09:17:18 +08:00
leo	bb41fcea3e	fix: DisplayRange is not updated when text diff view is opened for the first time	2024-11-26 19:52:13 +08:00
leo	a1c48dd11b	project: upgrade AvaloniaUI to 11.2.2	2024-11-26 14:39:58 +08:00
leo	78fcc0117e	ux: style for tooltip ... Signed-off-by: leo <longshuang@msn.cn>	2024-11-25 11:42:48 +08:00
Chiahong	57d4842435	localization: update zh_TW.axaml (#739)	2024-11-25 09:28:55 +08:00
AquariusStar	772f1a93b4	localiztion: update (#738)	2024-11-25 09:28:36 +08:00
Nils van Rijsinge	831462b594	Add missing de_DE keys (#737) ... * localization: add missing de_DE keys - CommitDetail.Info.Children, General.ShowChildren were added in cc5bb5f - Text.Fetch.Force was added in 153a1f3 - Repository.HistoriesOrder... were added in b25f9bd - SHALinkCM.NavigateTo was added in 12f7531 * localization: fix invalid XAML	2024-11-25 09:28:09 +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 ... 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	693940368b	code_style: remove unused variable ... Signed-off-by: leo <longshuang@msn.cn>	2024-11-24 10:20:40 +08:00
Dmitrij D. Czarkoff	e3d6ee0f40	fix: better https regex (#735) ... Fixes #733	2024-11-24 10:15:17 +08:00
Dmitrij D. Czarkoff	546f628470	fix: don't reverse commit order when cherry-picking (#736) ... Fixes #726. Looks like a980cc987d isn't sufficient. It sorts the commits according to the ordering in history, but then CherryPick ViewModel reverses the order. This commit changes CherryPick ViewModel to use string.Join on the commit list without reordering, so that the ordering is controlled entirely by the caller.	2024-11-24 09:32:47 +08:00
leo	cd96a28545	fix: typo in English (#731) ... Signed-off-by: leo <longshuang@msn.cn>	2024-11-22 18:47:06 +08:00
Martin Garstenauer	3ae3c587d8	fix: typo in English (#731)	2024-11-22 18:43:45 +08:00
leo	c78e2e59d9	enhance: git format-patch ... * use `--output=<file>` instead of `-o <dir>` to avoid failure because the directory cannot be created * make generated patches in order when format multiple commits Signed-off-by: leo <longshuang@msn.cn>	2024-11-22 18:40:59 +08:00
leo	c50508d4ac	fix: try to fix the issue that the branch tree did not update after deleting multiple branches (#729) ... Signed-off-by: leo <longshuang@msn.cn>	2024-11-22 10:42:53 +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	c1c743f2ff	readme: add tips for Linux users ... Signed-off-by: leo <longshuang@msn.cn>	2024-11-22 09:17:56 +08:00
leo	1e148c032d	localization: update English translations ... Signed-off-by: leo <longshuang@msn.cn>	2024-11-21 21:10:15 +08:00