Esteban Vega
a6692415e8
Merge pull request #4886 from gitbutlerapp/UI-fixes-Hunk-preview-and-checkboxes
...
UI fixes: Hunk preview and checkboxes
2024-09-12 10:46:56 +02:00
estib
5352eb1717
Merged origin/master into keyboard-shortcuts
2024-09-12 09:13:39 +02:00
Pavel Laptev
7c0a3766af
usused CSS removed
2024-09-12 02:03:22 +02:00
Pavel Laptev
8723bd5c17
selected hunk colors update
2024-09-12 01:48:01 +02:00
Pavel Laptev
96d52014e0
Fix hunk header styles
...
- There was an issue with borders on scroll
- Fix the hunk header paddings
- replaced `box-shadow` with borders. Looks like it's not longer an issue
2024-09-12 01:29:28 +02:00
Pavel Laptev
e4df03aa50
remove unused code
2024-09-12 01:27:41 +02:00
Pavel Laptev
965118de7a
Remove duplicated hunk inf and replace indicators with infomessages
2024-09-11 23:29:10 +02:00
Sebastian Thiel
92c36b1a81
Merge pull request #4885 from gitbutlerapp/fix-discarding-of-deleted-and-created-files
...
fix discarding of deleted and created files
2024-09-11 21:46:01 +02:00
Sebastian Thiel
630c253637
for safety, don't fail if the file to be removed doesn't exist.
...
The code could run into this if `allow_new_file` is `true` and no
file actually exists.
Maybe in practice this can't happen, but calls can be made that trigger this.
2024-09-11 21:39:21 +02:00
Sebastian Thiel
ffdb0f6e2f
Minor refactor for slightly improved readability
...
Maybe the intent of some parts is clearer now as well.
2024-09-11 21:34:18 +02:00
Kiril Videlov
530a982379
fixes a bug where discarding created files does not work
2024-09-11 21:06:50 +02:00
Kiril Videlov
63a8603054
fixes a bug where discarding deleted files doesnt work
2024-09-11 21:06:34 +02:00
Kiril Videlov
8ad8797b5d
whenever a hunk is reversed also reverse change type
2024-09-11 20:48:09 +02:00
Kiril Videlov
199129162d
on empty new file the generic hunk is type added
2024-09-11 20:47:15 +02:00
Nico Domino
4700d5b2f1
fix: improve deeply nested token rendering ( #4883 )
2024-09-11 18:36:57 +02:00
estib
5137517650
BranchFilesList keybindings: Select all files
...
Select all files with meta-key + 'a'.
Also, `fileIdSelection` will make sure that the no duplicates are added to the selection
2024-09-11 17:31:33 +02:00
estib
d41827c9d1
BranchFilesList keybindings: Stage and unstage files
...
Stage or unstage the files by pressing the space-bar on the selected files.
Click enter to focus on the commit message input field
2024-09-11 17:20:56 +02:00
estib
f3b3649bca
Merged origin/master into keyboard-shortcuts
2024-09-11 17:03:04 +02:00
Caleb Owens
5e19bdda53
Merge pull request #4882 from gitbutlerapp/Fix-janky-generics
...
Fix janky generics
2024-09-11 16:03:46 +02:00
Caleb Owens
d76d900a7e
Fix janky generics
2024-09-11 16:00:04 +02:00
estib
b8c60adc64
Merge branch 'master' into keyboard-shortcuts
2024-09-11 15:50:07 +02:00
estib
c3273c10fe
Commit Input: Control focus behaviors
...
Add the ability to control externally when the commit message text input is focused.
Also:
Opent the commit input when a file is selected and the space bar is pressed
2024-09-11 15:43:38 +02:00
Esteban Vega
c4686bbf63
Merge pull request #4859 from gitbutlerapp/check-boxes-behavior
...
Improve the file list checkboxes behavior
2024-09-11 15:43:18 +02:00
estib
4c93b3632e
Clean-up: Remove console log
2024-09-11 15:40:10 +02:00
Caleb Owens
aeea013ba0
Update base branch button feature flagged
2024-09-11 15:18:20 +02:00
Caleb Owens
6e7aefd5c3
Merge commiting
2024-09-11 14:47:36 +02:00
estib
b08fb7d101
Commit Input: Close on 'Escape'
...
Pressing 'Escape' will close the commit input file
2024-09-11 14:30:29 +02:00
Esteban Vega
2d8b82309d
Merge pull request #4876 from gitbutlerapp/file-navigation
...
fix: File key navigation and selection
2024-09-11 14:28:43 +02:00
Nico Domino
0595319405
fix: rm unnecessary Space.svelte and add List/ListItem ( #4874 )
2024-09-11 13:59:08 +02:00
Caleb Owens
955c99e5d8
Rebasing working
2024-09-11 13:43:39 +02:00
Nico Domino
a1ff2079db
fix: createPr arguments order ( #4878 )
2024-09-11 11:43:26 +00:00
estib
390119e009
fix: File key navigation and selection
2024-09-11 12:19:52 +02:00
Pavel Laptev
25c2f516fd
style: Updated box-shadow to use custom variable in ContextMenu and Select components ( #4870 )
2024-09-11 12:12:10 +02:00
Caleb Owens
191686ec4d
Ahhh, don't loose shit
2024-09-11 11:23:20 +02:00
Caleb Owens
5a3d788927
Merge pull request #4873 from gitbutlerapp/issues
...
Issues
2024-09-11 10:31:05 +02:00
Caleb Owens
f5477a502b
Issues
2024-09-10 22:35:02 +02:00
estib
aaae6e605c
HunkDiff: Udpate the diff table style
2024-09-10 19:52:35 +02:00
ndom91
09b02feb78
fix: wire up prService template fns correctly
2024-09-10 19:29:24 +02:00
ndom91
8194283275
fix: simplify error handling read_file_from_workspa
2024-09-10 19:22:03 +02:00
ndom91
b7a037b1dc
fix: move new template methods to PRService
2024-09-10 19:18:42 +02:00
ndom91
13c866da73
Merged origin/master into ndom91/use-template-dropdown
2024-09-10 18:56:29 +02:00
ndom91
781fbb5a13
fix: merge conflict
2024-09-10 18:55:45 +02:00
Kiril Videlov
0717b69740
Merge pull request #4867 from gitbutlerapp/update-gix-path-to-0-10-11
...
Update gix-path to version 0.10.11
2024-09-10 18:48:44 +02:00
GitButler
e889d90779
GitButler WIP Commit
2024-09-10 18:45:48 +02:00
Kiril Videlov
f93fad98c1
Update gix-path to version 0.10.11
2024-09-10 17:37:10 +02:00
ndom91
f53b5b8f2e
chore: more cleanup
2024-09-10 17:34:22 +02:00
Kiril Videlov
4ddc6a9a32
Merge pull request #4863 from gitbutlerapp/update-branch-repo-commit-removal
...
fix a bug where deleting a vbranch fails to update state
2024-09-10 17:32:02 +02:00
ndom91
4aa9e96ced
fix: use pullRequestPath as boolean
2024-09-10 17:24:51 +02:00
Kiril Videlov
620ea1418f
Merge pull request #4864 from Zamoca42/fix/wsl-window-maximize-bug
...
fix: A bug with Wayland display (Error 71) in WSL
2024-09-10 17:23:34 +02:00
ndom91
eecea80884
fix: read pr tempalte from disk
2024-09-10 17:14:35 +02:00
