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
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
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
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
estib
d8b2bee18c
fix: Lint errors
2024-10-04 10:35:17 +02:00
estib
9834627a20
Base: Propagate the conflicting status to the commits
2024-09-25 14:34:10 +02:00
estib
1368d87ed0
Base branch divergence resolution
...
Allow the user to choose how to resolve the base-branch divergence
2024-09-25 14:05:04 +02:00
estib
2091025227
Resolve upstream integration
...
Add a method to determine which should be the new base branch target commit ID based on what resolution approach is selected
2024-09-24 17:16:26 +02:00
estib
e4cd357b8a
BaseBranch: Handle the button actions correctly
...
Depending on which action the user chooses, and whether they've set certain flags, act accordingly
2024-09-24 15:18:47 +02:00
estib
78d40a7493
BaseBranch: Don't be scary when pushing
...
Only display the warnings and confirmation modals when actual changes can get lost (resting to local or remote).
Otherwise, display less scary notifications and let the user push if needed
Merge remote-tracking branch 'origin/master' into base-branch-improvements
2024-09-24 14:06:49 +02:00
estib
9060a4287c
Ability to push the base branch
...
If needed, the base branch can be pushed or force pushed
2024-09-24 14:06:05 +02:00
estib
2be4aaac2d
Display the divergent state in the app
...
If the local target has diverged from the remote target, display that to the user as a warning
Only show either the divergence warning or upstream count
BaseBranch: Use runes
BaseBranch: Display the branch graph
In order to make it a bit clearer what the divergence state of the base branch is. reuse the line graphs to display it
BaseBranch divergence: Add a confirmation modal
2024-09-24 14:06:03 +02:00
estib
19acb8f22c
Array utils: group items by condition
2024-09-24 14:02:32 +02:00
estib
3a2cf73bcd
BaseBranch: Determine whether the base diverged
...
Determine whether the local target has diverged from the remote,
and return some information about that
2024-09-24 13:57:22 +02:00
Nico Domino
77c6529688
fix: use showStackingDetails persisted writable instead of function import ( #5042 )
2024-10-04 18:36:24 +02:00
Nico Domino
1d4f5f6762
fix: upstream commits accordion and cards ( #5044 )
2024-10-04 15:42:04 +00:00
estib
c6f19bc1ff
fix: Correctly update the zoom from the settings
2024-10-04 16:00:19 +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
