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
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
estib
2c6f295cc5
Remove unused method: delete project by path
2024-09-02 17:38:00 +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
dependabot[bot]
6aaf2d89ec
Bump the rust-updates group with 3 updates
...
Bumps the rust-updates group with 3 updates: [tokio](https://github.com/tokio-rs/tokio ), [sysinfo](https://github.com/GuillaumeGomez/sysinfo ) and [rstest](https://github.com/la10736/rstest ).
Updates `tokio` from 1.39.3 to 1.40.0
- [Release notes](https://github.com/tokio-rs/tokio/releases )
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.39.3...tokio-1.40.0 )
Updates `sysinfo` from 0.31.3 to 0.31.4
- [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md )
- [Commits](https://github.com/GuillaumeGomez/sysinfo/compare/v0.31.3...v0.31.4 )
Updates `rstest` from 0.21.0 to 0.22.0
- [Release notes](https://github.com/la10736/rstest/releases )
- [Changelog](https://github.com/la10736/rstest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/la10736/rstest/compare/v0.21.0...v0.22.0 )
---
updated-dependencies:
- dependency-name: tokio
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-updates
- dependency-name: sysinfo
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: rstest
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-updates
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-09-01 15:57:33 +00: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
Kiril Videlov
7a3b694da8
Merge pull request #4806 from Byron/show-git
...
Trace the `git` binary path (#3601 )
2024-08-30 22:11:46 +02:00
