Commit graph

63 commits

Author SHA1 Message Date
leo
cce4e5348c Merge branch 'develop' into feature/treedatagrid 2024-05-29 19:44:45 +08:00
leo
025d468b40 code_review: PR (#152) 2024-05-29 18:53:38 +08:00
Gadfly
2f7ef1ef2b feat: show tooltip if git version too low 2024-05-29 17:47:34 +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
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