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
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
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
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
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
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
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
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
