3719 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
github-actions[bot]	b94f26a937	doc: Update translation status and sort locale files	2025-05-31 04:15:23 +00:00
Javier J. Martínez M.	8e5d5b946e	localization: update spanish translations (#1379) ... add missing translations	2025-05-31 12:15:06 +08:00
leo	a9734ea8e9	code_style: remove unused code ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-31 11:33:22 +08:00
github-actions[bot]	e22f0f8513	doc: Update translation status and sort locale files	2025-05-30 10:20:10 +00:00
leo	8b17f3b1f4	localization: change Compare with HEAD to Compare with <current_branch_name> ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-30 18:19:46 +08:00
leo	7934496cff	feature: reset non-active branch to selected commit should not depends on upstream ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-30 17:56:06 +08:00
leo	188408fdfc	project: remove duplicated attributes in csproj ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-30 17:21:49 +08:00
leo	bc5deac9fe	fix: OpenFolderPickerAsync raise exception when selected a drive root such as E:\ ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-30 17:12:56 +08:00
leo	1bd2044589	ux: show conflict description in change status icon ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-30 11:20:43 +08:00
leo	f0c77ffeb8	code_style: run dotnet format ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-30 11:16:07 +08:00
leo	60cd210b80	fix: using theirs or mine does not work if it is deleted by ours or theirs ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-30 11:13:29 +08:00
leo	75015d550c	ux: show conflict short format in changes view ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-30 10:42:02 +08:00
leo	e40ca4bbe0	refactor: use git restore instead of git reset to unstage local changes (#1373) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-30 09:43:45 +08:00
leo	46231a759c	code_style: run dotnet format ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-28 15:17:05 +08:00
leo	fbc8edcc13	feature: show conflict reason ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-28 14:20:56 +08:00
github-actions[bot]	3437f5f4a9	doc: Update translation status and sort locale files	2025-05-28 02:19:23 +00:00
leo	40bf69bff3	ux: move some buttons to page switcher (#1370) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-28 10:18:34 +08:00
leo	2aac6779a5	fix: squash should not change the original author ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-28 09:50:14 +08:00
cdammanintopix	9affca1fb2	fix: arguments order for checkout command (#1368)	2025-05-27 17:43:33 +08:00
Gadfly	729e06d5c0	fix: SaveAsPatch for untracked changes in stash (#1366)	2025-05-26 22:50:29 +08:00
leo	826619e7c9	fix: new added file in stash changes may not come from untracked file but from staged files (#1358) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-26 22:13:10 +08:00
github-actions[bot]	056b90a5ae	doc: Update translation status and sort locale files	2025-05-26 04:28:23 +00:00
leo	0641a22230	feature: allow to reset author when --amend is enabled for committing	2025-05-26 12:28:00 +08:00
leo	d3bc85418e	Merge branch 'master' into develop	2025-05-26 09:56:00 +08:00
leo	4887252870	Merge branch 'release/v2025.19'	2025-05-26 09:45:48 +08:00
leo	860f6f2369	version: Release 2025.19 ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-26 09:45:43 +08:00
leo	cfc80d41a1	fix: sometimes track status is not correct because the local branch name is ambiguous to git ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-26 09:42:46 +08:00
leo	ac26d5bb06	fix: can not squash and fixup until first picked/edit/reword commit in interactive rebase exists list (#1362) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-25 13:46:27 +08:00
github-actions[bot]	d7c3bb7150	doc: Update translation status and sort locale files	2025-05-25 05:05:31 +00:00
AquariusStar	39d955b033	localization: update russian translate (#1363)	2025-05-25 13:05:14 +08:00
leo	0e35c56529	enhance: disable squash and fixup for the first commit in interactive rebase list (#1362) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-25 13:03:36 +08:00
leo	22339ab619	enhance: allow to use arrow keys to select changes up/down after stage/unstage previous selected changes by hotkey (#1361) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-24 21:29:48 +08:00
leo	ef53dd0025	refactor: use a new Models.ChangeState.Conflicted to represent all the unmerged file state (#1359) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-24 20:25:05 +08:00
Göran W	30d4c1008a	enhance: don't show unmerged files in STAGED area (#1359) ... Unmerged files (i.e unresolved conflicts) should only appear in the Unstaged area, and not "duplicated" in the Staged area. Motivation: * The user-friendly git-status command does not show these as "Changes to be committed". * If they appear in the Staged area, they are quite redundant since the Diff view will just show "No changes or only EOL changes". * Some other Git UIs (like Fork) don't show these as Staged items either. NOTE: According to docs for the git-status "Short Format" (and --porcelain=v1), the XY fields for Unmerged paths do NOT actually represent the Index & Working-tree states, instead they represent the states introduced by each HEAD in the merge (i.e Ours & Theirs, relative to Base).	2025-05-24 19:42:10 +08:00
leo	ca33107a45	code_review: PR #1360 ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-24 19:26:17 +08:00
Göran W	4363b8b6aa	refactor: add new constant Models.Commit.EmptyTreeSHA1 (#1360)	2025-05-24 19:23:28 +08:00
Göran W	f3fe90b2e1	fix: IsConflictResolved check should not be done for submodules (#1356) ... A submodule conflict is not resolved until it's Staged.	2025-05-24 09:40:17 +08:00
leo	e28b75b860	enhance: include stdout in error popup when git process (in Exec mode, we do not need to parse its output) exit with non-zero code ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 16:12:40 +08:00
leo	3377886bab	enhance: filter hint: blocks ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 14:13:48 +08:00
leo	4807cd5eb2	fix: if font family name contains '#', make sure we have that built-in font ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 13:32:02 +08:00
github-actions[bot]	d21b790784	doc: Update translation status and sort locale files	2025-05-23 04:25:41 +00:00
Javier J. Martínez M.	764ae31239	localization: update spanish translations (#1355) ... * localization: update spanish translations add missing translations * Update es_ES.axaml Quickfix for `Text.DeinitSubmodule.Force` translation	2025-05-23 12:25:29 +08:00
github-actions[bot]	38d67d7f17	doc: Update translation status and sort locale files	2025-05-23 03:28:10 +00:00
leo	76a197aae7	feature: supports to overwrite existing branch while creating new branch (#1349) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 11:27:45 +08:00
leo	594ffc0d1a	localization: fix typo in en_US for Text.DeinitSubmodule.Force ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 10:38:44 +08:00
leo	fb1f5638ce	code_style: simpfy context menu creation for blame editor ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 10:31:11 +08:00
leo	492da8dd57	fix: blame highlight background did not update when using scrollbar (#1354) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 10:27:48 +08:00
leo	0ae39faad1	enhance: do not show hint: messages in error popup, but leave it in git command logs (#1348) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 10:05:09 +08:00
leo	c112549b69	refactor: query branch head after operation finished to avoid branch head mismatch ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 09:40:15 +08:00
Göran W	9fb8af51ff	code_style: move hardcoded brush/strings (for outlier Conflict-icon) into named constants (#1350) ... This makes code more consistent and gives better overview of all the icons. (Potentially, this special/outlier icon could be moved into the existing arrays as an extra ChangeState enum-value.)	2025-05-23 09:18:05 +08:00