Commit Graph

3992 Commits

Author SHA1 Message Date
github-actions[bot]
2b7bd2e2cc doc: Update translation status and sort locale files 2025-07-04 09:13:01 +00:00
leo
ffc06f7574 feature: support to open submodule change histories from context menu
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 17:12:40 +08:00
leo
21db4905e8 code_review: PR #1510
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 17:01:28 +08:00
Nathan Baulch
71a743c80a enhance: use regex to fix branch names (#1510) 2025-07-04 16:55:05 +08:00
github-actions[bot]
81fe7af19f doc: Update translation status and sort locale files 2025-07-04 08:53:56 +00:00
leo
5687265582 feature: supports git submodule set-url -- <path> <new_url> (#1506)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 16:53:27 +08:00
leo
cdb84c7c43 typo: ShowDailog -> ShowDialog
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 15:36:45 +08:00
leo
a6ebc1502c refactor: show child-window and modal dialog
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 14:49:04 +08:00
github-actions[bot]
4bfcfb8b24 doc: Update translation status and sort locale files 2025-07-04 03:38:50 +00:00
leo
937ad0c708 feature: add Update Submodule context menu entry for selected submodule
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 11:38:34 +08:00
github-actions[bot]
c54b6c235e doc: Update translation status and sort locale files 2025-07-04 03:00:44 +00:00
leo
56a9447e19 feature: supports to move selected submodule (#1507)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 11:00:24 +08:00
leo
6290378486 fix: local changes did not refresh after .gitmodule changed (#1508)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 10:04:31 +08:00
leo
2263e43203 fix: Move Repository Node popup never close
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 21:15:01 +08:00
leo
9ecf83d1d6 enhance: use ConfigureAwait for commands to query submodules
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 20:57:03 +08:00
leo
c499978198 feature: supports to switch change display mode in STASHES page (#1504)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 20:42:15 +08:00
leo
92ab85bb3f enhance: do not warn when creating branch with current detached HEAD
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 20:11:21 +08:00
leo
f33edb7601 Merge branch 'develop' into feature/async 2025-07-03 19:13:37 +08:00
leo
b6c8190d4e fix: text diff view in commit detail panel may display wrong data when switching between repositories (#1503)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 19:06:26 +08:00
leo
18b9d982ce refactor: remove ConfigureAwait when we need to go back to UIThread after it
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 18:42:56 +08:00
leo
2a0f9f4192 fix: onSure is not asigned to Views.Confirm.OnSure
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 17:49:39 +08:00
leo
40765826ce code_review: PR #1492
- Remove all synchronous method in commands
- `Command.ReadToEndAsync` now is protected method
- Rename `ResultAsync` to `GetResultAsync`
- Call `ConfigureAwait(false)` when there's no context

Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 17:30:06 +08:00
Nathan Baulch
463e304491 feature: async (#1492)
* Async command methods
* Async `Task.Run` where possible
* Remove redundant `Task.Run` in `Sure` methods
* Remove leftover braces and reformat
* Async event handlers as needed
2025-07-03 15:38:39 +08:00
leo
3b8dcd72ee ux: grid lines brush for DataGrid
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 15:36:13 +08:00
leo
d8bc3f924a fix: PR #1501
- returns `null` to fallback to git's `merge.ff` configure when user does not configure `Preferred Merge Mode`
- since `GetGitConfigBranchMergeOptions` is the last one, returns `Default` as fallback

Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 15:30:23 +08:00
Nathan Baulch
b40ad9ad86 ux: better lossless PNG compression (#1500) 2025-07-03 15:22:02 +08:00
Sina Hinderks
35d681dd50 fix: merge.ff is ignored (#1501)
After changing the priority of the preferences/configurations for the
merge mode in #1495, the git configuration `merge.ff` was ignored.  The
reason is, that `GetSettingsPreferredMergeMode()` does not return `null`
in the default case.  This is now fixed.
2025-07-03 15:20:03 +08:00
leo
3fe72e919c code_review: PR #1497
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 11:15:14 +08:00
Nathan Baulch
ec17ea9901 code_style: general cleanup (#1497) 2025-07-03 10:32:03 +08:00
Sina Hinderks
baeef2d924 fix: too many closing curly braces (#1496) 2025-07-03 10:25:28 +08:00
leo
5240222846 code_review: PR #1495
- remove unused namespace using
- prefer to use repository's configuration than the global `merge.ff`

Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 10:24:43 +08:00
Sina Hinderks
626a20ac97 enhance: respect git config merge.ff (#1495)
This adds another configuration possibility for the default merge mode
to the already existing per branch git configuration
`branch.<name>.mergeoptions` (#540) and the per repo preference
"Preferred Merge Mode" (#1156).

Defined values:
 - `false`: do no fast-forward merge
 - `only`: do only a fast-forward merge

This is configurable by for example `git config set --global merge.ff
<value>` for a global (meaning the current user) configuration.

The priority between these configurations/preferences is:

 - git configuration `branch.<name>.mergeoptions` (#540)
 - git configuration `merge.ff`
 - preference "Preferred Merge Mode" (#1156)
2025-07-03 10:20:44 +08:00
github-actions[bot]
b7d1f936a8 doc: Update translation status and sort locale files 2025-07-03 02:15:59 +00:00
Sina Hinderks
e8523f14cd localization: update German translations (#1494) 2025-07-03 10:15:44 +08:00
leo
501bf03fc7 fix: only trigger deleting tag when pressing Key.Delete or Key.Back (#1412)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-02 18:00:10 +08:00
leo
945c63c78a ux: add badge for global custom actions (#1490)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-02 16:24:48 +08:00
leo
3a1827eb3d code_review: PR #1489
- Remove unnecessary `CallUIThread` in `ViewModels.Clone`
- Code style

Signed-off-by: leo <longshuang@msn.cn>
2025-07-02 13:16:49 +08:00
Nathan Baulch
25afcba44b refactor: auto dispatch notifications to UI thread in Launcher (#1489) 2025-07-02 13:09:30 +08:00
leo
19d82243a9 ux: re-design custom action control editor
Signed-off-by: leo <longshuang@msn.cn>
2025-07-02 11:45:28 +08:00
github-actions[bot]
4b291658b5 doc: Update translation status and sort locale files 2025-07-02 03:37:09 +00:00
leo
a3f17f7a7e ux: re-design custom action control editor
Signed-off-by: leo <longshuang@msn.cn>
2025-07-02 11:36:17 +08:00
leo
44ea8cb04a ux: re-design custom action control editor
Signed-off-by: leo <longshuang@msn.cn>
2025-07-02 11:24:45 +08:00
Nathan Baulch
4f266a2342 ci: code format check (#1487) 2025-07-02 10:54:22 +08:00
leo
fc188e2344 code_review: PR #1484
- Check `Type` instead of `Name` while selecting external shell/terminal
- External merge tool named `Custom` is not supported
- Add `try-catch` statement to other file pickers in `Preferences` window

Signed-off-by: leo <longshuang@msn.cn>
2025-07-02 10:38:54 +08:00
Enner Pérez
118894907e fix: Custom Shell/Terminal or Diff/Merge Tool crash fix (#1484)
* fix(1483): FilePickerOpenOptions Fix
* fix(1483): Missing Try Cath Block
2025-07-02 10:25:38 +08:00
github-actions[bot]
db5efbd3fa doc: Update translation status and sort locale files 2025-07-01 14:04:03 +00:00
leo
e1bbbe042d feature: supports to use ComboBox input control in cutom actions (#1482)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-01 22:01:12 +08:00
leo
9a7be7e4ca enhance: prefer to use default clone dir of current workspace (#1454)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-01 20:45:59 +08:00
leo
13215d5c33 fix: double-click change in INFORMATION tab does not switch to CHANGES tab
Signed-off-by: leo <longshuang@msn.cn>
2025-07-01 20:19:32 +08:00
leo
a7fc8effc2 enhance: pre-fill SearchChangeFilter in Dir Histories window (#1470)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-01 16:28:29 +08:00