Nico Domino
d10bbcf515
feat: new stacking ui commit lines ( #4972 )
...
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-09-28 16:59:29 +02:00
estib
0f6a78e1b6
fix: Test for integrateUpstreamModal being undefined
...
Don't try to read a property from the integration modal if it's undefined
2024-09-28 11:00:33 +02:00
Navtoj Chahal
26b99e217e
Disable Hidden Input Interaction
2024-09-26 19:39:02 -07:00
Esteban Vega
598d60fbed
Merge pull request #4971 from gitbutlerapp/make-select-generic
2024-09-24 20:06:00 +02:00
Esteban Vega
60c33f135e
Merge pull request #4970 from gitbutlerapp/clean-up-update-base-button
...
clean-up: Remove unnecessary function declaration
2024-09-24 16:55:12 +02:00
Nico Domino
a7325e4d2d
fix: log and show toast ( #4965 )
2024-09-24 16:03:02 +02:00
estib
0f7b9f4d9c
Make the Select component generic
...
Auto-detect the type of the value the select options can have
2024-09-24 15:43:46 +02:00
estib
9f6672b4e3
clean-up: Remove unnecessary function declaration
2024-09-24 14:19:50 +02:00
estib
adc6357a80
Use the exposed state of the integrate upstream modal
...
Export the state of whether the modal is open or not.
Use it in the base branch page and the update base button.
2024-09-24 13:37:58 +02:00
estib
536dfac6e4
IntegrateUpstreamModal: Factor out the modal
...
Factor out the modal for upstream integration into a dedicated component so that it can be shared easily
2024-09-24 09:54:13 +02:00
Caleb Owens
7c9401dd49
Merge pull request #4781 from gitbutlerapp/Fix-snapshot-details-transformer
...
Fix snapshot details transformer
2024-09-24 12:34:08 +02:00
Caleb Owens
e5115aa559
*throws corkscrew over sholder*
2024-09-24 12:05:36 +02:00
Scott Chacon
d2444de8c5
add basic views into stacks
...
this adds a way to view the timeline, branches and stacks, create stacks and more. none of this is pretty, but we're just exercising the server APIs
2024-09-23 16:26:25 +02:00
Kiril Videlov
4c11a96456
Merge pull request #4962 from gitbutlerapp/Fix-state-for-file-selections-not-propagating
...
Fix state for file selections not propagating
2024-09-24 09:33:19 +02:00
Caleb Owens
9c23e577ba
Constrain FilIdSelection API
2024-09-23 21:00:53 +02:00
Caleb Owens
edc0bd1a1d
Fix state for selections not propagating
2024-09-23 20:26:34 +02:00
Nico Domino
82099fe43e
fix: submit commit title/desc with ctrl+Enter everywhere ( #4958 )
2024-09-23 16:16:30 +02:00
Esteban Vega
69b304bc33
Merge pull request #4948 from gitbutlerapp/conflict-fix-commit-info
...
Display the author and commit title in the edit mode
2024-09-23 14:43:18 +02:00
estib
22e7f46950
refactor: replace custom entries with Object.entries
...
Remove custom entries utility and replace its usage with
Object.entries across hotkeys and branch utility files.
2024-09-23 12:21:18 +02:00
Pavel Laptev
edbc8eb3a3
Small UI fixes ( #4950 )
...
* fix the hunk header font-weight
* Text case fix
* Update sections order
* Fix "Full data synchronization" layout and toggles
2024-09-19 14:09:29 +02:00
estib
c15dbbf083
Edit Mode page: Display commit info
...
Display information about the commit in the edit mode page
2024-09-19 14:02:05 +02:00
estib
838002fa06
Commit service
...
Create a service that enables searching inside a project for a commit information by its ID
2024-09-19 14:01:03 +02:00
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
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
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
