Esteban Vega
ed85637ce1
Merge pull request #4947 from gitbutlerapp/edit-branch-poping-up
...
The edit branch should not be listed in the side bar
2024-09-18 15:07:08 +02:00
estib
d1c71898cc
The edit branch should not be listed in the side bar
...
The `gitbutler/edit` branch should not be listed in the side bar of the application
2024-09-18 14:28:25 +02:00
Caleb Owens
f34d901c87
Merge pull request #4945 from gitbutlerapp/Fix-wrong-files-displaying-in-edit-mode
...
Fix wrong files displaying in edit mode
2024-09-18 12:18:27 +02:00
Caleb Owens
5e48159a83
Merge pull request #4944 from gitbutlerapp/Fix-line-manager-forkpoint-integrated
...
fix: Correct condition for removing right column
2024-09-18 12:18:06 +02:00
Nico Domino
cdae30d1a9
fix: use pull request template form ( #4946 )
2024-09-18 10:01:34 +00:00
Caleb Owens
9ed21936f5
fix: Correct condition for removing right column
2024-09-18 11:51:44 +02:00
Caleb Owens
224c03528b
Improve index resolution
2024-09-18 11:45:38 +02:00
Caleb Owens
c991ec48a8
Merge pull request #4941 from gitbutlerapp/conflict-resolution-fix
...
fix: Calculate the right file tree when resolving
2024-09-18 11:29:42 +02:00
estib
4dca18ff3e
fix: Calculate the right file tree when resolving
...
Get the correct file tree when resolving a conflict
2024-09-18 11:11:00 +02:00
Esteban Vega
7edaaa7db3
Merge pull request #4940 from gitbutlerapp/hunk-locking
...
Update the hunk locking style
2024-09-18 09:55:18 +02:00
estib
ccf7106f49
Update the hunk locking style
...
Update it following the feedback from Discord: https://discord.com/channels/1060193121130000425/1224366824305463337/1285608946870124617
2024-09-18 09:18:49 +02:00
Kiril Videlov
a01cac1baa
Merge pull request #4938 from gitbutlerapp/hunk-column-changes
...
fix: File section max line number & simplify hunk header calculation
2024-09-18 08:34:01 +02:00
Kiril Videlov
089af8e111
Merge pull request #4933 from gitbutlerapp/hunk-locking-design
...
HunkDiff: Display a lock if needed
2024-09-18 08:33:06 +02:00
Kiril Videlov
a6d9701c16
Merge pull request #4939 from gitbutlerapp/"Drop-changes-and-unapply"-copy-update
...
refactor: Improve label for unapplying changes in BranchLaneContextMenu
2024-09-18 08:30:25 +02:00
Kiril Videlov
d9d7e38456
Merge pull request #4937 from gitbutlerapp/bump-tauri-to-1.8.0
...
feat: bump tauri to 1.8.0
2024-09-18 08:29:50 +02:00
Pavel Laptev
4f94be5439
refactor: Improve label for unapplying changes in BranchLaneContextMenu
2024-09-17 22:14:18 +02:00
ndom91
05109246f1
fix: bump tauri-cli
2024-09-17 21:49:32 +02:00
Esteban Vega
cfbb7a56bb
Merge pull request #4936 from gitbutlerapp/User-settings
...
fix: Don't override the user settings
2024-09-17 17:15:31 +02:00
estib
aecae8e2bf
fix: File section max line number & simplify hunk header calculation
...
- Fix a bug in which the max lines would not be taken into account when checking what the biggest line number in a hunk section.
- Simplify the calculation of the header width for the HunkDiff component
2024-09-17 17:15:09 +02:00
ndom91
ad2290dc7a
fix: bump tauri@1.8.0 in preparation for v2 upgrade
2024-09-17 17:10:45 +02:00
estib
cc6c8b9bec
fix: Don't override the user settings
...
The user settings would not be correctly updated because multiple places were reloading it
This fixes the issue https://github.com/gitbutlerapp/gitbutler/issues/4931
2024-09-17 16:49:34 +02:00
Caleb Owens
69487faafa
Merge pull request #4935 from gitbutlerapp/Remove-BS-services
...
Remove BS services
2024-09-17 16:47:59 +02:00
Caleb Owens
beea22bcc3
Remove BS services
2024-09-17 16:46:08 +02:00
estib
8b2ea87ed5
HunkDiff: Display a lock if needed
...
Show a lock icon if the hunk in question is locked to this lane
2024-09-17 15:16:59 +02:00
Caleb Owens
2a3f0e8a04
Fix (some) wrong files displaying in edit mode
2024-09-17 14:31:58 +02:00
Nico Domino
6476a1c754
feat: use new Tabs components to organise Preferences page ( #4906 )
2024-09-17 11:22:17 +02:00
Kiril Videlov
04b854c10c
Merge pull request #4926 from gitbutlerapp/update-dad-jokes-file
...
feat: Add a new dad joke to dad-jokes.txt.
2024-09-17 10:59:48 +02:00
Caleb Owens
eeeb73f8df
Merge pull request #4930 from gitbutlerapp/Improve-scrolling-of-update-modal
...
Improve scrolling of update modal
2024-09-16 20:52:30 +02:00
Caleb Owens
b6a4f7cd35
Improve scrolling of update modal
2024-09-16 20:50:45 +02:00
estib
7dbadb13a9
Get the upstream name from the pushed virtual branch
...
Once the push of a virtual branch succeeded, return the ref name and the remote name in order to correctly determine which branch name to create a PR from.
2024-09-16 18:15:06 +02:00
Esteban Vega
5b34cc75bd
Merge pull request #4925 from gitbutlerapp/commit-context-menu
...
Add commit context menu
2024-09-16 17:31:59 +02:00
Kiril Videlov
f130cb2458
Merge pull request #4927 from gitbutlerapp/fix-branch-name-from-ref
...
fix: Extract the name from the remote ref correctly
2024-09-16 17:03:08 +02:00
Caleb Owens
aac703afa7
Merge pull request #4909 from gitbutlerapp/Improve-applying-branches
...
Improve applying branches
2024-09-16 16:48:50 +02:00
Caleb Owens
cc8d3f4810
Did shit good
2024-09-16 16:42:23 +02:00
Esteban Vega
4c00fce37b
Merge pull request #4923 from gitbutlerapp/default-remote-selection
...
Project target setup: Use default remote
2024-09-16 16:13:51 +02:00
estib
a9c58aa35a
fix: Extract the name from the remote ref correctly
...
Correctly extract the name of the remote branch, supporting branch names with nested paths
Also: Add tests
2024-09-16 16:05:12 +02:00
Kiril Videlov
c58460c5ad
feat: Add a new dad joke to dad-jokes.txt.
2024-09-16 15:55:23 +02:00
Kiril Videlov
84bf4076b3
Merge pull request #4924 from gitbutlerapp/dad-jokes
...
dad jokes file
2024-09-16 15:54:04 +02:00
estib
d712fa88d1
Add commit context menu
...
Add a context menu to the commit card
2024-09-16 15:32:11 +02:00
Scott Chacon
711474e2bc
dad jokes file
...
this is pretty important
2024-09-16 14:32:58 +02:00
estib
1398f6853b
improvement: Default the selection of the project remote
...
The remote for a new project will default to the remote of the selected branch. It can be overwritten if needed.
2024-09-16 14:10:10 +02:00
estib
9772c02edc
Base Branch Service: Type the remote branch information
2024-09-16 14:03:33 +02:00
estib
75defc2ae6
Array utils: unique items
2024-09-16 14:00:05 +02:00
estib
2dae466162
Branch Utils: enhance branch utilities with ranking functions
...
Add functions to determine the best branch and best remote. Implement a branch ranking system based on exact matches and suffix matches to better
prioritize branches.
2024-09-16 13:59:17 +02:00
Nico Domino
a0b83556d2
feat: create 'Apperance' settings page and add highlight branchlane setting ( #4921 )
...
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-09-16 12:49:28 +02:00
Nico Domino
d7c00a0b9f
fix: rm effect.pre used only to avoid previous bug ( #4919 )
2024-09-16 12:20:34 +02:00
Mattias Granlund
02d6b6db9e
Fix mistake in push failure error capature
2024-09-16 11:58:31 +02:00
Esteban Vega
07c6db3643
Merge pull request #4884 from gitbutlerapp/keyboard-shortcuts
...
Add some nice keyboard shortcuts for staging and selecting
2024-09-16 11:45:27 +02:00
estib
c9a5d7a75d
Branch file list: Remove comments about actions
2024-09-16 11:42:04 +02:00
estib
08fb9effc4
Merge remote-tracking branch 'origin/master' into keyboard-shortcuts
2024-09-16 11:40:23 +02:00
