Commit Graph

9357 Commits

Author SHA1 Message Date
Pavel Laptev
afc270b561 copy update 2024-10-07 13:20:11 +02:00
Pavel Laptev
8cfee0328a update PR tags 2024-10-07 13:10:35 +02:00
Pavel Laptev
d33da1c868 "Update" button update
- move the button position
- don't disable the "update" button if checks are loading
2024-10-07 12:34:12 +02:00
Pavel Laptev
54f7059aa6 update PR card design 2024-10-07 12:30:41 +02:00
Pavel Laptev
96e9e7b3bb added custom scrollbar component 2024-10-07 12:07:04 +02:00
Pavel Laptev
06bd38af5d fix: pr description scroll 2024-10-07 11:52:48 +02:00
Pavel Laptev
59b73c7c07 new PR layout 2024-10-06 19:10:37 +02:00
Pavel Laptev
e4793320d0 new Modal width size 2024-10-05 18:22:50 +02:00
Pavel Laptev
a5bfa67ae9 fix: avatarGroup negative margine 2024-10-05 18:22:32 +02: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
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
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
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
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
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
estib
494a87bd5a ai: Generate or edit the PR description
Add the ability to generate the PR description out of the commit descriptions + an optional user prompt
2024-09-30 10:09:54 +02:00
estib
f442195769 Create PR preview: Edit the PR contents
Add the ability to edit the text contents of a PR before creating it.

Also, integrate the variants into one component
2024-09-26 13:33:21 +02:00
estib
215af9fc79 Hotkeys: Ctrl or Cmd + Enter
Add an utility to easily create the callback binding to an enter + ctrl or cmd in a component
2024-09-30 10:04:58 +02:00
estib
29b37f5cab Create PR preview
When creating a PR, display a preview of the title and body to confirm with the user
2024-09-26 10:19:47 +02:00
estib
108533777e PullRequestCard: 'View details' button
Add a button to the PR card that shows a Modal with the PR details
2024-09-25 17:19:04 +02:00
Esteban Vega
4137b31a5c
Merge pull request #5051 from gitbutlerapp/enable-string-error-toasts
improvement: Allow for string error toasts
2024-10-07 13:36:00 +02:00
estib
83738f35f6 improvement: Allow for string error toasts
Passing a string as the error to be displayed in the toast will display it as is
2024-10-07 12:18:42 +02:00
Caleb Owens
359ef1e216
Merge pull request #5050 from gitbutlerapp/fix-upstream-integration-when-no-branches
Fix upstream integration when there are no new branches
2024-10-07 11:07:27 +02:00
Caleb Owens
8c01244925 Fix upstream integration when there are no new branches
This is important as it will otherwise look like you've got the inverse diff in your uncommited changes.
2024-10-07 11:01:30 +02:00
Esteban Vega
8e7c0a6c87
Merge pull request #5049 from gitbutlerapp/commit-card-fix
small-fix: Update the typing of the context menu variable
2024-10-07 10:14:59 +02:00
estib
37f75061c8 small-fix: Update the typing of the context menu variable
Compliant with the Svelte linter rules
2024-10-07 09:49:21 +02:00
Esteban Vega
a7b2780a6a
Merge pull request #5046 from gitbutlerapp/update-style-of-integration-modal 2024-10-05 11:10:30 +02:00
estib
e27769077d IntegrateUpstreamModal: Update style
Update the style of the integrate upstream modal to:
- Differentiate between base-branch divergence
- Virtual branch states & resolutions

Also:
- Uncomment the option to create a merge commit to resolve the base-branch divergence
2024-10-05 10:18:06 +02:00
Kiril Videlov
91f0a916ce
Merge pull request #5045 from gitbutlerapp/Stacking-handle-upstream-commits
Stacking: fix upstream handling
2024-10-05 01:59:56 +02:00
Kiril Videlov
2b45293aee Stacking: fix upstream handling
- Correctly detect commits that have been pushed
- Return the list of upstream only commits on the list_virtual_branches response
2024-10-04 16:50:15 -07:00
Esteban Vega
4de7206b33
Merge pull request #4899 from gitbutlerapp/base-branch-improvements 2024-10-04 19:07:14 +02:00
Nico Domino
77c6529688
fix: use showStackingDetails persisted writable instead of function import (#5042) 2024-10-04 18:36:24 +02:00
Esteban Vega
4d419a5001
Merge pull request #5016 from gitbutlerapp/add-tests-for-moving-commits
Factor out the `move_commit` function
2024-10-04 18:34:56 +02:00
estib
265d957fb3 Base branch: Use graph ahead behind 2024-10-04 18:28:27 +02:00
Nico Domino
1d4f5f6762
fix: upstream commits accordion and cards (#5044) 2024-10-04 15:42:04 +00: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
Mattias Granlund
65a335dd5e chore: eslint ignore storybook static files 2024-10-04 14:33:48 +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