Commit Graph

697 Commits

Author SHA1 Message Date
Mattias Granlund
2ef866baa6 Tauri v1 -> v2
Refactor appSettings to accommodate new Tauri v2 API

- creates AppSettings class and injects it where needed
- avoids `window` undeclared variable during vite build process
2024-10-30 14:23:32 +01:00
Kiril Videlov
bd10692afb Only show non-archived branches in the UI 2024-10-30 12:52:55 +01:00
Kiril Videlov
8f4cb6160f replace a Vec of Forge Identifers with an Option instead
Likely we wont need multiple
2024-10-30 10:32:44 +01:00
Kiril Videlov
6d0f9fe141 When creating a vbranch from PR pass the forge id 2024-10-29 23:25:58 +01:00
Kiril Videlov
88729a858c Add API endpoint for setting the forge ids
Plus frontend medthod in branchController for calling it
2024-10-29 22:54:54 +01:00
Kiril Videlov
4bba0dd2b9 expose forge ids on the branches stream api 2024-10-29 21:52:57 +01:00
estib
ad345a7770 fix: Open files on editor in Windows
In order to open the files using the editor url, we need to use forward slashes for the path, even on Windows.
2024-10-29 10:39:23 +01:00
Pavel Laptev
fedd3187f9
Update StackingSeriesHeader.svelte (#5350) 2024-10-29 11:24:52 +01:00
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
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