estib
936ec01e8f
Conflict Resolution: Add a confirmation modal
...
If attempting to resolve conflicts on non-acestor-most commits, the user will be prompted to confirm whether they actually want that or not.
2024-10-10 10:30:29 +02:00
Esteban Vega
857cf7816c
More PR details follow-ups ( #5073 )
...
- Add a dedicated 'open PR in browser' button
- Fix the description generation in the modal
2024-10-10 00:02:01 +02:00
Esteban Vega
e28a4b697c
Merge pull request #5069 from gitbutlerapp/user-mail-is-optional
2024-10-09 22:50:00 +02:00
ndom91
95767ab474
fix: rm 'create branch'/'push ref' btns from stacking commit card
2024-10-09 21:44:20 +02:00
ndom91
ebcfa9f9a0
fix: harmonize commitStatus types and ensure correct color commitCard and branchHeader are rendered
...
fix: eslint
2024-10-09 21:44:20 +02:00
ndom91
6e631d8ea4
fix: correctly color branch header
2024-10-09 21:44:20 +02:00
ndom91
b4deaae012
fix: do not group commits in stacking mode series rendering
2024-10-09 21:44:20 +02:00
ndom91
3a642c750f
fix: pass only 'upstreamPatches' and 'patches' from the current series to commitList
2024-10-09 21:44:20 +02:00
Caleb Owens
5071cc40ff
LIst conflicted files in commit files list
2024-10-09 20:21:57 +02:00
Caleb Owens
3ba4261599
Commit uncommit
2024-10-09 19:35:05 +02:00
Kiril Videlov
3978476b78
Add an extra field remote_commit_id
on the API type VirtualBranchCommit
...
This makes it possibe (and easy) for the UI to determine if there is another (different) commit on the remote for the same patch
2024-10-09 18:15:10 +02:00
Pavel Laptev
e05c1a4a08
Move dummy UI and minor code refactor ( #5061 )
...
* update: storybook styles
* fix: Link button prop
* move borderless textarea to UI
* add: BorderlessTextarea story
* remove unused `autoHeight`
* simplify "Props" names
* migrate to Svelte 5: EmptyState component
* fix: autofocus when open the branches search
* eslint
* lint fixes
* lint fixes
---------
Co-authored-by: estib <stron@me.com>
2024-10-09 17:00:35 +02:00
Nico Domino
531cbde1ff
fix: stackingCommitList reorder-dropzone and "add empty commit" btn rendering ( #5066 )
2024-10-09 16:59:37 +02:00
estib
8860622ff4
User: Make email optional
...
When authenticating with some IdPs, email doesn't get shared.
In that case, trying to authenticate would just throw a Rust-end error to the users.
This fixes that
2024-10-09 16:43:00 +02:00
ndom91
7858230812
fix: disable deleting series if there is only 1
2024-10-09 15:39:58 +02:00
ndom91
e5fbb18883
fix: reorient new series name modal action btns
2024-10-09 15:39:58 +02:00
Caleb Owens
82b58b6875
Make edit mode fantastic
2024-10-09 15:27:20 +02:00
Caleb Owens
39f9f50296
Float unconflicted files in edit mode
2024-10-09 11:21:51 +02:00
Caleb Owens
12782d5229
Merge pull request #5000 from gitbutlerapp/pr-5000
...
FEARLESS REBASING
2024-10-08 16:49:51 +02:00
Esteban Vega
72e981f8cc
pr details follow up ( #5054 )
...
* PR Details: CMD or Ctrl + Click opens the browser
* Segment: Optionally make it unfocusable
Control whethe the segment can be focused on tab, or not
* PR Details: Remove unused 'e' handler
* Borderless Textarea: Ability to autofocus
Optionally, autofocus the input field on mount
* PR Details: Update focus behavior
- Focus on the title input filed on mount
- Make the segments unfocusable
* design update
* Update PrDetailsModal.svelte
---------
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-10-08 15:50:43 +02:00
Caleb Owens
45fbb1af76
Remove old update_base_branch code
2024-10-07 17:46:28 +02:00
Caleb Owens
2f33d618d5
Remove succeeding rebase flag from the frontend
2024-10-07 17:31:08 +02:00
Pavel Laptev
f6621ba4d5
copy update
2024-10-07 14:33:22 +02:00
estib
efcfe0954e
PrDetailsModal: Display the actualy body
...
- Display the actual body value
- Generate the message on `shift` + `cmd` + g
2024-10-07 14:14:38 +02:00
estib
455d67fb86
Prettier fixing
2024-10-07 14:07:20 +02:00
Pavel Laptev
5ec15fcf26
fixes
...
- return accidentally deleted code
- pr card layout and copy updated
2024-10-07 13:48:20 +02:00
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
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
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