Commit graph

205 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
449da31c70 localization: add native menu item header labels 2024-05-11 16:51:10 +08:00
leo
e0d35409b4 feature: move main menu to macOS system menu bar 2024-05-11 11:31:14 +08:00
leo
06ca29b2b2 localization: update copyright 2024-05-07 11:19:50 +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
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
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
9b5e8429b9 feature: add hotkey 'F5' to reload/refresh whole repository 2024-04-28 10:19:12 +08:00
leo
fbf1d5aa32 localization: update translations 2024-04-19 14:28:18 +08:00
leo
ab26bb83e9 refactor: re-design toolbar of Views.DiffView 2024-04-14 12:27:09 +08:00
Gadfly
a249eed1ac
feat: show git file mode change if exist 2024-04-12 21:38:36 +08:00
leo
f3f39ac593 feature: supports resolving multiple conflicts at once. 2024-04-11 20:50:19 +08:00
leo
17fc7ab994 ux: add icons for external merge tools 2024-04-09 15:00:52 +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
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
416b839df5 localization: use x:String instead of declare a new namespace for System.String 2024-04-07 10:06:17 +08:00
leo
040a6d4bba refactor: use axaml resource to manage locales instead of resx 2024-04-06 18:06:32 +08:00
Enner Pérez
ad1fdbe6ee Resx Localization 2024-03-16 03:27:03 -05:00
Enner Pérez
cb90f8b98d en_US Typo Fixes 2024-03-13 03:10:02 -05:00
leo
13c5c116fd doc: add text editor hotkeys information 2024-03-11 18:30:32 +08:00
leo
267c955c88 style: views supports Linux 2024-03-08 11:28:17 +08:00
leo
acb74a4b95 feature: hotkeys enhancement. see issue #19 2024-03-05 10:46:08 +08:00
leo
7b70951c93 style<Launcher>: supports two size rules for tabs in titlebar - fixed width or size to content 2024-03-01 14:09:39 +08:00
leo
671e46f8b3 feature<TextDiffView>: supports line staging/unstaging in working copy diff view 2024-02-28 14:55:11 +08:00
leo
68ddeb4cc5 refactor<Statistics>: use committer instead of author 2024-02-25 11:32:15 +08:00
leo
e070b79d2c feature<Statistics>: finish statistiscs 2024-02-23 19:16:28 +08:00
leo
49f6ad0407 feature<Avatar>: supports gravatar.com and cravatar.cn (for China) 2024-02-23 11:39:05 +08:00
leo
e7bf9be683 update<csproj>: assembly info 2024-02-22 21:46:32 +08:00
leo
05c9d9be5b feature<AutoFetch>: finish auto fetch remotes 2024-02-18 16:26:07 +08:00
leo
c73c5372d2 style<*>: use mono font for all contents 2024-02-18 10:41:41 +08:00
leo
e310cfd84f feature<ContextMenu>: highlight branch/commit/tag name in ContextMenuItem 2024-02-06 19:07:17 +08:00
leo
2a62596999 refactor<*>: rewrite all with AvaloniaUI 2024-02-06 15:08:37 +08:00
leo
4e40018a78 feature<Repository>: supports modify display name of repository 2024-01-17 11:02:08 +08:00
leo
f04ab92efc feature<WorkingCopy>: supports open selected file with default editor in working copy changes 2023-12-26 17:47:18 +08:00
leo
217a382849 optimize<Sort>: remove sort repositories by name desc 2023-10-10 17:35:54 +08:00
leo
f13b1ee9fe feature<AssumeUnchanged>: supports update-index --[no]-assume-unchanged 2023-08-24 19:05:38 +08:00
leo
0a7a0bff42 feature<SaveAsPatch>: show notification after saving patch successfully 2023-08-24 16:20:38 +08:00
leo
a1bfbfe02e refactor<Blame>: new blame tool 2023-08-24 13:39:49 +08:00
leo
63a6ef256e feature<Preference>: supports for customizing max number of displayed history commits 2023-08-23 11:39:47 +08:00
leo
f92f5746b9 feature<Stashes>: supports clear all stashes 2023-08-21 20:33:41 +08:00
leo
7e1b1d7324 feature<FileHistory>: add button to use selected revision of file 2023-08-18 14:13:32 +08:00
leo
535e05a667 style<Theme>: new theme design 2023-07-18 15:00:27 +08:00
leo
aac29f7e14 style<Welcome>: translation for Welcome.Repositories 2022-11-01 09:19:49 +08:00
leo
c1c57f9b1d feature<GPG>: add gpg signing feature #5 2022-10-20 18:59:13 +08:00
leo
e31a304cac feature<Welcome>: supports to sort repositories by bookmark color 2022-10-18 15:55:39 +08:00
leo
b76bc96ee7 optimize<Upgrade>: remove auto-upgrade feature 2022-10-18 15:30:24 +08:00
leo
18e8036e11 feature<Welcome>: enable mouse double-click on repository 2022-10-18 11:24:42 +08:00
leo
918263130c feature<Welcome>: add sort supports 2022-10-17 10:12:59 +08:00
leo
b43044a7bf style<Welcome,PageTabBar>: re-design the style for Welcome page 2022-10-14 20:38:53 +08:00
leo
c2517701cc style<PageTabBar>: new style for page tab bar 2022-10-14 15:30:06 +08:00
leo
fec14eb04a style<Bookmark>: unify icons for repository 2022-05-20 16:57:36 +08:00
leo
44ed55937d style<Histories>: remove commit detail panel's guide tips 2022-05-20 14:20:22 +08:00
leo
35235df7bc feature<WorkingCopy>: gitee issue #I54W26 - toggle untracked files in working copy changes 2022-05-05 09:58:10 +08:00
leo
b04c94ccc1 feature<Cleanup>: add toolbar button to run git gc and git lfs prune 2022-02-10 14:27:46 +08:00
leo
1ad5ff1bd8 feature<Statistics>: add statistics for current year 2022-01-12 18:38:03 +08:00
leo
4ef2a70ebd optimize<Statistics>: use localized text for weekdays 2022-01-11 20:35:17 +08:00
leo
c52ed4a711 feature<Statistics>: add simple statistic page 2022-01-11 20:18:35 +08:00
leo
9f58e0c715 feature<Remote>: add 'Prune' context menu for remote to prune dead branches without fetching 2021-11-17 16:12:26 +08:00
leo
ef7cd2176a update<README>: update thanks; add tooltip for commit hot key 2021-11-08 20:47:03 +08:00
leo
7e4c5bc7a4 feature<StashDropConfirm>: need confirm before drop selected stash 2021-10-29 11:58:33 +08:00
leo
aa331c5562 style<Dashboard>: re-arrange toolbar buttons 2021-10-27 11:24:59 +08:00
leo
9dae37b022 style<Dashboard>: move Explore & Open Git Bash & Open In VSCode into one dropdown menu 2021-10-13 17:14:53 +08:00
leo
e5996d0fe1 style<Preference>: new style of preference setting dialog 2021-10-13 11:19:45 +08:00
leo
e32df7d461 refactor<Theme>: move theme switcher from launcher to preference 2021-10-13 10:56:01 +08:00
leo
2759b4aa2e update<locales>: update Text.SSHKey 2021-10-12 19:32:04 +08:00
leo
75a46ceb74 feature<SSH>: supports using ssh private key to access remote git repository 2021-10-12 17:14:48 +08:00
leo
46ac07a80c style<Welcome>: small changes 2021-10-11 14:48:44 +08:00
leo
9e8cf02370 feature<PageTabBar>: add context menu to copy repositories store path 2021-10-09 14:29:44 +08:00
leo
468d0e6f25 feature<PopupPanel>: add hotkey ESC to close current popup panel 2021-09-17 18:00:18 +08:00
leo
b134876f8b style<Welcome>: optimize layouts when there's no data in tree or list 2021-09-15 10:23:21 +08:00
leo
26a930aa3a feature<Welcome>: supports to open terminal without repositories 2021-09-13 14:53:24 +08:00
leo
4456019968 feature<VSCode>: supports to open repository with Visual Studio Code 2021-09-13 14:22:25 +08:00