Kiril Videlov
15ad86c01e
Merge pull request #5232 from gitbutlerapp/kv-branch-1
...
fixes a bug in handling the remote name
2024-10-20 00:53:26 +02:00
Kiril Videlov
d2d31644a1
remove unnecessary test
2024-10-20 00:32:06 +02:00
Kiril Videlov
dd93fc16db
fixes a bug in handling the remote name
...
Seems like projects that were created long time ago do not have the push_remote_name field set up. Add correct handling for all those situations
2024-10-20 00:22:57 +02:00
Pavel Laptev
b6967154d6
UI fix default editor select ( #5228 )
...
* fix Select component height
* Remove unnecessary copy
2024-10-19 20:15:54 +02:00
estib
6a64db6c29
PR details modal: Allow user to choose the PR template
...
User can select the PR template to use for each individual PR
Also:
Improve the tests of the forge review crate
2024-10-18 18:22:19 +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
Caleb Owens
178d4f93f2
Use declaration: true to always export types
2024-10-18 16:31:56 +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
estib
93786f931d
Factor out the 'read PR template' content logic
...
Move the function that reads the PR template content to the `gitbutler-forge` crate.
The method will also verify that that's a valid PR template path for the project's forge type
2024-10-18 15:05:36 +02:00
Caleb Owens
ac50a6b582
Merge pull request #5207 from gitbutlerapp/Patch-stack-listing
...
Use turbo watch to correctly react to dependency changes in web
2024-10-18 14:49:34 +02:00
Caleb Owens
ff334cccac
Patch stacks :D
2024-10-18 14:48:56 +02:00
Caleb Owens
ad91112bff
Use turbo watch to correctly react to dependency changes in web
2024-10-18 14:36:42 +02:00
Kiril Videlov
c582384887
Merge pull request #5203 from gitbutlerapp/prefix-template-branch-names-with-user-initials
...
Templated branch names - prefix with user initials
2024-10-18 14:15:56 +02:00
Kiril Videlov
308fa92615
Merge pull request #5199 from gitbutlerapp/update-copy-in-series-ui
...
Series UI: update copy to speak about branches
2024-10-18 14:12:57 +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
Kiril Videlov
1dda7c4455
Templated branch names - prefix with user initials
2024-10-18 14:08:20 +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
ndom91
ce3ac1a079
feat: update default stack name to 'Lane'
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
Kiril Videlov
86b70a30a7
Merge pull request #5198 from gitbutlerapp/one-more-condition-for-requires-force
...
fix - stack / requires force
2024-10-18 12:07:20 +02:00
Kiril Videlov
74e35f86cf
fix - stack / requires force
...
Toggle on 'requires force push' if there are upstream only patches (so that they can be overriden)
2024-10-18 12:01:46 +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
Kiril Videlov
97937e242f
Merge pull request #5193 from gitbutlerapp/stack-api-light-refactor
...
Stack api - small refactor
2024-10-17 20:23:20 +02:00
Kiril Videlov
de6de23155
Stack api - small refactor
...
Remove duplications, typos etc
2024-10-17 20:03:13 +02:00
Kiril Videlov
2dc86e85bd
Merge pull request #5192 from gitbutlerapp/refactor-branch-actions-stack-module
...
Move a series converion function in branch-actions to separate module
2024-10-17 19:17:52 +02:00
Kiril Videlov
a4693c1fee
Merge pull request #5191 from gitbutlerapp/fix-stack-upstream-commit-listing
...
Stack: fix upstream commit listing
2024-10-17 18:57:20 +02:00
