Commit Graph

5965 Commits

Author SHA1 Message Date
Caleb Owens
64e676ae79
Merge pull request #3254 from gitbutlerapp/consolidate-diff-formatting
Pass in hunk array rather than diff
2024-03-22 11:19:01 +01:00
Caleb Owens
bffcdbdae4 Pass in hunk array rather than diff 2024-03-22 11:09:14 +01:00
Scott Chacon
5a8b3969de refactor: Update function parameter to use sortedFiles instead of files 2024-03-22 11:08:10 +01:00
Marcel R
df4578a459
Merge branch 'master' into master 2024-03-22 10:51:47 +01:00
Rütjerodt, Marcel
7e550dd0ca Resolves #3280 - allow # in branch names 2024-03-22 10:46:56 +01:00
Kiril Videlov
a4a2a4fc67
Merge pull request #3283 from gitbutlerapp/add-trace-propagation-targets
feat(sentry): add trace propagation targets
2024-03-22 10:43:38 +01:00
Kiril Videlov
610eab9424
feat(sentry): add trace propagation targets 2024-03-22 10:42:16 +01:00
Josh Junon
43df57c1ec
Merge pull request #3279 from gitbutlerapp/fix-windows-images
fix profile pictures on windows
2024-03-22 02:02:18 +01:00
Josh Junon
fdbf5a0184
fix profile pictures on windows 2024-03-22 01:51:58 +01:00
Josh Junon
1fe14145bc
Merge pull request #3278 from gitbutlerapp/no-console-running-git
don't show a console when running git.exe on windows
2024-03-22 01:49:33 +01:00
Josh Junon
3e41872591
don't show a console when running git.exe on windows 2024-03-22 01:34:24 +01:00
Mattias Granlund
29a9e18b66 Use context API for sharing User instance
More refactoring, this time removing the need for prop drilling the user.
2024-03-22 01:01:22 +01:00
Josh Junon
b3f45b6157
Merge pull request #3277 from gitbutlerapp/proper-bundle-path
fix release script bundle search path on windows
2024-03-22 00:59:56 +01:00
Josh Junon
e9c7a2cf8c
fix release script bundle search path on windows 2024-03-22 00:59:25 +01:00
Josh Junon
fead12e26f
Merge pull request #3275 from gitbutlerapp/first-perl-only
only set the first perl that we find instead of all that are on PATH
2024-03-22 00:31:01 +01:00
Josh Junon
f803dd4de3
only set the first perl that we find instead of all that are on PATH 2024-03-22 00:30:18 +01:00
Josh Junon
cc5dcc4b2e
Merge pull request #3274 from gitbutlerapp/set-perl-from-windows
ser PERL env from powershell instead of bash
2024-03-22 00:26:10 +01:00
Josh Junon
5a04dac58f
ser PERL env from powershell instead of bash 2024-03-22 00:25:19 +01:00
Josh Junon
0fe4104e46
Merge pull request #3273 from gitbutlerapp/set-perl-envs
set PERL env for openssl build
2024-03-22 00:19:26 +01:00
Josh Junon
1e0e650075
set PERL env for openssl build 2024-03-22 00:18:44 +01:00
Josh Junon
25ba29408c
Merge pull request #3272 from gitbutlerapp/dont-checkout-twice
remove extra checkout step from windows publish action
2024-03-21 23:39:54 +01:00
Josh Junon
4ed54ce9d6
remove extra checkout step from windows publish action 2024-03-21 23:39:20 +01:00
Josh Junon
e93cac8298
Merge pull request #3271 from gitbutlerapp/fix-perl-on-windows-builds
replace Perl installation with strawberry on windows
2024-03-21 23:35:56 +01:00
Josh Junon
9070873212
replace Perl installation with strawberry on windows 2024-03-21 23:33:57 +01:00
Caleb Owens
39864eeb5a refactor: replace custom sync button with Tag component
The custom sync button is replaced with the Tag component. The Tag
component is updated to support a loading state and help text. The
busy label is moved inside the Tag component. The custom sync button
styles are removed.
2024-03-21 23:30:24 +01:00
Mattias Granlund
1bd2dfda2e Fix save project description 2024-03-21 23:19:10 +01:00
Mattias Granlund
f285579113 Use getContextByClass for Project
This removes quite a bit of prop drilling.
2024-03-21 23:17:49 +01:00
Josh Junon
2d3f4f0cb7
Merge pull request #3269 from gitbutlerapp/install-cpan-module
install CPAN module on windows in release action
2024-03-21 23:16:55 +01:00
Josh Junon
8742885474
install CPAN module on windows in release action 2024-03-21 23:15:42 +01:00
Kiril Videlov
ce548aca55
Merge pull request #3266 from gitbutlerapp/add-diff-hash-function
add-diff-hash-function
2024-03-21 22:58:15 +01:00
Josh Junon
b9e20aeecb
Merge pull request #3267 from gitbutlerapp/fix-nightly-builds
don't specify shell for 'uses' action
2024-03-21 22:53:59 +01:00
Josh Junon
0224daa2f1
don't specify shell for 'uses' action 2024-03-21 22:53:12 +01:00
Josh Junon
0b8c0268ac
Merge pull request #3264 from gitbutlerapp/package-windows
initial attempt at windows bundling for nightly
2024-03-21 22:50:29 +01:00
Kiril Videlov
4ea3a98799
fix: set hash when converting hunks 2024-03-21 22:48:21 +01:00
Josh Junon
2a013b0369
initial attempt at windows bundling for nightly 2024-03-21 22:40:41 +01:00
Kiril Videlov
027684febb
feat: Implement Hunk::hash() method and replace diff_hash() 2024-03-21 22:37:36 +01:00
Kiril Videlov
36c555773c
Merge pull request #3263 from gitbutlerapp/hunk-ownership-comparison-fix
fix: revert to using hunk equality with hashes
2024-03-21 22:28:34 +01:00
Kiril Videlov
eb5a2ba6c7
fix: revert to using hunk equality with hashes 2024-03-21 22:18:37 +01:00
Mattias Granlund
41aecc8121
Merge pull request #3261 from gitbutlerapp/Convert-cloud-api-object-to-class
Convert cloud api object to class
2024-03-21 20:35:59 +01:00
Mattias Granlund
eb93713d69
Merge branch 'master' into Convert-cloud-api-object-to-class 2024-03-21 20:20:14 +01:00
Mattias Granlund
a282a41c39 Use getContextByClass for AuthService 2024-03-21 20:10:03 +01:00
Josh Junon
87dd2c7327
Merge pull request #3262 from gitbutlerapp/windows-askpass
Add windows askpass named pipe support for fetch/pull fork/exec implementation
2024-03-21 19:59:44 +01:00
Josh Junon
5e89000ed9
don't link to private type in docs 2024-03-21 19:53:38 +01:00
Josh Junon
4c61ddc40f
make rustdoc shut up about winapi's switched out types for docs 2024-03-21 19:52:14 +01:00
Josh Junon
67f46e7a36
append .exe to the end of git/askpass utilities on windows 2024-03-21 19:41:58 +01:00
Mattias Granlund
edaec8ebbd Convert cloud api object to class 2024-03-21 19:35:27 +01:00
Josh Junon
1ab7f07979 fix unix compilation errors introduced by gitbutler-git windows refactor 2024-03-21 19:25:02 +01:00
Josh Junon
3f481116ba add initial windows askpass implementation 2024-03-21 19:23:04 +01:00
Kiril Videlov
38c0b63faf
Merge pull request #3259 from gitbutlerapp/asdfdff
fix: fetch after push
2024-03-21 18:12:51 +01:00
Kiril Videlov
4000144acb fix: fetch after push 2024-03-21 18:02:48 +01:00