Commit graph

1037 commits

Author SHA1 Message Date
leo
c9ce41aef3 feature: supports open in/diff with VSCodium (#102) 2024-05-03 21:54:10 +08:00
Gadfly
2e60c98eee
fix: keep selected commit after _commits var reassigned 2024-05-03 21:04:43 +08:00
leo
1fe050ed0b enhance: if current repository is a worktree of another repository, watch the gitdir to it's main repository's gitdir (#86) 2024-05-03 20:47:59 +08:00
leo
9ae926db9f code_style: rename BoolConverters.BoolToStarOrAutoGridLength to BoolConverters.ToStarOrAutoGridLength 2024-05-03 11:43:33 +08:00
Gadfly
9c6798ef1b
fix: Fixed the issue when the email address is too long and exceeds the scope of the StackPanel 2024-04-30 21:50:30 +08:00
leo
a5150edee0 code_style: rename platform_finder to platformFinder and run dotnet format to apply code style rules 2024-04-29 17:55:38 +08:00
leo
09b8564636 ux: left margin of branch icon 2024-04-29 17:36:00 +08:00
leo
776605cb68 code_review: PR #98
* remove the `Leave` option (it may lead to an undefined behaviour), so user can only choose `Stash & reapply` or `Discard`.
* re-design the UI
* remove unused resources
2024-04-29 17:22:22 +08:00
Alexander Bogomolets
927a1cab24 Add checkout local changes handling
This commit adds the local changes handling behavior for branch checkout.
One of three can be selected: stash and reapply after checkout, discard changes or leave them as is (previous behaviour)
2024-04-29 16:40:20 +08:00
leo
5e6059ba36 ux: hotkey tooltip in buttons 2024-04-29 15:22:06 +08:00
leo
84568e573a feature: test if conflicts have been resolved manually (#96) 2024-04-29 10:54:41 +08:00
leo
df66bacbd2 enhance: reset commit message after a merge request has been aborted 2024-04-29 09:31:04 +08:00
leo
1509b8ab70 ux: right margin for commit message 2024-04-28 17:55:49 +08:00
leo
5d1de37308 optimize: only set Offset from SyncScrollOffset while it's not focused. 2024-04-28 16:50:06 +08:00
leo
d9911b3447 refactor: implementation of synchronous scrolling in side-by-side diff view 2024-04-28 16:46:39 +08:00
leo
32e685622b enhance: disable some MenuItems if repository that linked by node has been auto-removed from Preference (#90). 2024-04-28 13:51:44 +08:00
leo
9b5e8429b9 feature: add hotkey 'F5' to reload/refresh whole repository 2024-04-28 10:19:12 +08:00
leo
28554d1b04 code_review: remove unused codes 2024-04-28 09:56:08 +08:00
leo
8786297d85 ux: remove 'JetBrains' prefix for all products of JetBrains 2024-04-27 22:35:27 +08:00
leo
71b9b3dfea enhance: cache for external tool icons 2024-04-27 22:26:38 +08:00
leo
fdf95e39a7 fix: loading JetBrains Toolbox stage.json crash 2024-04-27 22:05:17 +08:00
leo
9a68418f51 Merge pull request #92 from ennerperez/feature/issues-77
code_review:

* use JsonSerializerContext to avoid AOT warnnings
* since we call TryAdd by interating the installed tools, so detecting by environment variable becomes meaningless (it can not detect tools not installed by Toolbox). Just add it into founded directly
* remove unnecessary type defines
* determine the Icon used by tool while adding it to the founded list.

# Conflicts:
#	src/Native/Linux.cs
#	src/Native/MacOS.cs
#	src/Native/Windows.cs
2024-04-27 21:13:21 +08:00
Enner Pérez
706a833817 Linux Path Fix 2024-04-27 02:36:40 -05:00
Enner Pérez
fe2abee21d Typo Fix 2024-04-27 02:12:12 -05:00
Enner Pérez
53beb3daac JetBrains Toolbox IDE detection 2024-04-27 02:12:03 -05:00
Enner Pérez
ad570eec3b Fallback Icon Implementation 2024-04-27 02:11:38 -05:00
Enner Pérez
59c941dd00 JetBrains Icons Resources 2024-04-27 02:10:51 -05:00
leo
80c864dad7 ux: chevron icon for MenuItem 2024-04-26 21:39:33 +08:00
leo
86c89e0c33 feature: use MERGE_MSG as default commit message while merging (#88) 2024-04-26 21:05:00 +08:00
leo
ea1d0bf6a2 fix: bug - rename local branch name should only check names with other local branches 2024-04-26 14:25:14 +08:00
leo
49abab2903 update: timeout to wait the result of downloading version info 2024-04-26 09:40:02 +08:00
leo
879f3cd76c code_style: replace tab with 2-spaces in xaml 2024-04-24 22:32:55 +08:00
leo
fd2160e56e feature: supports JetBrains Rider (#77) 2024-04-23 16:53:33 +08:00
leo
905db5ca59 ux: show count of stashes and changes in selected stash 2024-04-19 17:35:42 +08:00
leo
fbf1d5aa32 localization: update translations 2024-04-19 14:28:18 +08:00
leo
599ba01f20 ux: re-design Views.Repository
* It's better to move the `Navigate to HEAD` button to the top-right of this page.
* Icons and alignments
2024-04-18 10:50:14 +08:00
leo
8378f018b1 enhance: use restore instead of reset to discard changes (#76) 2024-04-17 20:06:09 +08:00
leo
60a4d21ce7 enhance: AutoFocusBehaviour will move cursor to the end of contents 2024-04-17 17:13:28 +08:00
leo
1e3711e569 refactor: using a new DotBrushProperty instead of calling Application.TryGetResource 2024-04-17 16:16:11 +08:00
leo
3a3c0e717f build: read version from VERSION file 2024-04-17 11:24:25 +08:00
leo
37ca149970 fix: get latest version info from sourcegit-scm.github.io instead of api.github.com (#75) 2024-04-16 09:23:54 +08:00
leo
69d9edf963 ux: add Icons.Submodule.Add 2024-04-15 20:34:58 +08:00
leo
92b80cbcda code_style: remove unnecessary parentheses 2024-04-15 18:07:17 +08:00
leo
fd8f257d6d feature: supports lxterminal on Linux 2024-04-15 18:01:15 +08:00
leo
c617331657 fix: wrong path for sublime text command-line interface 2024-04-15 17:48:52 +08:00
leo
cc6996444e ux: update icon for navigate to current HEAD button 2024-04-15 15:22:32 +08:00
leo
003ad66ccb ux: add menu icon for git-flow 2024-04-15 15:07:07 +08:00
leo
781569c7a0
Merge pull request #74 from walterlv/master
Dont find the path twice
2024-04-15 09:31:50 +08:00
walterlv
25082890ad Dont find the path twice 2024-04-15 09:21:42 +08:00
leo
f3532c4cf2 version: Release 8.8 2024-04-15 09:20:20 +08:00
walterlv
f58cff2cb6 Fix windows terminal startup directory 2024-04-15 08:58:25 +08:00
leo
4a151dd19c code_style: remove unused name declaration 2024-04-14 20:13:07 +08:00
leo
ab26bb83e9 refactor: re-design toolbar of Views.DiffView 2024-04-14 12:27:09 +08:00
leo
7bf6793a11 refactor: detecting programs from the PATH environment variable instead of hard coded (#72) 2024-04-14 11:14:13 +08:00
leo
7b5534a267 code_style: run dotnet format to apply rules defined in .editorconfig 2024-04-13 19:24:45 +08:00
leo
1bb4d55a5c
Merge pull request #69 from gadfly3173/feat/diff-file-mode
feat: show git file mode change if exist
2024-04-13 19:17:44 +08:00
Gadfly
54c9552985
refactor: remove duplicate ObjectConverters, remove unused using 2024-04-13 18:54:46 +08:00
Gadfly
f4e1e0fb6b
fix: use TextTrimming alternative PathConverters 2024-04-13 02:05:26 +08:00
Gadfly
f7dd856e49
fix: enhance diff view by truncating long file paths with ellipsis and adding tooltips for full path display 2024-04-13 01:34:08 +08:00
Gadfly
83728c1a5f
fix: change file mode status postion to right 2024-04-12 21:58:54 +08:00
Gadfly
a249eed1ac
feat: show git file mode change if exist 2024-04-12 21:38:36 +08:00
Gadfly
972b940742
fix: GPG executable file input didn't echo after selected 2024-04-12 19:37:06 +08:00
leo
2d5e048797 Merge branch 'fix/stage-list-count' into develop from PR #68 2024-04-12 10:04:03 +08:00
leo
ede96c298e code_review: review PR #68
* use Converters.ListConverters.ToCount instead of adding two properties to get the count of list.
* adding a new TextBlock to show number of files
2024-04-12 10:03:24 +08:00
leo
d64b7a7824 code_style: private functions should appear after all public functions 2024-04-12 09:41:12 +08:00
Gadfly
0e2da217f1
feat: shows the number of files in the current list on unstaged and staged lists 2024-04-12 01:27:19 +08:00
Gadfly
c0b13bdc8c
fix: Fixed the problem that the AvaloniaRider plugin on Windows cannot display the live preview for Avalonia XAML 2024-04-12 01:23:08 +08:00
leo
f3f39ac593 feature: supports resolving multiple conflicts at once. 2024-04-11 20:50:19 +08:00
leo
057c0be547 ux: change MaxHeight of commit message to 64 to ensure that there are at least 2 items displayed in the change list (#66) 2024-04-10 20:13:56 +08:00
leo
8ab7370409 enhance: use --force to override local refs if it is mismatched with remote's 2024-04-10 11:52:28 +08:00
leo
1dadad7775 ux: disable TextEditor hyperlinks (#65) 2024-04-10 11:02:33 +08:00
leo
1da754afe8 resource: update all icons to 64x64 (since we use this icons in 16x16 size) 2024-04-09 19:19:49 +08:00
leo
b8da3e9afd enhance: use diff command instead of show command to get changes of selected commit. (#56)
* for merge commit, it will shows all changes compare to the first parent of the selected commit now.
2024-04-09 16:02:42 +08:00
leo
217800c83a feature: support Meld as an external merge tool on Linux platform 2024-04-09 15:36:11 +08:00
leo
17fc7ab994 ux: add icons for external merge tools 2024-04-09 15:00:52 +08:00
leo
f0e0c90621 Merge branch 'feature/powershell_supports' into develop 2024-04-09 14:59:15 +08:00
leo
7336a870f7 ux: macOS main menu position 2024-04-09 14:36:32 +08:00
leo
7be7ef161b fix: deepin-terminal commandline argument format 2024-04-09 13:59:55 +08:00
leo
6811103cf4 ux: use RenderOptions.BitmapInterpolationMode="HighQuality" for shell icons 2024-04-09 13:34:42 +08:00
leo
395bd29084 feature: add supports to deepin-terminal 2024-04-09 13:06:27 +08:00
leo
3fd1e0ea19 fix: Windows Terminal is not a built-in app on Windows 10 2024-04-09 11:18:16 +08:00
leo
5c9b92c3db fix: the system default powershell.exe does not recognize the -WorkingDirectory arg 2024-04-09 11:12:22 +08:00
leo
a3c81745aa enhance: add -WorkingDirectory and -Nologo arguments for PowerShell 2024-04-09 10:49:36 +08:00
leo
4882fd9d69 refactor: external tools and shells
* rename Models.ExternalMergeTools to Models.ExternalMerger
* supports Git Bash/PowerShell/Command Prompt/Default Shell in Windows Terminal
2024-04-09 10:41:37 +08:00
leo
4ac705f8ca feature: add powershell support for Windows 2024-04-08 17:39:52 +08:00
leo
8f70778ec2 version: Release 8.7 2024-04-08 10:49:48 +08:00
leo
8adf11b64c fix: crash when create image from a empty stream 2024-04-08 10:24:28 +08:00
leo
75f6087447 update: unify all external tool icons to 128 x 128 2024-04-08 10:01:17 +08:00
leo
8dd1ce9185 refactor: rewrite Commands.QueryFileContent and use it instead of GetImageFileAsBitmap 2024-04-08 09:57:41 +08:00
leo
9a4f928ece fix: DataGrid does NOT scroll when navigation target is the same as current selected in Views.Histories. (#58) 2024-04-07 21:19:02 +08:00
leo
d09e81b80a fix: remove unused using 2024-04-07 20:06:04 +08:00
leo
24b6e39066 feature: add context menu for changes in Views.CommitDetail and Views.RevisionCompare to diff with external merge tool (#53) 2024-04-07 20:02:43 +08:00
leo
b5b1f0cb8d refactor: add ExternalEditorFinder to detect supported external editors 2024-04-07 17:56:53 +08:00
leo
482fab97c0 ux: update Icons.Tree 2024-04-07 15:17:02 +08:00
leo
a8d06ce042 ux: set RenderOptions.BitmapInterpolationMode = BitmapInterpolationMode.HighQuality for avatars 2024-04-07 15:00:18 +08:00
leo
416b839df5 localization: use x:String instead of declare a new namespace for System.String 2024-04-07 10:06:17 +08:00
leo
e5be649a2d fix: Github REST API access rate limit (#60) 2024-04-07 09:54:35 +08:00
leo
400d454478 enhance: a more adaptable regular expression for remote URLs (#61) 2024-04-06 18:11:49 +08:00
leo
040a6d4bba refactor: use axaml resource to manage locales instead of resx 2024-04-06 18:06:32 +08:00
leo
1196fabfc1 feature: external editor supports Sublime Text 2024-04-06 15:31:13 +08:00