estib
c9a5d7a75d
Branch file list: Remove comments about actions
2024-09-16 11:42:04 +02:00
estib
08fb9effc4
Merge remote-tracking branch 'origin/master' into keyboard-shortcuts
2024-09-16 11:40:23 +02:00
estib
79e25de197
fix: actions initialization for CommitDragItem
...
Use a derived store to compute actions based on the branch and commit,
removing the need for a side effect. This enhances readability and
ensures that actions are updated reactively whenever dependencies change.
2024-09-16 10:33:16 +02:00
Mattias Granlund
97d117bb02
Improve push failed error analytics
...
- error message was not being included
2024-09-16 10:20:14 +02:00
Kiril Videlov
def3692df8
Merge pull request #4917 from gitbutlerapp/fix-pr-infinite-loop
...
fix: Don't update the state with the pre-effect
2024-09-16 10:10:00 +02:00
Esteban Vega
5faa0ac1b5
Merge pull request #4916 from gitbutlerapp/fix-file-selectability
...
fix: Only allow hunk selection in uncommited files
2024-09-16 10:08:35 +02:00
estib
3eadc2e743
fix: Don't update the state with the pre-effect
...
It seems like this would lead to an infinite loop in some cases
2024-09-16 10:03:29 +02:00
estib
2467b87fda
fix: Only allow hunk selection in uncommited files
...
Files hunks from the commits should not be selectable
2024-09-16 09:50:59 +02:00
Pavel Laptev
8ec4fbdd67
few CSS fixes
2024-09-15 23:07:04 +02:00
estib
2bf882676f
fix HunkDiff borders
...
The borders move with the hunk diffs
2024-09-15 10:49:47 +02:00
Pavel Laptev
1c70cdc3f4
Fixes scroll on drag ( #4913 )
...
* remove old tailwind CSS class
* fix `onDestroy` lifecycle error
* fix scroll glitch for changed files while dragging
2024-09-14 17:43:06 +02:00
Esteban Vega
1a47f5ec4d
Merge pull request #4850 from gitbutlerapp/ndom91/use-template-dropdown
...
fix: refactor pr template path input to pre-filled `Select` instead of `TextBox`
2024-09-13 17:25:58 +02:00
Caleb Owens
edd0cbe0e6
Rename unapplying
2024-09-13 16:58:42 +02:00
Nico Domino
c952ffee65
Merge branch 'master' into ndom91/use-template-dropdown
2024-09-13 16:28:58 +02:00
Caleb Owens
ce2aa91385
feat: Add onclick prop to DefaultTargetButton
...
Add onclick prop to DefaultTargetButton component to enable
button functionality. This change allows the component to handle
click events and perform specified actions when the button is
clicked.
2024-09-13 16:07:25 +02:00
ndom91
147a8aafcd
fix: tweak copy
2024-09-13 12:56:08 +02:00
ndom91
d1d2e0c80b
fix: cleanup pr template method names
2024-09-13 12:10:07 +02:00
ndom91
e8bb66c151
fix: use relativePath and get project basePath on rust side
2024-09-13 12:01:03 +02:00
ndom91
d14b6496b1
fix: rename githost form
2024-09-13 11:29:24 +02:00
ndom91
907bbe838d
fix: more conflict clean up
2024-09-13 11:17:04 +02:00
ndom91
e842b282ae
fix: merge conflicts
2024-09-13 11:15:06 +02:00
Mattias Granlund
eec288548a
Remove displayed remoteRef from commit card
2024-09-12 18:38:09 +02:00
Mattias Granlund
8aafd8345d
Show pr card for commit group if such exists
2024-09-12 18:38:09 +02:00
Mattias Granlund
1b175bb119
Re-use push button with snippet
2024-09-12 18:38:09 +02:00
Mattias Granlund
ab08bb9a47
Render one commit list per commit group
2024-09-12 18:38:09 +02:00
Mattias Granlund
5b3dff9634
Toggle feature by typing s t a c k
2024-09-12 18:38:09 +02:00
Mattias Granlund
bd7be6a759
Convert CommitList to svelte5 component
2024-09-12 18:38:09 +02:00
Mattias Granlund
6a7ae9dcb3
Add stack grouping function
2024-09-12 18:38:09 +02:00
Mattias Granlund
35b3991ab8
Use modified branch header whens stacking is enabled
2024-09-12 18:38:09 +02:00
estib
5395d00a1a
Merged origin/master into keyboard-shortcuts
2024-09-12 14:47:17 +02:00
Caleb Owens
3c61856481
Merge pull request #4894 from gitbutlerapp/improve-topics
...
improve topics
2024-09-12 14:12:41 +02:00
Caleb Owens
bd1cc06af2
Use pagination API for querying labels
2024-09-12 14:06:12 +02:00
Caleb Owens
c78fe929d9
Improve topics just a tad
2024-09-12 13:56:18 +02:00
Nico Domino
3bc54fcad0
fix: rm unnecessary extra markdown wrapping class ( #4893 )
2024-09-12 11:38:50 +00:00
Caleb Owens
db992dedfa
Merge pull request #4869 from gitbutlerapp/update-api
...
Update api
2024-09-12 13:23:05 +02:00
Nico Domino
3a478b4f15
fix: reactive markdown rendering ( #4888 )
2024-09-12 09:53:21 +00:00
estib
5352eb1717
Merged origin/master into keyboard-shortcuts
2024-09-12 09:13:39 +02:00
Pavel Laptev
7c0a3766af
usused CSS removed
2024-09-12 02:03:22 +02:00
Pavel Laptev
8723bd5c17
selected hunk colors update
2024-09-12 01:48:01 +02:00
Pavel Laptev
96d52014e0
Fix hunk header styles
...
- There was an issue with borders on scroll
- Fix the hunk header paddings
- replaced `box-shadow` with borders. Looks like it's not longer an issue
2024-09-12 01:29:28 +02:00
Pavel Laptev
e4df03aa50
remove unused code
2024-09-12 01:27:41 +02:00
Pavel Laptev
965118de7a
Remove duplicated hunk inf and replace indicators with infomessages
2024-09-11 23:29:10 +02:00
Nico Domino
4700d5b2f1
fix: improve deeply nested token rendering ( #4883 )
2024-09-11 18:36:57 +02:00
estib
5137517650
BranchFilesList keybindings: Select all files
...
Select all files with meta-key + 'a'.
Also, `fileIdSelection` will make sure that the no duplicates are added to the selection
2024-09-11 17:31:33 +02:00
estib
d41827c9d1
BranchFilesList keybindings: Stage and unstage files
...
Stage or unstage the files by pressing the space-bar on the selected files.
Click enter to focus on the commit message input field
2024-09-11 17:20:56 +02:00
estib
f3b3649bca
Merged origin/master into keyboard-shortcuts
2024-09-11 17:03:04 +02:00
Caleb Owens
d76d900a7e
Fix janky generics
2024-09-11 16:00:04 +02:00
estib
b8c60adc64
Merge branch 'master' into keyboard-shortcuts
2024-09-11 15:50:07 +02:00
estib
c3273c10fe
Commit Input: Control focus behaviors
...
Add the ability to control externally when the commit message text input is focused.
Also:
Opent the commit input when a file is selected and the space bar is pressed
2024-09-11 15:43:38 +02:00
Esteban Vega
c4686bbf63
Merge pull request #4859 from gitbutlerapp/check-boxes-behavior
...
Improve the file list checkboxes behavior
2024-09-11 15:43:18 +02:00
estib
4c93b3632e
Clean-up: Remove console log
2024-09-11 15:40:10 +02:00
Caleb Owens
aeea013ba0
Update base branch button feature flagged
2024-09-11 15:18:20 +02:00
estib
b08fb7d101
Commit Input: Close on 'Escape'
...
Pressing 'Escape' will close the commit input file
2024-09-11 14:30:29 +02:00
Esteban Vega
2d8b82309d
Merge pull request #4876 from gitbutlerapp/file-navigation
...
fix: File key navigation and selection
2024-09-11 14:28:43 +02:00
Nico Domino
0595319405
fix: rm unnecessary Space.svelte and add List/ListItem ( #4874 )
2024-09-11 13:59:08 +02:00
Nico Domino
a1ff2079db
fix: createPr arguments order ( #4878 )
2024-09-11 11:43:26 +00:00
estib
390119e009
fix: File key navigation and selection
2024-09-11 12:19:52 +02:00
Pavel Laptev
25c2f516fd
style: Updated box-shadow to use custom variable in ContextMenu and Select components ( #4870 )
2024-09-11 12:12:10 +02:00
Caleb Owens
191686ec4d
Ahhh, don't loose shit
2024-09-11 11:23:20 +02:00
Caleb Owens
f5477a502b
Issues
2024-09-10 22:35:02 +02:00
estib
aaae6e605c
HunkDiff: Udpate the diff table style
2024-09-10 19:52:35 +02:00
ndom91
09b02feb78
fix: wire up prService template fns correctly
2024-09-10 19:29:24 +02:00
ndom91
b7a037b1dc
fix: move new template methods to PRService
2024-09-10 19:18:42 +02:00
ndom91
781fbb5a13
fix: merge conflict
2024-09-10 18:55:45 +02:00
ndom91
f53b5b8f2e
chore: more cleanup
2024-09-10 17:34:22 +02:00
ndom91
4aa9e96ced
fix: use pullRequestPath as boolean
2024-09-10 17:24:51 +02:00
ndom91
eecea80884
fix: read pr tempalte from disk
2024-09-10 17:14:35 +02:00
ndom91
aaa3dbae5d
chore: revert github: pnpm dependency string
2024-09-10 15:13:33 +02:00
ndom91
da8d4d791b
chore: test removing protocol in package.json github entries
2024-09-10 14:41:21 +02:00
ndom91
3175174c43
fix: test https+github protocol in package.json
2024-09-10 14:37:50 +02:00
ndom91
bfcc4abc26
chore: add notes to other githost types
2024-09-10 14:02:11 +02:00
ndom91
25bbe28411
fix: cleanup and pass absolute path from rust to FE
2024-09-10 13:55:18 +02:00
ndom91
e888025499
fix: move PrTemplate fns to gitHost
2024-09-10 12:22:02 +02:00
estib
ba021da232
PR service: Initialize it only with the base branch
...
Re-write the PR service interface in order to set the upstream branch when creating the PR, not the service.
2024-09-10 11:16:03 +02:00
estib
041344bab5
Utils: Create branch module
...
Add a branch utilities module with a function that retrieves the branch name from a reference
2024-09-10 11:09:20 +02:00
Kiril Videlov
23cd9b0e97
fix ci lol
2024-09-10 16:38:12 +02:00
Pavel Laptev
85462206a4
Edit mode UI updates ( #4862 )
...
* Show full status tag only if file modified
* tooltip to the page added
2024-09-10 11:35:17 +02:00
ndom91
bfe299aa98
fix: cleanup and PR review
2024-09-10 10:37:15 +02:00
estib
94b4744c3f
Move the error logging to the Branch controller
2024-09-10 09:19:33 +02:00
ndom91
a5fb400985
fix: simplify setting git_host default settings in projects.json
2024-09-09 15:35:15 +02:00
ndom91
22f71c2a58
fix: rename get_pr_templates fn to github specific
2024-09-09 15:22:05 +02:00
ndom91
e0c2bdfe14
fix: eslint BranchHeader import-order
2024-09-09 14:57:41 +02:00
ndom91
8efe6c7a71
fix: cleanup createPr arguments and types
2024-09-09 14:02:59 +02:00
estib
8c22b6c0d1
Update Ownership class
...
Rename the `Ownership` class to `SelectedOwnership`, as it is only used to determine the selected state of the files to add to a commit.
Renamed the methods as well to convey their actual purpose.
The `SelectedOwnership` class will be updated in a way that the selected is persisted across file/hunk ownership updates
2024-09-09 13:53:57 +02:00
ndom91
8986dc3e12
fix: refactor template inputs to being passed to 'createPr' fn
2024-09-09 13:49:46 +02:00
estib
7bb3c7c9cf
BranchFilesList: Clean-up and prefer Svelte 5 APIs
...
Refactor and clean-up the component, so that the newer, more readable Svelte 5 state APIs are used
2024-09-09 12:00:34 +02:00
estib
660c555cd9
Move chunk to array utilities
...
Deduplicate and move the chunk utility into the array utilities module
2024-09-09 11:56:03 +02:00
ndom91
c5ede5ce79
fix: use correct relative path when sending to GH
2024-09-08 18:49:35 +02:00
ndom91
d7badd82a5
fix: enable saving git_host settings to projects.json
2024-09-08 18:34:45 +02:00
ndom91
32f13df06d
fix: handle old projects which dont have git_host project settings key
2024-09-08 18:23:05 +02:00
ndom91
b43e9312cb
fix: sync selected values with GitHost preferences form
2024-09-08 18:19:23 +02:00
ndom91
460e19299a
fix: refactor out use of Persisted store values for pr template boolean and path
2024-09-08 18:11:39 +02:00
ndom91
6b55fa56ba
fix: simplify getAvailablePullRequestTemplate args
2024-09-08 18:11:03 +02:00
ndom91
216f5b40f3
fix: update Select to use correct label and value in dropdown
2024-09-08 17:42:36 +02:00
ndom91
3c812cb963
fix: move getAvailableTemplates functionality from project service to github service
2024-09-08 17:42:08 +02:00
ndom91
a02d80807d
fix: rm textinput in GitHostForm
2024-09-08 16:48:30 +02:00
ndom91
6396bfea45
fix: cleanup
2024-09-08 16:39:19 +02:00
ndom91
bbe9249a01
fix: git paths
2024-09-08 16:34:58 +02:00
ndom91
e2bb456f7d
feat: initial template dropdown support
2024-09-08 16:16:09 +02:00
estib
0a6493087b
FileListItem: Track whether all or some hunks have been selected
...
If only some of the hunks have been selected, display the file checkbox as indeterminate
2024-09-08 12:21:49 +02:00
estib
d7c8c78100
Utils: Check for array items compliance
...
Create a module for array utilities.
Add a function that determines what amount of items in an array satisfy a condition
2024-09-08 12:18:56 +02:00
estib
d3c1ed8ed4
Style: Checkbox indeterminate state
...
Make it so that the indeterminate state of the checkbox matches the selected style
2024-09-08 12:16:56 +02:00
estib
a904bcc567
Commit List: Allow force push when removing commits
...
Display the force-push action button even when only removing "localAndRemote" commits.
2024-09-06 17:30:28 +02:00
Kiril Videlov
db2f33a2ef
remove incorrect placeholder
2024-09-09 13:12:18 +02:00
Nico Domino
68f0a3c288
fix: use our own open-rs implementation instead of relying on tauri's "shell-open" ( #4748 )
...
Co-authored-by: Yerke Tulibergenov <yerke@squareup.com>
Co-authored-by: Caleb Owens <caleb@gitbutler.com>
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
Co-authored-by: Mattias Granlund <mtsgrd@gmail.com>
Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>
Co-authored-by: GitButler <gitbutler@gitbutler.com>
2024-09-07 19:28:50 +02:00
estib
33eb64392f
Clean-up: BranchLaneContextMenu: Remove console.log
2024-09-06 15:55:28 +02:00
Nico Domino
32d766c2d6
fix: bump all svelte related dependencies ( #4828 )
2024-09-06 12:25:41 +02:00
Esteban Vega
710308b4ea
Merge pull request #4832 from gitbutlerapp/fix-create-pr-button
...
fix: Disable the PR button if there is no GitHub integration
2024-09-06 11:14:05 +02:00
Esteban Vega
cb6cdf794f
Merge pull request #4834 from gitbutlerapp/clean-up-select-component
...
Clean-up: Remove anti-pattern from the Select component
2024-09-06 11:11:44 +02:00
estib
bde8c52477
fix: Project Not Found page
...
After successfully untracking the missing project, display the correct messages (whether the success or failure to untrack).
Also, update the projects list accordingly
2024-09-06 09:43:10 +02:00
estib
057df19c9d
Clean-up: Remove anti-pattern from the Select component
...
Instead of updating the state through an effect, factor out the `searchValue` state variable into the parent component, and only derive the filtered options from it
2024-09-05 15:25:29 +02:00
Esteban Vega
3c0f67300d
Merge branch 'master' into fix-create-pr-button
2024-09-05 13:54:26 +02:00
Kiril Videlov
a3800459c3
Merge pull request #4833 from gitbutlerapp/Fix-broken-error-page
...
Fix broken error page
2024-09-05 13:46:33 +02:00
Mattias Granlund
13be25f3e5
Fix broken error page
...
- nested if condition left the page blank
2024-09-05 14:20:55 +03:00
estib
5e05cd787c
fix: Disable the PR button if there is no GitHub integration
...
If there is no GitHub integration, correctly disable the create PR button
2024-09-05 12:10:12 +02:00
Esteban Vega
3b0a2761e0
Merge branch 'master' into unapply-only-hunks-from-lane
2024-09-04 18:19:08 +02:00
Nico Domino
36e98459a2
feat: add support for custom pull request template paths ( #4814 )
2024-09-04 17:25:30 +02:00
Esteban Vega
768c9470ad
Merge branch 'master' into unapply-only-hunks-from-lane
2024-09-04 17:21:09 +02:00
Esteban Vega
e06e93efbf
Merge pull request #4826 from gitbutlerapp/improve-commit-text-input
...
Improve the commit text content experience
2024-09-04 14:40:39 +02:00
estib
ee238fdfd1
Improve the commit text content experience
...
Pressing enter on from the title will behave in the expected way, pushing down the content into the description box
2024-09-04 14:21:02 +02:00
Esteban Vega
43346053c5
Merge branch 'master' into fix-select-update-error
2024-09-04 11:37:50 +02:00
Esteban Vega
924cc5df1e
Merge pull request #4813 from gitbutlerapp/remove-missing-repo
...
Can remove repository if it's missing, from the error boundary page
2024-09-04 11:32:56 +02:00
Pavel Laptev
ab2a9ccc9f
fix: Update rootMargin values to include units in CommitAction and GroupHeader components ( #4822 )
2024-09-04 09:08:58 +01:00
estib
23a5bb7ee4
Connect the project methods to the new components
...
Plug in the newly implemented methods to the new designs
2024-09-03 17:08:21 +02:00
estib
fa4727dcb7
fix: Update the select options correctly
...
The Select component options are a prop that initializes the state variable `filteredOptions`.
The issue was, that if the prop is updated, the state variable doesn't seem to be updated as well.
This fixes that by manually updating the state variable whenever the prop updates.
2024-09-03 17:06:06 +02:00
Pavel Laptev
cc60ed1ea0
Added ProjectNotFound screen + small layout updates
2024-09-03 11:45:33 +02:00
estib
34e102f336
Only discard the files changes inside the lane
...
When using the file context menu inside a given lane to discard the changes, only the changes to that file inside the lane should be discarded.
Any other changes to that same file that live in other lanes are kept
2024-09-03 11:34:19 +02:00
Pavel Laptev
6530284a80
fix: hovering animation ( #4816 )
2024-09-03 00:26:30 +02:00
Mattias Granlund
5f9c2e5832
Rename gitbutler/integration -> gitbutler/workspace
2024-09-02 20:53:19 +03:00
estib
636b065279
Ability to relocate project, if missing
...
Optionally, the path of a project can be manually updated if moved
2024-09-02 17:42:07 +02:00
estib
c784ff7194
Use the user error codes directly
...
Don't reimplement the user error handling scheme, and just extend what's there.
2024-09-02 16:45:00 +02:00
estib
df57f8bc28
Augment the project page errors with codes
...
Add the error code to the project page error for a better, more granular error handling
2024-09-02 16:39:45 +02:00
estib
105ad7d0fa
Resolve linting errors
2024-09-02 15:18:31 +02:00
estib
8192b4e5fa
Reuse the RemoveProjectButton component
...
Adapt the component so that the modal is optionally bypassed
2024-09-02 15:04:38 +02:00
estib
be89f303d2
Can remove repository if it's missing
2024-09-02 14:44:03 +02:00
Pavel Laptev
444b03ff38
style(sidebar): Update padding and color for PR tags in SidebarEntry ( #4811 )
...
* style(sidebar): Update padding and color for PR tags in SidebarEntry
* Tooltip update
2024-09-02 12:51:30 +02:00
Pavel Laptev
5821d92b77
Replase checkbox with toggle + copy update ( #4810 )
2024-09-02 08:49:27 +02:00
Pavel Laptev
c820a33e41
Tooltip-refactoring-+-new-component ( #4804 )
...
* tooltip component + custom svelte transitions
* update some tooltips
* replace old toogle
* replace old tooltip hook
* remove old tooltip hook
* lint fixes
* design tokens update
2024-09-01 20:30:36 +02:00
Mattias Granlund
98c3f5d310
Fix copiedFromRemoteId bug
...
- correctly shows commits as rebased when changeId is missing
- setting relatedTo is sufficient, no need to touch `get status()`
2024-09-01 15:33:35 +03:00
ndom91
de310a203d
fix: isDeleting branch behaviour in BranchPreviewHeader
2024-09-01 14:18:04 +03:00
ndom91
5e5c8cb289
fix: rename loadingDelete => isDeleting
2024-09-01 14:18:04 +03:00
ndom91
fc31c5e262
fix: set branch delete modal action btn to loading=true when appropriate
2024-09-01 14:18:04 +03:00
Nico Domino
c2a662edf3
fix: extract Board empty state into own component ( #4796 )
2024-08-30 11:48:55 +00:00
Pavel Laptev
fe3c73ccfd
FileListItem fix ( #4799 )
...
* show lock icons and lock tooltip
* replace state with derived
* allow to drag files
2024-08-30 13:11:23 +02:00
Kiril Videlov
2c7773a6cd
Merge pull request #4793 from Byron/git2-to-gix
...
performance improvements and bug fixes
2024-08-30 12:53:26 +02:00
Kiril Videlov
af6fdc36a4
add api for updating change references
2024-08-30 12:38:50 +02:00
Pavel Laptev
425136da20
Edit mode updates ( #4792 )
...
* Add `Scrollbar` and `ScrollableContainer` to the UI lib
* event fixes
* replace app components with UI
* Move `ContentWrapper` to the UI side
* update file status badge colors
* move scrollbar components back to to app
because of the user settings
* dummy commit card added to the edit mode
* add the commit line
* edit modal UI tweaks
* remove unused code
* lint fixes
* lint fixes
2024-08-30 11:21:11 +02:00
Sebastian Thiel
4d495cb3bc
Adjust integration check to also recognize by matching tree.
...
This is relevant when all commits are equal by tree, but seem changed
due to the added GitButler headers.
For added safety, we also compare by commit message, date and authors,
basically everything that isn't the headers.
2024-08-30 07:15:47 +02:00
Sebastian Thiel
36f23d529f
CLI with branch list-remotes to list remote branches
2024-08-30 07:15:46 +02:00
Filipe Louro
92349391f3
Refactor RepoInfo type to use domain instead of source and resource
2024-08-29 18:24:45 +03:00
