Commit graph

979 commits

Author SHA1 Message Date
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