Commit Graph

9172 Commits

Author SHA1 Message Date
Nico Domino
888181326a Discard changes to package.json 2024-09-08 16:39:40 +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
Esteban Vega
d1462f1ea5
UI: Info Button component (#4829)
* UI: Info Button component

Info button that displays a custom component on hover.

* Extend tooltip

Optionally, toggle the tooltip on click.
If enabled, clicking outside will close the tooltip

* Click outside: Broaden the elements that can be ignored

Broaden the types of elements that can be ignored

* Info Button: Ignore the SVG when checking for clicking outside

* Info Button: Add Storybook

* Info Button: Use a separate component for the tooltip arrow

That way we can set the border-radius easliy, plus it's probably a bit more CSS-compatible with picky browser engines

* TooltipWrapper shared component

Factor out the common logic of the Tooltip and Info Button so that there is no duplicated functionality and so that the Info Button doesn't have to depend on the Tooltip

* Tooltip and the InfoButton use the TooltipWrapper

Use the shared component.
Also:
- Info button is opened (and stays open) on hover

* separate tooltip components

* icon transition effect added

* button tooltip to the body level + utils function

* Remove log

---------

Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-09-07 22:12:52 +02:00
Sebastian Thiel
a4df70c422
refactor clone for clarity 2024-09-07 21:08:31 +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
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
Esteban Vega
6fdcf9fcc8
Merge pull request #4844 from gitbutlerapp/clean-up-branch-lane
Clean-up: BranchLaneContextMenu: Remove console.log
2024-09-06 15:58:07 +02:00
Esteban Vega
ff6dff1729
Merge branch 'master' into clean-up-branch-lane 2024-09-06 15:56:36 +02:00
Kiril Videlov
245c8dfd1c
Merge pull request #4841 from gitbutlerapp/workspace-migration-fix-branch
fixes a test that should be using writable fixture
2024-09-06 15:55:51 +02:00
Kiril Videlov
d4fd20bb57
Merge pull request #4840 from gitbutlerapp/rm-legacy-branch-applied-bool
removes the legacy bool indicatin a vbranch is applied
2024-09-06 15:55:42 +02:00
estib
33eb64392f Clean-up: BranchLaneContextMenu: Remove console.log 2024-09-06 15:55:28 +02:00
Kiril Videlov
df4d6ac099
fixes a test that should be using writable fixture 2024-09-06 15:18:09 +02:00
Kiril Videlov
7693b7b9ac
removes the legacy bool indicatin a vbranch is applied 2024-09-06 15:16:20 +02:00
Kiril Videlov
49dd5431b0
Merge pull request #4839 from gitbutlerapp/rm-vb-actions-struct
Remove unnecessary VirtualBranchActions struct
2024-09-06 14:39:35 +02:00
Kiril Videlov
95e946b8a1
Remove unnecessary VirtualBranchActions struct 2024-09-06 14:12:14 +02:00
Nico Domino
32d766c2d6
fix: bump all svelte related dependencies (#4828) 2024-09-06 12:25:41 +02:00
Kiril Videlov
2cad53efa4
Merge pull request #4838 from gitbutlerapp/update-set-branch-target-logic-impl
remove unused set branch target function
2024-09-06 11:25:55 +02:00
Kiril Videlov
8dfd421b60
Merge pull request #4837 from gitbutlerapp/remote-credentials-helper-struct
remove useless credentials helper struct
2024-09-06 11:25:43 +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
Esteban Vega
2b508c66cf
Merge pull request #4836 from gitbutlerapp/style-fix-delete-page
fix: Project Not Found page
2024-09-06 11:10:57 +02:00
Kiril Videlov
b9e39a4503
remove unused set branch target function 2024-09-06 11:08:36 +02:00
Kiril Videlov
3899975d6c
remove useless credentials helper struct 2024-09-06 11:03:57 +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
000bddb4a4
Merge pull request #4820 from gitbutlerapp/unapply-only-hunks-from-lane
Only discard the files changes inside the lane
2024-09-05 11:02:15 +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
Esteban Vega
9ca174efd6
Merge pull request #4821 from gitbutlerapp/fix-select-update-error
fix: Update the select options correctly
2024-09-04 14:40:07 +02:00
Esteban Vega
9105a7b1ff
Merge branch 'master' into unapply-only-hunks-from-lane 2024-09-04 14:28:23 +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
Caleb Owens
e4834dbba9 Fancy fast forward 2024-09-04 14:39:38 +03: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
Mattias Granlund
fe379de47c Fix storybook build errors 2024-09-04 10:29:24 +03:00
Sebastian Thiel
50c75eef60 refactor backend of reset_files() to be more idiomatic
It also tries to use `Vec<PathBuf>` in the tauri interface, which is
still to be validated.
2024-09-04 08:43:24 +02: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