Commit graph

174 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
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
leo
4a676e094d optimize<Dashboard>: fix wt.exe not startup in given working directory 2021-09-13 13:38:21 +08:00
leo
717772c62b style<Welcome>: re-design layout for Welcome page 2021-09-13 11:47:54 +08:00
ZCShou
f26c777577 feature<Welcome>: 欢迎界面增加最近使用记录和收藏/标签列表。支持拖拽,收藏支持自定义目录 2021-09-09 17:26:29 +08:00
ZCShou
50fe327a89 !24 右键菜单增加取消追踪,并在删除相关的远程分支时自动取消跟踪
Merge pull request !24 from Jai/feature/unset-upstream
2021-09-08 00:19:36 +00:00
李通洲
ebc2fc6b91 feature<Preference>: query git version after selecting git path 2021-09-07 16:57:57 +08:00
李通洲
5e706588a0 feature<OpenTerminal>: support Windows Terminal 2021-09-07 16:57:00 +08:00
Jai
584bac74f9 feature<Dashboard>: add menu to unset upstream and cancel tracking when deleting related remote branches 2021-09-07 09:36:06 +08:00
Jai
602f934fae feature<PageTabBar>: add context menu to close tabs and modify bookmarks 2021-08-19 08:58:41 +08:00
Jai
cc1aea7ff6 fix<Locales>: missing translation text 2021-08-13 15:56:16 +08:00
leo
5791ca8fcb update<Locales>: remove unused resources 2021-08-12 14:03:10 +08:00
leo
b477240464 update<Locales>: remove unused resources 2021-08-11 20:41:41 +08:00
leo
59e9d59d8d style<PageTabBar>: change label style 2021-08-11 20:34:01 +08:00
leo
780b4b9d18 feature<Issue>: add preference setting to enable/disable crash report 2021-08-11 10:20:19 +08:00
Jai
0c7f217106 feature<Preference>: add custom font settings 2021-08-10 22:05:29 +08:00
leo
7cc25af508 optimize<Locales>: remove unused resources 2021-08-06 14:00:24 +08:00
leo
59fa5304d8 feature<Histories>: add reword/squash context menu for HEAD commit 2021-08-05 20:38:38 +08:00
leo
6f5cfe078e style<Preference>: new layout for Preference window 2021-08-05 16:37:29 +08:00
leo
650b79a295 optimize<Locales>: remove unused resources 2021-07-23 11:35:24 +08:00
leo
bfb0be89a5 update<Locales>: translate for fetch automatically 2021-07-20 16:49:50 +08:00
leo
afc4eafb6f refactor<*>: use DynamicResource instead of StaticResource for brushes and locales 2021-07-20 16:26:10 +08:00
leo
4a56b47265 optimize<FolderDialog>: remove dependency of Ookii.Dialogs.Wpf 2021-07-20 09:13:07 +08:00
leo
add6062917 feature<Configure>: supports configuration for http.proxy 2021-07-15 09:23:37 +08:00
leo
c1a2914660 update<Hotkeys>: add STAGE/UNSTAGE hotkey description 2021-07-14 15:15:44 +08:00
leo
f6c17e7d34 feature<Launcher>: supports restore last opened tabs when startup 2021-07-06 09:58:36 +08:00
leo
598f940cf3 feature<FolderDailog>: use Ookii.Dialog.Wpf instead of Views.Controls.FolderDailog 2021-06-29 10:19:38 +08:00
leo
003ae01b13 update<en_US>: translation for Text.Hotkeys.Refresh 2021-06-22 11:34:35 +08:00
leo
3b65e7b75b feature<Hotkeys>: add dialog to show hotkeys used by this app 2021-06-22 11:29:16 +08:00
leo
93424a1117 update<en_US>: remove '\n' for tips when git has not been configured 2021-06-16 09:20:07 +08:00
leo
0377326363 optimize<*>: remove PageTabItem 2021-06-15 17:35:37 +08:00
leo
130b5a66ab feature<SubTree>: supports git subtree feature 2021-06-07 11:47:16 +08:00
leo
259473626b feature<DiffViewer>: supports to diff with external merge tools 2021-05-31 10:25:48 +08:00