Esteban Vega
6f901cd367
Merge pull request #5348 from gitbutlerapp/e-branch-3
...
cleanup: Type the file-list menu correctly
2024-10-29 10:35:46 +01:00
estib
120d372463
cleanup: Type the file-list menu correctly
2024-10-29 09:09:12 +01:00
estib
2efa82a988
style: Dropzones on the stacking headers
...
Display dropzones in the headers of the stacked branches, when dragging a commit.
Also:
Don't display the dropzones on the files-list when dragging a commit.
2024-10-29 08:42:32 +01:00
Mattias Granlund
c6c26c0e0e
Show correct remote name in branch header
...
User might have a push remote set where we create branches on a different remote than the target branch.
2024-10-28 22:07:43 +01:00
Mattias Granlund
4b77cf4074
Default to experimental locking
...
- changing the name of the field since existing projects would have an explicit false value already
2024-10-28 21:08:59 +01:00
Caleb Owens
f3b8ff60fe
stuff
2024-10-28 16:57:08 +00:00
Caleb Owens
41e8cc8ed3
Rename away from patch stacks
2024-10-28 11:47:32 +00:00
ndom91
50ed7667b7
fix: StackingPullRequestCard reactivity
2024-10-28 17:27:03 +01:00
Pavel Laptev
4ac22d5d5e
Update StackingSeriesHeader.svelte ( #5333 )
2024-10-28 17:21:33 +01:00
Pavel Laptev
7a03e89d28
fix typo
2024-10-28 13:34:17 +01:00
Pavel Laptev
60ccac2b63
reloadPR added
2024-10-28 13:34:17 +01:00
Pavel Laptev
f58a29fa1c
added context menu to the whole hard
2024-10-28 13:34:17 +01:00
ndom91
655db0ffee
fix: close contextMenus upon selection
2024-10-28 13:34:17 +01:00
ndom91
ffce14296a
feat: add contextMenu to checks and pr btns in StackingPullRequestCard
2024-10-28 13:34:17 +01:00
Kiril Videlov
97c344404f
Merge pull request #5316 from gitbutlerapp/fix-dashed-lines
...
Fix dashed lines
2024-10-28 13:25:52 +01:00
estib
4f672d111a
fix: Mitigate Prompt modal race condition
...
Add some checks and await the handling of git prompts.
2024-10-28 10:35:33 +01:00
ndom91
fe10b21602
fix: replace momet with dayjs
2024-10-26 16:54:01 +02:00
ndom91
e681aedc36
fix: renable type-aware linting rules
2024-10-26 16:53:26 +02:00
Pavel Laptev
27e8fe4fc1
path and lint fixes
2024-10-25 19:03:14 +02:00
Pavel Laptev
2959b17f35
Update DecorativeSplitView.svelte
2024-10-25 16:11:19 +02:00
Mattias Granlund
5c6151a6ae
Fix types related to $state<SvelteComponent>
2024-10-25 15:30:33 +02:00
Mattias Granlund
213bf0a7cc
Fix "copy PR link" in context menu
2024-10-25 15:26:30 +02:00
Pavel Laptev
2ed3957ab3
move Spacer to UI
2024-10-25 15:21:33 +02:00
Pavel Laptev
d3a0f3108b
Update text areas ( #5297 )
...
* reedit "borderlessTextArea" to "Textarea"
* replace old textareas
* Delete TextArea.svelte
* move `TextBox` to UI
* mock the keyboard event
* migrate `Textbox` to svelte 5
* Update PrDetailsModal.svelte
* fix event
* fix text formatting
* Update DialogBubble.svelte
* codereview fixes
2024-10-24 15:37:27 +00:00
ndom91
7df85ce4ed
fix: stacking accordion typo
2024-10-24 17:26:34 +02:00
Pavel Laptev
a5711a280b
Update ContextMenu.svelte ( #5299 )
2024-10-24 17:09:17 +02:00
estib
549f5341d7
lint: ALL BUTTONS HAVE TYPE, FOREVER
...
Ensure that all buttons have an explicit type so that no button mistakenly submits a form they may be inside of
2024-10-24 16:32:50 +02:00
Pavel Laptev
5f7941d17a
Context menu fixes ( #5291 )
...
* added "disabled" prop to Tooltip
* don't show tooltips when the context menu is activated
* correct context menu positioning
* fixes: menu toggling, hold the active card state when the ctx menu is opened
2024-10-24 11:13:49 +02:00
Pavel Laptev
dcd6391c88
New branch menus ( #5279 )
...
* added new overflowMenu
* refactor(StackingSeriesHeader): Remove redundant code for opening link and context menu options
* commit context menu added
* refactor: Improve click outside handler in ContextMenu.svelte
* feat(commit): Add ability to insert blank commit above or below existing commit
* refactor(contextmenu): Refactor align logic, remove el and add clientHeight/Width binding
* added: "Activated" state for overflow menu and buttons
* added: conditions for "kebab" buttons when context menu is opened
* fixing context menu positioning
* feat: Add preventDefault to context menu in OverflowMenuItem
* fix: Toggle button label
* added "copy PR" item
* Update OverflowMenuItem.svelte
* Update InsertEmptyCommitAction.svelte
* adde more itrm to the commit context menu
* Update StackingCommitList.svelte
* Update Button.svelte
* fix checks
* change context menu trigger area
* components rename
* restrict context menu actions to the commit type
* Update CommitContextMenu.svelte
* add missing prop
* rearrange buttons
* Update apps/desktop/src/lib/branch/StackingSeriesHeader.svelte
* some buttons had missing kind prop
* move new components to UI
---------
Co-authored-by: Nico Domino <yo@ndo.dev>
2024-10-24 02:46:06 +02:00
ndom91
4508ff9eaf
fix: ensure upstream name is properly passed to prDetailsModal
2024-10-23 18:04:22 +02:00
ndom91
263de09b84
fix: rename pushBeforeCreate args
2024-10-23 17:57:36 +02:00
ndom91
d4b60d0bc3
fix: simplify pushAndCreate logic
2024-10-23 17:50:47 +02:00
ndom91
af8955ccf1
fix: enable "push and create PR"
2024-10-22 18:35:42 +02:00
Esteban Vega
f67e0edc41
Merge pull request #5249 from gitbutlerapp/e-branch-12
...
Project settings: GitForm
2024-10-23 14:40:55 +02:00
Pavel Laptev
3aa4c0b091
Update StackingUpstreamCommitsAccordion.svelte ( #5281 )
2024-10-23 14:33:16 +02:00
ndom91
b939af8299
fix: ensure pullRequestCard still works in both stacking/non-stacking contexts
2024-10-23 12:05:29 +02:00
ndom91
41b8734012
chore: cleanup CommitDragItem
2024-10-23 12:05:29 +02:00
ndom91
4b11a779ea
fix: pull pr monitor and checks monitor creation into each series
2024-10-23 12:05:29 +02:00
ndom91
d8971787f8
fix: show commit fileList when there are only conflictedFiles
2024-10-23 11:58:01 +02:00
ndom91
6c0033bb33
fix: test typo
2024-10-23 11:09:39 +02:00
ndom91
7cae1e6972
fix: failing service.test
2024-10-23 11:09:39 +02:00
ndom91
09297430e0
fix: apps/desktop eslint issues
2024-10-23 11:09:39 +02:00
ndom91
f928b25fff
fix: update tsconfig related options
2024-10-23 11:09:39 +02:00
estib
2107e0e7a5
style: Fix the history container z-index
...
Fix the side-view container so that it is rendered above the lane headers
2024-10-23 09:41:00 +02:00
ndom91
7f9c29cf5f
fix: allow rename after branch has been pushed, with warning
2024-10-22 13:08:15 +02:00
ndom91
883cdb510a
fix: refactor stacking PR card
2024-10-22 12:02:11 +02:00
ndom91
d25a399db6
fix: dont show push btn if branch has been integrated
2024-10-22 12:01:56 +02:00
ndom91
c642ff751f
fix: adjust imports of string utils to new @gitbutler/ui pkg
2024-10-22 11:56:40 +02:00
ndom91
e1401d11af
fix: move all stirng utils to shared ui utils
2024-10-22 11:56:40 +02:00
ndom91
42c33cb895
fix: simplify Stack.svelte hasConflicts
2024-10-21 22:05:39 +02:00
ndom91
a7e98d20a3
fix: simplify StackingCommitList hasConflicts prop
2024-10-21 21:54:03 +02:00
Kiril Videlov
d78c77cf3d
Merge pull request #5254 from gitbutlerapp/add-tests-to-ui-slugify
...
UI: add tests to slugify
2024-10-21 19:36:03 +02:00
ndom91
7e7e867762
fix: stack header z-index
2024-10-21 19:32:52 +02:00
Kiril Videlov
b9124e8545
UI: add tests to slugify
2024-10-21 19:31:56 +02:00
ndom91
90e40f49a9
fix: don't force lowercase and allow / character
2024-10-21 18:42:15 +02:00
estib
0ddbbc4283
Project settings: GitForm
...
Create a dedicated git project settings form component.
Move the option to force-push to that new form
2024-10-21 18:27:11 +02:00
ndom91
6ba0bfc2ff
fix: stacking remove pseudo dropzone line overlay
2024-10-21 14:23:12 +02:00
ndom91
dfec47a962
fix: do not error on empty dropzoneIndexes map
2024-10-21 14:09:23 +02:00
Esteban Vega
9851549d08
Merge pull request #5241 from gitbutlerapp/e-branch-1
...
Stacking Commit Card: Port the conflict resolution confirmation modal
2024-10-21 13:56:12 +02:00
estib
3c4eb5c6d8
Stacking Commit Card: Port the conflict resolution confirmation modal
...
Port the confirmation modal shown when attempting to resolve the conflicts not in the first conflicted commit
2024-10-21 12:25:39 +02:00
Pavel Laptev
029b8e5b2c
move Toggle and ToggleButton to UI
2024-10-21 12:07:19 +02:00
Pavel Laptev
abdee0e5d0
fix button states
2024-10-21 11:54:39 +02:00
estib
eba7f9c388
PR template section: Persist the user selection
...
The user can choose whether to use a PR template and that will be persisted accross PRs.
- remove the PR template section from the Project settings
2024-10-21 11:37:00 +02:00
Esteban Vega
ae2307b688
Merge pull request #5239 from gitbutlerapp/fix-modals-typing
...
fix: Type the modals correctly
2024-10-21 10:40:00 +02:00
estib
e7b514cc52
fix: Type the modals correctly
...
We need to type the modals correctly as possibly undefined in order to guard against calling its methods before the binding has succeeded.
2024-10-21 10:27:14 +02:00
Pavel Laptev
5811a5741a
fix header styles
2024-10-20 23:56:23 +02:00
Pavel Laptev
c20c7c2a10
Update PrTemplateSection.svelte
2024-10-20 23:42:35 +02:00
Pavel Laptev
121d96931e
ToggleButton component updated
2024-10-20 23:39:33 +02:00
Pavel Laptev
578461328b
Update PrDetailsModal.svelte
2024-10-20 23:31:02 +02:00
Pavel Laptev
7cabfe59db
remove unused code
2024-10-20 23:14:04 +02:00
Pavel Laptev
f27f65a6fb
update design
2024-10-20 22:18:20 +02:00
Pavel Laptev
1b3b8fdb41
Copy improve for auto select text ( #5231 )
...
* Copy improve
* Update +page.svelte
* Update +page.svelte
2024-10-20 02:32:05 +00: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
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
