Pavel Laptev
b6967154d6
UI fix default editor select ( #5228 )
...
* fix Select component height
* Remove unnecessary copy
2024-10-19 20:15:54 +02:00
ndom91
c02dd4cbd9
feat: add vscodium for caleb
2024-10-18 17:41:02 +02:00
ndom91
101bb6be40
feat: add VSCode Insiders to "open in editor" options
2024-10-18 17:41:02 +02:00
Pavel Laptev
ff29f37457
UI: Stacking branch header ( #5217 )
...
* styles update
* fix focusTrap
2024-10-18 15:35:09 +00:00
ndom91
6ca48807d0
feat: enable stacking for real this time
2024-10-18 17:27:19 +02:00
ndom91
92e2116636
enable stackingFeature by default
2024-10-18 17:21:11 +02:00
ndom91
79812d7e43
feat: add diff text wrap userSetting
2024-10-18 17:18:51 +02:00
Esteban Vega
904fd2b458
Merge pull request #5213 from gitbutlerapp/move-out-the-read-pr-template-content
...
Refactor the "Read PR template contents logic"
2024-10-18 16:52:44 +02:00
Esteban Vega
4ba68677da
Merge pull request #5200 from gitbutlerapp/move-out-the-pr-templates-logic
...
Refactor the "PR template path" fetch logic
2024-10-18 16:50:01 +02:00
Caleb Owens
928262a09b
Merge pull request #5209 from gitbutlerapp/branch
...
Patch stacks :D
2024-10-18 16:39:16 +02:00
Pavel Laptev
d9c027dba9
update styles and props ( #5204 )
2024-10-18 16:26:23 +02:00
Esteban Vega
e37275e8c9
Merge pull request #5214 from gitbutlerapp/e-branch-1
...
small-fix: Remove extra quote in add series modal
2024-10-18 15:58:49 +02:00
ndom91
d4de6aed74
fix: calculating dropzone distance when index 0
2024-10-18 15:54:12 +02:00
estib
4b75964d05
small-fix: Remove extra quote in add series modal
2024-10-18 15:52:16 +02:00
ndom91
51fdce3e35
fix: status icon line on series header
2024-10-18 15:47:01 +02:00
Pavel Laptev
a2b90bab55
UI stacking lanes style fixes ( #5211 )
...
* fix margins and positioning
* fix dots on zoom
* Update StackHeader.svelte
* Update StackingStatusIcon.svelte
2024-10-18 13:38:55 +00:00
estib
4a96c1a423
Use the forge method to get the PR template content
...
Use the forge service to get the PR content method.
2024-10-18 15:38:02 +02:00
Pavel Laptev
45467f33e5
UI stacking lanes style fixes ( #5210 )
...
* fix margins and positioning
* fix dots on zoom
2024-10-18 15:19:15 +02:00
Pavel Laptev
e2b08729de
Styles fix: new branch modal ( #5206 )
2024-10-18 15:14:38 +02:00
Caleb Owens
ff334cccac
Patch stacks :D
2024-10-18 14:48:56 +02:00
Kiril Videlov
f62883ffdb
Series UI: update copy to speak about branches
...
At least for now, its more familiar terminology
2024-10-18 14:10:33 +02:00
Esteban Vega
7624ef5e01
Merge pull request #5202 from gitbutlerapp/branch
...
PR cards: Remove the mergeable state message
2024-10-18 13:58:24 +02:00
ndom91
09bcfe5547
fix: update svelte checks of 'vritual branch'
2024-10-18 13:57:33 +02:00
estib
9abc6b72b4
PR cards: Remove the mergeable state message
...
Remove the status message regarding the mergeable state in the PR card.
2024-10-18 13:37:36 +02:00
ndom91
d14c3e9387
fix: revert adding tooltip prop to ContextMenuItem
2024-10-18 12:57:28 +02:00
ndom91
fa2954798d
fix: instead of disabling+tooltip, just dont show invalid items in contextMenu
2024-10-18 12:57:28 +02:00
ndom91
2bc44d6433
chore: convert remaining ContextMenuItems to runes / snippets
2024-10-18 12:57:28 +02:00
ndom91
6804bfb6ef
feat: add tooltips to series header contextMenu items to explain why they're disabled
2024-10-18 12:57:28 +02:00
ndom91
c760a0b482
feat: add tooltip option to ContextMenuItem
2024-10-18 12:57:28 +02:00
Esteban Vega
a9ecf285f6
add-branch-to-stack-update ( #5188 )
...
* Button: Add more styling props
- Choose the border radius style
- Set a max-width
- Ignore children (helps with the animation in between having no children and having a large child)
* StackingAddSeriesButton
Replace the 'new series' card with a button that appears on hover.
Also:
The modal displays more information, like what the resulting branch name will be called
* style updates
* button center align
* fix tooltip positioning
* some UI fixes
* added focus trap to the context menu
* styles updated
* update: transition time
---------
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-10-18 12:55:08 +02:00
ndom91
1e3f9ecd8a
fix: update label to 'Push All' when there are multiple series
2024-10-18 11:32:35 +02:00
ndom91
99ada05663
feat: add token for branch_name in custom prompts
2024-10-17 23:00:03 +02:00
estib
d41e271e99
ForgeType
...
Set the type of repository forge type (e.g. GitHub, GitLab) once the base branch is determined.
Get the available templates with the updated method
2024-10-17 18:17:07 +02:00
Caleb Owens
eea2f32220
Prevent undesirable if can't talk to server
2024-10-17 16:13:16 +02:00
Caleb Owens
73f458738b
Fix race condition in listing patch stacks
2024-10-17 14:27:28 +02:00
Caleb Owens
538c19671b
Make sure feature flag works
2024-10-17 14:07:39 +02:00
Caleb Owens
92c1188759
Patch stack creation
2024-10-17 12:59:14 +02:00
Caleb Owens
2c00d5f869
Listing series
2024-10-16 17:49:55 +02:00
ndom91
c5c54b672f
fix: in series delete confirmation modal show correct seriesName
2024-10-17 14:35:44 +02:00
ndom91
2005e04346
fix: update copy for feature flag for enabling multi-series stacking support
2024-10-17 14:23:41 +02:00
ndom91
f94ea35629
fix: also disable series 'rename' via contextMenu once pushed
2024-10-17 12:06:07 +02:00
Kiril Videlov
5d28c1a76a
Merge pull request #5162 from gitbutlerapp/kvs-branch
...
Implement 'integrate upstream changes' for the stacked flow
2024-10-17 12:34:56 +02:00
ndom91
032a0dfe48
fix: stacking dont show PR cards/btns if no service exists
2024-10-17 12:08:51 +02:00
estib
73f81332a3
fix: New branch dropzone only accepts uncommited files
...
When creating a brand new branch, don't let commited files or hunks create new branches
2024-10-16 19:15:56 +02:00
Kiril Videlov
64fd3b893d
Merge pull request #5165 from Byron/fixup-5089
...
Some improvements on top of #5089
2024-10-16 19:19:46 +02:00
Esteban Vega
740479861b
Merge pull request #5169 from gitbutlerapp/add-pr-details-and-refetch
...
PR card updates
2024-10-16 17:47:04 +02:00
Sebastian Thiel
201ceec88b
Adapt the UI implementation to deal with the lack of the FileInfo::status field
2024-10-16 16:49:44 +02:00
estib
af625080db
fix: Get the right PR source branch
...
We were setting the PR **base branch** (e.g. main or master) as the source branch, instead of the head, as intended
2024-10-16 16:46:20 +02:00
ndom91
d9e103d898
fix: hide images > 5mb
2024-10-16 16:55:28 +02:00
ndom91
833d8510ce
fix: disable image contextMenu in file preview
2024-10-16 16:55:28 +02:00
