Nico Domino
cdae30d1a9
fix: use pull request template form ( #4946 )
2024-09-18 10:01:34 +00: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
Pavel Laptev
4f94be5439
refactor: Improve label for unapplying changes in BranchLaneContextMenu
2024-09-17 22:14:18 +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
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
Nico Domino
6476a1c754
feat: use new Tabs components to organise Preferences page ( #4906 )
2024-09-17 11:22:17 +02:00
Caleb Owens
b6a4f7cd35
Improve scrolling of update modal
2024-09-16 20:50:45 +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
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
estib
d712fa88d1
Add commit context menu
...
Add a context menu to the commit card
2024-09-16 15:32:11 +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
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
estib
79e25de197
fix: actions initialization for CommitDragItem
...
Use a derived store to compute actions based on the branch and commit,
removing the need for a side effect. This enhances readability and
ensures that actions are updated reactively whenever dependencies change.
2024-09-16 10:33:16 +02:00
Mattias Granlund
97d117bb02
Improve push failed error analytics
...
- error message was not being included
2024-09-16 10:20:14 +02:00
Kiril Videlov
def3692df8
Merge pull request #4917 from gitbutlerapp/fix-pr-infinite-loop
...
fix: Don't update the state with the pre-effect
2024-09-16 10:10:00 +02:00
Esteban Vega
5faa0ac1b5
Merge pull request #4916 from gitbutlerapp/fix-file-selectability
...
fix: Only allow hunk selection in uncommited files
2024-09-16 10:08:35 +02:00
estib
3eadc2e743
fix: Don't update the state with the pre-effect
...
It seems like this would lead to an infinite loop in some cases
2024-09-16 10:03:29 +02:00
estib
2467b87fda
fix: Only allow hunk selection in uncommited files
...
Files hunks from the commits should not be selectable
2024-09-16 09:50:59 +02:00
Pavel Laptev
8ec4fbdd67
few CSS fixes
2024-09-15 23:07:04 +02:00
estib
2bf882676f
fix HunkDiff borders
...
The borders move with the hunk diffs
2024-09-15 10:49:47 +02:00
Pavel Laptev
1c70cdc3f4
Fixes scroll on drag ( #4913 )
...
* remove old tailwind CSS class
* fix `onDestroy` lifecycle error
* fix scroll glitch for changed files while dragging
2024-09-14 17:43:06 +02:00
Esteban Vega
1a47f5ec4d
Merge pull request #4850 from gitbutlerapp/ndom91/use-template-dropdown
...
fix: refactor pr template path input to pre-filled `Select` instead of `TextBox`
2024-09-13 17:25:58 +02:00
Caleb Owens
edd0cbe0e6
Rename unapplying
2024-09-13 16:58:42 +02:00
Nico Domino
c952ffee65
Merge branch 'master' into ndom91/use-template-dropdown
2024-09-13 16:28:58 +02:00
Caleb Owens
ce2aa91385
feat: Add onclick prop to DefaultTargetButton
...
Add onclick prop to DefaultTargetButton component to enable
button functionality. This change allows the component to handle
click events and perform specified actions when the button is
clicked.
2024-09-13 16:07:25 +02:00
ndom91
147a8aafcd
fix: tweak copy
2024-09-13 12:56:08 +02:00
ndom91
d1d2e0c80b
fix: cleanup pr template method names
2024-09-13 12:10:07 +02:00
ndom91
e8bb66c151
fix: use relativePath and get project basePath on rust side
2024-09-13 12:01:03 +02:00
ndom91
d14b6496b1
fix: rename githost form
2024-09-13 11:29:24 +02:00
ndom91
907bbe838d
fix: more conflict clean up
2024-09-13 11:17:04 +02:00
ndom91
e842b282ae
fix: merge conflicts
2024-09-13 11:15:06 +02:00
Mattias Granlund
eec288548a
Remove displayed remoteRef from commit card
2024-09-12 18:38:09 +02:00
Mattias Granlund
8aafd8345d
Show pr card for commit group if such exists
2024-09-12 18:38:09 +02:00
Mattias Granlund
1b175bb119
Re-use push button with snippet
2024-09-12 18:38:09 +02:00
Mattias Granlund
ab08bb9a47
Render one commit list per commit group
2024-09-12 18:38:09 +02:00
Mattias Granlund
5b3dff9634
Toggle feature by typing s t a c k
2024-09-12 18:38:09 +02:00
Mattias Granlund
bd7be6a759
Convert CommitList to svelte5 component
2024-09-12 18:38:09 +02:00
Mattias Granlund
6a7ae9dcb3
Add stack grouping function
2024-09-12 18:38:09 +02:00
