Commit graph

3271 commits

Author SHA1 Message Date
leo
ddfc868df3
ux: re-design merge option style
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 15:08:49 +08:00
leo
10fd0f9d15
doc: fix typo
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 12:02:32 +08:00
leo
99a45335fe
doc: group third-party components by types
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 12:01:29 +08:00
leo
8f8385072c
doc: add third-party components
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 11:56:38 +08:00
Gadfly
a480ba0139
docs: Add third-party components and licenses section
(cherry picked from commit 95c697248755f7b6de4d2d0bfdaa9de1e572c9f6)
2025-03-17 11:47:51 +08:00
Gadfly
4b41029768
fix: use better JSP grammar file and add licensing information (#1102) 2025-03-17 11:31:50 +08:00
leo
6273c01d71
fix: git rev-list raises errors after selected commit in Histories page (#1101)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 10:55:54 +08:00
Gadfly
450dadf76c
feat: Add JSP grammar support and improve TextMateHelper file type handling (#1100)
- Extend grammar support by allowing multiple file extensions per grammar and adding JSP file type handling.
- Add a new JSON grammar file for JavaServer Pages (JSP) syntax highlighting.
2025-03-17 10:12:44 +08:00
leo
7caa03a09b
project: upgrade AvaloniaEdit to 11.2.0
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 09:57:52 +08:00
leo
d9cf849b9f
Merge branch 'master' into develop 2025-03-17 09:38:30 +08:00
leo
6fd6bbb6b5
Merge branch 'release/v2025.09' 2025-03-17 09:37:49 +08:00
leo
34f8618989
version: Release 2025.09
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 09:37:40 +08:00
leo
84979b20b3
ux: force using VertialAlignment="Center" for sign info of commit (#1098)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 09:32:31 +08:00
Gadfly
66517fd4bf
enhance: add tooltips to various UI elements for better accessibility (#1097)
* enhance: add tooltips to various UI elements for better accessibility

* refactor: simplify user string conversion
2025-03-16 11:23:42 +08:00
github-actions[bot]
a46e52582f doc: Update translation status and missing keys 2025-03-14 08:57:15 +00:00
Asurada
db504241ea
feat: add translation for "1 hour ago" in multiple languages (#1096) 2025-03-14 16:57:03 +08:00
leo
c3e1fb93b6
refactor: fix maxOS PATH env
Signed-off-by: leo <longshuang@msn.cn>
2025-03-14 10:54:09 +08:00
leo
c8bee2f6ba
code_review: PR #1093
Merge deleting branch and tag on remote into `SourceGit.Commands.Push(repo, remote, refname, isDelete)`

Signed-off-by: leo <longshuang@msn.cn>
2025-03-14 09:36:34 +08:00
Michael Pakhantsov
9645b65db6
Explicitly provided fully qualified reference for the git branch, becase can be exists a tag and a branch with identical names (#1093)
Fix push command for branch deletion

Updated the `push` command to use `--delete refs/heads/{name}` instead of `--delete {name}` for clearer branch reference when deleting a remote branch.

Co-authored-by: Michael Pakhantsov <michae.pakhantsov@gmail.com>
2025-03-14 09:26:59 +08:00
leo
67f4330dd4
code_style: arrange methods in App.axaml.cs
Signed-off-by: leo <longshuang@msn.cn>
2025-03-13 15:23:43 +08:00
leo
9560496c7b
code_review: PR #1092
- Remove `SourceGit.ViewModels.Preference.FixFontFamilyName` (it is not necessary any more)
- Use `string.Join` instead of `StringBuilder` to make the logic more clear

Signed-off-by: leo <longshuang@msn.cn>
2025-03-13 15:17:20 +08:00
Gadfly
b9b684a83d
fix: improve font string processing in SetFonts method (#1092) 2025-03-13 15:05:30 +08:00
github-actions[bot]
519bdf1ddc doc: Update translation status and missing keys 2025-03-13 02:22:09 +00:00
leo
0e261cffd2
refactor: rewrite the way to deal with uncommitted local changes when checkout/pull/create branch (#1085)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-13 10:21:54 +08:00
leo
e430e847ff
enhance: auto convert spaces with dashes while renaming a branch (#1088)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-13 09:50:42 +08:00
Gadfly
7331167be2
fix: schedule DWM frame extension to next render frame on Windows 10 (#1087)
The DwmExtendFrameIntoClientArea call needs to be posted to the next render frame to ensure the window handle is fully initialized and avoid potential race conditions.
2025-03-13 09:38:08 +08:00
Morgan Courbet
f07832c385
docs: fix typo in README.md
(cherry picked from commit 59fd2aaab1)
2025-03-13 09:24:43 +08:00
leo
e4f5c34e0c
code_style: remove whitespaces
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 17:58:57 +08:00
leo
eaa322dfab
enhance: re-design commit search result display (#1083)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 17:57:31 +08:00
leo
77d8afe056
refactor: reduce the times to call RefreshLayout
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 15:10:43 +08:00
leo
0476a825ef
code_style: move some code from Histories.axaml to separate files
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 14:58:59 +08:00
leo
bb2284c4c9
refactor: re-write commit searching (part 3)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 11:53:24 +08:00
leo
ee7ccc0391
refactor: re-write commit searching (part 2)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 11:05:19 +08:00
leo
231f3bf668
enhance: use --ancestry-path=<commit_oid> to reduce unnecessary outpus while querying children commits
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 10:11:00 +08:00
leo
f5d6e1264d
refactor: use List<T> instead of AvaloniaList<T> since it is not used for bindings
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 23:01:34 +08:00
leo
64a41dce39
refactor: rewrite searching commit by file path
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 20:55:39 +08:00
leo
fa4d9d24e9
enhance: hide suggestion popups when window is deactived (#963)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 20:22:32 +08:00
leo
91c5c96afc
fix: accessing dummy in multi-threads throws exception
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 20:05:34 +08:00
leo
2fc03025ee
fix: file suggestion popup did not show while searching commit by file path
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 19:52:50 +08:00
leo
471452646b
refactor: use System.Threading.CancellationToken instead of SourceGit.Commands.Command.CancelToken to cancel fetching information of selected commit
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 16:53:51 +08:00
leo
f23e3478e6
fix: do not save preference in design mode
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 11:41:37 +08:00
leo
54d49a9eda
fix: app crashes when close a repository on read-only drive (#1080)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 09:36:13 +08:00
leo
5f2bd8ad94
ux: layout for Preferences window
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 09:27:32 +08:00
leo
f54c8877d7
Merge pull request #1079 from AquariusStar/develop_translation_russian
update russian localization
2025-03-11 09:21:20 +08:00
Михаил Усоцкий
f496d15f70 update russian localization 2025-03-10 20:15:29 +03:00
leo
cf8cff6b64
code_style: add ViewModels.Repository.GetCustomAction(scope)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-10 21:30:04 +08:00
leo
5c279b4b56
feature: add global configuration for custom action (#1077)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-10 21:19:38 +08:00
leo
0f9087fac6
code_review: PR #1078
- Remove `ForceEnglishLocale` because we want all `git` outputs in English
- Remove locale settings for `ExecuteCustomAction`

Signed-off-by: leo <longshuang@msn.cn>
2025-03-10 20:08:42 +08:00
Gadfly
860f52153b
fix: Force English locale in branch query command. (#1078) 2025-03-10 20:05:37 +08:00
leo
b4fbc2372b
enhance: show commit info tip when hover SHA in conflict view
Signed-off-by: leo <longshuang@msn.cn>
2025-03-10 20:02:09 +08:00