Commit graph

1188 commits

Author SHA1 Message Date
leo
f4d379e3b8
Merge pull request #153 from Hammerliu/fix_crash
Fix the crash caused by pushing without a branch
2024-05-29 22:05:37 +08:00
leo
ea1bfad84d revert: disable double-click folding/unfolding because it will cause IndexOutOfRange exception 2024-05-29 21:56:03 +08:00
DESKTOP-L3MJ80L\hamme
7ec21e2e53 Fix the crash caused by pushing without a branch 2024-05-29 21:31:46 +08:00
leo
a382a3e564 revert: csproj changes for debuging 2024-05-29 20:51:24 +08:00
leo
9d13b17aaf feature: double-click on single-selecte change tree or file tree will expand/collapse folder node 2024-05-29 20:48:51 +08:00
leo
cce4e5348c Merge branch 'develop' into feature/treedatagrid 2024-05-29 19:44:45 +08:00
leo
ec2d9c4cbe enhance: the character between version's minor and build part maybe '-' 2024-05-29 19:43:46 +08:00
leo
025d468b40 code_review: PR (#152) 2024-05-29 18:53:38 +08:00
leo
13f7279c45
Merge pull request #152 from gadfly3173/fix/git-version
feat: show tooltip if git version too low
2024-05-29 17:56:18 +08:00
Gadfly
2f7ef1ef2b feat: show tooltip if git version too low 2024-05-29 17:47:34 +08:00
leo
7154221946 ux: new style for ChangeViewModeSwitcher 2024-05-29 17:31:01 +08:00
leo
fdc41515b7 ux: remove text decorators of commit SHA in the left panel of FileHistories 2024-05-29 17:08:41 +08:00
leo
f8b327746c Merge branch 'develop' into feature/treedatagrid 2024-05-29 16:45:51 +08:00
leo
0b09d210be feature: allow to ignore local changes also when switching branch or pulling changes (#151) 2024-05-29 16:42:47 +08:00
leo
98fdff7543 code_style: code cleanup 2024-05-29 16:01:12 +08:00
leo
012e28ec8d ux: alignment for commit changes in CommitDetail page 2024-05-29 14:25:43 +08:00
leo
179887339e Merge branch 'develop' into feature/treedatagrid
# Conflicts:
#	src/Views/CommitDetail.axaml
2024-05-29 13:09:25 +08:00
leo
69f9dceece feature: new way to display changes of submodules 2024-05-29 12:50:26 +08:00
leo
1161738df9 enhance: a more adaptable regular expression for remote URLs (#149) 2024-05-29 11:20:15 +08:00
leo
b192a1c423 refactor: use TreeDataGrid instead of TreeView/DataGrid to improve performance (#148) 2024-05-29 10:42:24 +08:00
leo
52ef0db427 feature: add a context menu item to compare selected branch/revision with current worktree 2024-05-27 21:05:15 +08:00
leo
211e4b24c1 ux: layout for CheckoutCommit 2024-05-27 20:09:19 +08:00
leo
4249653ed6 feature: add context menu for both branch and commit to compare selected with current HEAD 2024-05-27 17:21:28 +08:00
leo
1040bbe4d2 feature: add buttons to increase/decrease visible lines in text diff view (#145) 2024-05-27 10:29:15 +08:00
leo
8d27690473 code_style: keep ux/code in a uniform style 2024-05-26 14:35:57 +08:00
leo
66f2aab6a7 code_review: review for PR (#147)
* code style
* localizations for zh_CN
2024-05-26 14:25:21 +08:00
leo
e00bc4e630
Merge pull request #147 from filipeRmlh/feature/allowing_to_checkout_commit
Feature/allowing to checkout commit
2024-05-26 13:37:59 +08:00
leo
dc63e39c69 fix: warning about EnumConverters.Equals 2024-05-26 12:17:15 +08:00
Filipe Ramalho
db9ca5ba25
Merge branch 'develop' into feature/allowing_to_checkout_commit 2024-05-25 15:43:27 -03:00
Filipe Ramalho
8aa1690cde Adding checkout commit menu and dialog 2024-05-25 15:11:24 -03:00
Filipe Ramalho
b0c00340a8 Making local detached branch HEAD as the first item below folders 2024-05-25 15:09:40 -03:00
Filipe Ramalho
4750ad0d07 Adding HEAD decorator markup in the Graph 2024-05-25 15:05:32 -03:00
Filipe Ramalho
8aeb7ed17c Adding command to checkout commit 2024-05-25 14:27:42 -03:00
leo
5f333fc781 ux: using SystemAccentColor instead of Color.Accent1 2024-05-25 20:06:49 +08:00
leo
a52124c479 feature: add Do Nothing option to deal with local changes before creating a new branch (#143) 2024-05-25 19:40:30 +08:00
leo
9f0ec7d60d ux: search box corner radius 2024-05-25 11:50:59 +08:00
leo
754a2527f5 feature: allow changing of tracking branch on push (#142) 2024-05-25 11:37:06 +08:00
leo
8e3a8f4c06 optimize: new way to update corner radius of branch tree node to improve performance (#137) 2024-05-25 11:15:07 +08:00
leo
476f9265e1 fix: at least two selected branches are required 2024-05-25 01:36:08 +08:00
leo
6fe96d629a feature: allow deleting multiple branches at one time (#137) 2024-05-25 01:31:59 +08:00
leo
99794e7ff7 localization: update Text.CreateTag.GPGSign 2024-05-24 10:57:19 +08:00
leo
c10778c413 enhance: add an option to push tag to all remotes after created (#141) 2024-05-24 10:47:37 +08:00
leo
b556feb3d3 enhance: tag creation & pushing (#141)
* supports creating lightweight tags
* supports GPG signed tags
* add option to push selected tag to all remotes
2024-05-24 10:31:20 +08:00
leo
0dea7ed0e2 fix: context menu did NOT closed after its placement target being recycled (#140) 2024-05-23 21:24:22 +08:00
leo
e9208ef112 ux: titlebar height on macOS 2024-05-23 09:44:56 +08:00
leo
82b00b357b ux: change delay time to show/hide scrollbar (#139) 2024-05-22 09:55:41 +08:00
leo
717e6b4faf enhance: a more adaptable regular expression for remote URLs (#136) 2024-05-21 14:35:14 +08:00
leo
0aea822499 enhance: remote ssh private key validation 2024-05-21 11:52:30 +08:00
leo
ef20c174ae ux: tabs using system accent color 2024-05-21 11:06:05 +08:00
leo
2e58da7c2a ux: use SystemAccentColor and SystemListLowColor 2024-05-21 10:54:19 +08:00
leo
8fea9fecfb refactor: implementation to delete branches 2024-05-21 09:58:31 +08:00
leo
5eea54dbf8 fix: wrong popup title for editing remote 2024-05-21 09:42:51 +08:00
leo
faf2c39056 refactor: rewrite Preference.FindOrAddNodeByRepositoryPath
* prevent moving node while opening repository directly from commandline
* supports to set parent node while dropping folder to initialize repository
2024-05-20 17:39:31 +08:00
leo
8d726656dc feature: supports to open repository directly from commandline on Linux 2024-05-20 15:15:08 +08:00
leo
8d6481c694 feature: supports to open a repository directly from commandline (#134) 2024-05-20 14:39:05 +08:00
leo
4cf84cd164 feature: add ⌘+Q hotkey to quit this app on macOS 2024-05-17 15:23:42 +08:00
leo
a976f007f5 refactor: load external tool's icon on startup 2024-05-17 12:01:29 +08:00
leo
d9a14432cc fix: LineNumberMargin did not recalculate required size after data context changed 2024-05-17 10:53:28 +08:00
Gadfly
46b9d1b09d refactor: Simplify FindOrAdd method by using ConcurrentDictionary's GetOrAdd 2024-05-16 16:33:34 +08:00
Gadfly
6e35ee64da fix: remove SearchResultSelectedCommit from preference.json 2024-05-15 16:20:31 +08:00
leo
bb557cdebe
Merge pull request #129 from gadfly3173/fix/launcher-dbclick
fix: DoubleTapped on launcherTabsScroller not triggered correctly
2024-05-14 19:34:06 +08:00
Gadfly
ed39a41b61
fix: DoubleTapped on launcherTabsScroller not triggered correctly 2024-05-14 19:26:16 +08:00
leo
c48d69362e enhance: performance of filtering branch 2024-05-14 18:50:36 +08:00
leo
1896586f5e ux: style for branch filter input box 2024-05-14 13:37:36 +08:00
leo
02e71d4d75 feature: supports filter displayed branches 2024-05-14 11:47:56 +08:00
leo
17e48d86fe localization: system menu label for macOS 2024-05-13 17:24:42 +08:00
leo
0596a63b30 fix: skip to render contents when Bounds.Width is zero 2024-05-13 16:39:48 +08:00
leo
bd09a44ab9 fix: IME not work on Wayland (#125) 2024-05-13 15:42:24 +08:00
leo
6e3ae6b7b4 fix: wrong hotkeys to open preference dialog 2024-05-13 11:32:49 +08:00
Gadfly
ed680bf813
ux: Use RepeatButton instead of Button to make ScrollIndicator support PointerPress operation 2024-05-11 22:50:49 +08:00
Gadfly
0fcef2343a
fix: add ScrollViewer event handler to disable scroll indicators based on scroll position 2024-05-11 22:26:09 +08:00
Gadfly
e5516b5b9f
fix: Fixed ScrollViewer rebounding when scrolling to the right 2024-05-11 21:51:57 +08:00
leo
3fffb0b229 feature: add hotkeys Ctrl+Shift+P (on Windows/Linux) and ⌘+, (on macOS) to open Preference dialog 2024-05-11 18:06:31 +08:00
leo
f4c4c5eb9b ux: style for auto fetch interval input widget (#123) 2024-05-11 17:53:06 +08:00
Gadfly
7520a2a7b6 feat: Add config of auto fetch interval 2024-05-11 17:37:54 +08:00
leo
62838e5b05
Merge pull request #122 from gadfly3173/fix/dictionary-exception
fix: avoid potential IndexOutOfRangeException in Models.User
2024-05-11 17:09:26 +08:00
Gadfly
3b166a5c22 fix: avoid potential IndexOutOfRangeException in Models.User 2024-05-11 17:00:35 +08:00
leo
449da31c70 localization: add native menu item header labels 2024-05-11 16:51:10 +08:00
leo
73ee0ae2cd fix: use NativeMenuItemSeparator instead of NativeMenuItem 2024-05-11 11:43:02 +08:00
leo
e0d35409b4 feature: move main menu to macOS system menu bar 2024-05-11 11:31:14 +08:00
leo
764cf24284 code_review: PR #120
* remove unnecessary code. The `SetProperty` function takes care of set same property in a loop
2024-05-10 16:30:34 +08:00
leo
efd8e72c4e
Merge pull request #120 from gadfly3173/fix/handle-select-changed
fix: update search filter selected commit after Histories selected commit changed
2024-05-10 16:24:25 +08:00
Gadfly
592d087e05 fix: update search filter selected commit after Histories selected commit changed 2024-05-10 16:04:03 +08:00
leo
37f5472186 ux: do not show /dev/null in DiffView for new file 2024-05-10 16:01:20 +08:00
leo
cebe07695a fix: issue cause by commit eeb6abb560 2024-05-07 15:52:04 +08:00
leo
eeb6abb560 fix: avoid duplicated nodes being added into the repository tree 2024-05-07 15:50:26 +08:00
leo
207e82b391 enhance: keep repository tree sorted by name 2024-05-07 15:28:54 +08:00
leo
15456f0dee code_style: use ?: operator instead of if...else 2024-05-07 14:28:34 +08:00
leo
4af8cc18d2 fix: welcome page should use a shared singleton instance to manage and filter repositories (#117) 2024-05-07 14:12:52 +08:00
leo
06ca29b2b2 localization: update copyright 2024-05-07 11:19:50 +08:00
leo
37b5f5c083 feature: enhance the behaviour of closing the last tab
* If the last tab is an opened repository, go back to the welcome page
* If the last tab is welcome page, quit this app
2024-05-07 10:44:46 +08:00
方祝立
0e0d3d64b4 fix: Fixed the problem that the switching branch of the worktree repo is not displayed 2024-05-07 10:29:24 +08:00
leo
b651835de0 enhance: hotkeys
* add `Shift+Ctrl+Tab` (`⌘+⌥+←` on macOS) to go to previous page
* use `ESC` to cancel commit searching
* enable `AutoFocusBehaviour` on `CommitChanges` and `RevisionFiles` tab
2024-05-06 10:22:13 +08:00
leo
e0d3a320fc ux: macOS hotkey tips (#103) 2024-05-06 07:14:53 +08:00
leo
d87716dc86 fix: disable removing repository at startup (#90) 2024-05-06 07:09:27 +08:00
leo
d46979a0c5 feature: add a checkbox to also delete the tracking remote branch (#99) 2024-05-05 19:45:28 +08:00
leo
eced2e09bd ux: show tips if user is about to delete a remote branch (#99) 2024-05-05 18:47:02 +08:00
leo
5964cf2587 ux: macOS hotkey (#103) 2024-05-05 18:31:11 +08:00
leo
68566b9b34 enhance: use instead of Ctrl , instead of Alt for all hotkeys used by this app on macOS (#103) 2024-05-05 18:19:59 +08:00
leo
9627206764 fix: launch terminal in current user's home dir failed on macOS(#105) 2024-05-05 13:12:26 +08:00
leo
7da184c55b fix: disable native system menubar on macOS (#106) 2024-05-05 13:02:23 +08:00
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