Commit Graph

9636 Commits

Author SHA1 Message Date
Nico Domino
1d4f5f6762
fix: upstream commits accordion and cards (#5044) 2024-10-04 15:42:04 +00:00
Pavel Laptev
51f02db9f0 update "ai" icons 2024-10-04 16:57:15 +02:00
Pavel Laptev
f7b139c634 fix: textbox and textarea text colors 2024-10-04 16:24:10 +02:00
Esteban Vega
d8df95efc8
Merge pull request #5043 from gitbutlerapp/fix-zoom-initialization 2024-10-04 16:10:48 +02:00
estib
c6f19bc1ff fix: Correctly update the zoom from the settings 2024-10-04 16:00:19 +02:00
Pavel Laptev
effe3fcb78 Update "Enable PR templates" settings section
- simplify title
- updated section states when empty and disabled
- update and move `EmptyStatePlaceholder` into UI package
2024-10-04 15:44:07 +02:00
Mattias Granlund
65a335dd5e chore: eslint ignore storybook static files 2024-10-04 14:33:48 +02:00
estib
718fa8d2ff Stack Headers: Use new PR button
The new PR headers use the new PR details modal
2024-10-04 14:22:25 +02:00
Pavel Laptev
5cc83a4fdb fix: modal backdrop color 2024-10-04 12:55:45 +02:00
Mattias Granlund
c951f01c98 Fix lint errors 2024-10-04 12:43:26 +02:00
Mattias Granlund
3b1725cfc4 Add key to #each over patch series
- prevents funny things from happening
2024-10-04 12:43:26 +02:00
ndom91
4c2fe5929a fix: branch header dynamic title size 2024-10-04 12:43:26 +02:00
Mattias Granlund
eede90ac96 Fix rebasing commits between stacked series 2024-10-04 12:43:26 +02:00
Mattias Granlund
80d8182ecb Add prompt for patch series name
- new prompt when adding blank group
- aligned with prompt when adding group to existing commit
2024-10-04 12:43:26 +02:00
Mattias Granlund
ae1efad769 Fix: link related commits found in new series data 2024-10-04 12:43:26 +02:00
Mattias Granlund
5e326710c7 Rename "Add ref" to "Add branch" 2024-10-04 12:43:26 +02:00
Mattias Granlund
5c26def86b Improve stack header dropdown 2024-10-04 12:43:26 +02:00
Mattias Granlund
25fad4f376 Implement backend call for "rename series" 2024-10-04 12:43:26 +02:00
Mattias Granlund
a43523d157 Fix: send correct name when creating a series 2024-10-04 12:43:26 +02:00
Mattias Granlund
490febec5c Implement backend call for "remove series" 2024-10-04 12:43:26 +02:00
Mattias Granlund
3eaa991385 Fix the new series button at the top 2024-10-04 12:43:26 +02:00
Mattias Granlund
31f5bb38c9 Make push button sticky in stacking mode 2024-10-04 12:43:26 +02:00
Mattias Granlund
4f2291e37c Fix: state_unsafe_mutation workaround
An alternative fix would be to initialise the loading store at first load in order to avoid changing it immediately on `start()`, that's what causes the error.
2024-10-04 12:43:26 +02:00
Mattias Granlund
548263e538 Use correct branch names, prs etc for a patch series
- create pr button not working entirely, something to do with ref not being pushed
2024-10-04 12:43:26 +02:00
ndom91
2bba8cbae6 fix: stackingCommitCard and handle remoteRef:null in groupCommitsByRef 2024-10-04 12:43:26 +02:00
ndom91
979ed50510 feat: match stackingBranchHeader and statusIcon colors to top commit 2024-10-04 12:43:26 +02:00
ndom91
b46c397c60 feat: add StackingBranchHeader contextMenu and handlers for contextMenuItems as well as their Modals 2024-10-04 12:43:26 +02:00
ndom91
9ba5ecbf65 feat: add openExternalBranch iconButton 2024-10-04 12:43:26 +02:00
ndom91
2af2e34bc0 feat: finish implementing upstream commits accordion 2024-10-04 12:43:26 +02:00
Mattias Granlund
8bdeb3f635 Cleanup experimental stacking feature
- initial "new stacking branch" card
- persist setting for show stacking details
- separates out individual branch / pr header
- stack files in separate folder
- implements upstream commits accordion
2024-10-04 12:43:26 +02:00
Pavel Laptev
e2e5ec579e disable lane outline on modal close 2024-10-04 11:15:36 +02:00
Pavel Laptev
210b58d8f8 fix: DefaultTargetButton size for the stacking feature 2024-10-04 10:56:48 +02:00
estib
d8b2bee18c fix: Lint errors 2024-10-04 10:35:17 +02:00
estib
a2d2ebdf07 PullRequestCard: Move the PR details button to the title 2024-10-04 09:35:19 +02:00
estib
9230c998af PrDetailsModal: Keyboard shortcuts
Meta or Ctrl + e - Toggle the edit mode
Meta or Ctrl + g - Generate a description using the default prompt
Meta or Ctrl + Enter - Create the PR
2024-10-04 09:34:31 +02:00
estib
b07d2ac61b Modal: Capture keyboard input 2024-10-04 09:26:05 +02:00
Kiril Videlov
d262b230a8
Merge pull request #5036 from gitbutlerapp/add-series-top-base-implementation
Stacking - fixes an issue where its not possible to create additional series for the base of the stack
2024-10-04 00:29:26 +02:00
Kiril Videlov
ac4828736f
Merge pull request #5035 from gitbutlerapp/update-series-description-and-push-stack
Stack api: Dont try to push series that are pointing to the Stack base
2024-10-04 00:25:16 +02:00
Kiril Videlov
d15e41ee73 Stacking - fixes an issue where its not possible to create additional series for the base of the stack 2024-10-03 15:22:20 -07:00
Kiril Videlov
eb88ed01c6 Stack api: Dont try to push series that are pointing to the Stack base 2024-10-03 20:52:27 +02:00
Kiril Videlov
deef297744
Merge pull request #5033 from gitbutlerapp/refactor-api
refactor stack api for series creation
2024-10-03 20:24:41 +02:00
Kiril Videlov
ef1c7c139d Simplify CreateSeriesRequest
If `preceding_head` is provided, only the name of the series is sufficient
2024-10-03 20:12:49 +02:00
Kiril Videlov
efa5cbc7fd Makes it easier to create new series to the top of the stack
Adds an extra convinience API that does not require knowledge of what is the latest commit
2024-10-03 20:04:20 +02:00
Kiril Videlov
7ab8fdf0b8
Merge pull request #5031 from gitbutlerapp/series-on-list-virtual-branches-order
Fixes the order of series on the UI API (list_virtual_branches)
2024-10-03 18:56:36 +02:00
Kiril Videlov
57753e43a8
Merge pull request #5030 from gitbutlerapp/rm-change-reference
Refactor - removes the change_refernce module that what the initial imlementation of stacking
2024-10-03 18:56:10 +02:00
Kiril Videlov
cd4ec147b1 Fixes the order of series on the UI API (list_virtual_branches)
The UI needs the list starting with newest first.
Updated docs.
2024-10-03 18:50:56 +02:00
Kiril Videlov
e63e876ca5 Refactor - removes the change_refernce module that what the initial imlementation of stacking
This is now replaced with the more capable and correct `Stack` trait, implemented on `Branch`.

The new endpoints are:
create_series,
remove_series,
update_series_name,
update_series_description,
push_stack,
2024-10-03 18:39:50 +02:00
estib
9dcbf8b756 PRDetailsModal: Don't fetch the PR template if no path is given 2024-10-03 14:01:08 +02:00
estib
7b71f40b7b PRDetailsModal: Add tab indexes 2024-10-03 14:00:03 +02:00
estib
17d8ef8428 PRDetailsModal: Update the preferred PR action
Move the ability to select whether to create a Draft PR or a normal one to the Details modal
2024-10-03 13:27:19 +02:00