Commit Graph

8904 Commits

Author SHA1 Message Date
Kiril Videlov
df4d6ac099
fixes a test that should be using writable fixture 2024-09-06 15:18:09 +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
estib
4eabbaad86 Decouple the get_raw project method
Decouple the `get_raw` method from other variants and only return the information about the project is returned.
This skips any other logic excecuted by the other methods (e.g. `get_inner`)
2024-09-03 13:17:17 +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
Kiril Videlov
9c0700ba75
Merge pull request #4809 from gitbutlerapp/dependabot/cargo/rust-updates-e51a9d5fb3
Bump the rust-updates group with 3 updates
2024-09-02 22:18:00 +02:00
Mattias Granlund
260e81a94e Use simpler function for asserting workspace is open. 2024-09-02 20:53:19 +03:00
Mattias Granlund
a5962b7e46 Fix spelling mistakes 2024-09-02 20:53:19 +03:00
Mattias Granlund
85ebc4ea78 Add test to ensure old integration branch doesn't throw 2024-09-02 20:53:19 +03:00
Mattias Granlund
0db82ea38c Replace all relevant occurrences of integration with workspace 2024-09-02 20:53:19 +03:00
Mattias Granlund
9acab668cc Fix broken test
- make use of integration commit title constant
2024-09-02 20:53:19 +03:00
Mattias Granlund
f3e5228fed Update workspace commit message 2024-09-02 20:53:19 +03:00
Mattias Granlund
d217d96285 Add transition for integration commit detection 2024-09-02 20:53:19 +03:00
Mattias Granlund
5f9c2e5832 Rename gitbutler/integration -> gitbutler/workspace 2024-09-02 20:53:19 +03:00
estib
395104fb67 Skip the project directory creation when getting the project
When only getting the project information, don't recreate the project directory.
This allows the app to get the information about a project, which path has been moved.
2024-09-02 18:06:34 +02: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
2129ad5a3d Ability to update the path of a project 2024-09-02 17:40:05 +02:00
estib
c1cd40a811 Optionally, skip the validation when getting the project
Add flag to enable getting the project information from the storage without performing the validation
2024-09-02 17:39:40 +02:00