Caleb Owens
676b05b318
Merge pull request #4179 from gitbutlerapp/Fix-daft-mistake
...
Fix daft mistake
2024-06-25 19:05:25 +02:00
Caleb Owens
2952b0355f
Fix daft mistake
2024-06-25 15:26:04 +02:00
Kiril Videlov
6387bbfa49
Merge pull request #4176 from gitbutlerapp/remove-unused-code
...
remove unused code
2024-06-25 15:02:41 +02:00
Nico Domino
1fd41cc192
fix(nix): use corepack_20 in the flake input instead of pnpm directly ( #4177 )
2024-06-25 14:57:11 +02:00
Kiril Videlov
d4ab41cef9
remove unused code
2024-06-25 14:50:17 +02:00
Mattias Granlund
6d6789d494
Update branch delete modal message
...
- it is no longer true the action cannot be undone
- resolves gh issue #4066
2024-06-25 15:27:28 +03:00
Kiril Videlov
e707bdd812
Merge pull request #4174 from gitbutlerapp/cool-with-submodules
...
cool with submodules
2024-06-25 13:35:05 +02:00
Mattias Granlund
e499b8fdfd
Remove timestamp_ms from Hunk
...
We are not using it, let's re-introduce if needed in the future.
2024-06-25 14:23:45 +03:00
Kiril Videlov
70dc0b54f3
remove a restriction on adding repos with submodules
2024-06-25 13:23:08 +02:00
Kiril Videlov
e4897c467a
ignore submodules on oplog list submodules
2024-06-25 13:21:51 +02:00
Mattias Granlund
0ae5ded3ec
Add test covering issue #4148
2024-06-25 13:09:21 +03:00
Mattias Granlund
e91634bcdb
Move a couple of test utils to test_project.rs
2024-06-25 13:09:21 +03:00
Caleb Owens
96ed0e6d65
Merge pull request #4143 from gitbutlerapp/update-remote-commits-branch-fix
...
Redo line drawing
2024-06-25 11:07:55 +02:00
Caleb Owens
22810aa23d
Merge branch 'master' into update-remote-commits-branch-fix
2024-06-25 11:05:39 +02:00
Kiril Videlov
881e9967c9
Merge pull request #4168 from gitbutlerapp/fix-hunk-locking-logic
...
Fix bug in hunk -> branch assignment
2024-06-25 10:52:29 +02:00
Pavel Laptev
fd86ec7a64
CSS: Dashed line fix
2024-06-24 23:55:28 +02:00
Pavel Laptev
3735be9d70
CSS: remove extra div wrapper
2024-06-24 23:22:13 +02:00
Pavel Laptev
90186f5154
The dotted line was not seamless
...
This approach seems to be working
2024-06-24 22:59:49 +02:00
Pavel Laptev
ee2054c1ea
CSS tweaks
...
- Move matching line classes into a separate CSS file in order to track and maintain styles changes better
- small z-index issue fixed
2024-06-24 22:46:16 +02:00
Mattias Granlund
d12698abb5
Fix bug in hunk -> branch assignment
...
- return early on lock only if hunk matches or intersects
2024-06-24 23:11:39 +03:00
Mattias Granlund
28d72ae5c0
Simplify login code a bit more
...
- remove rxjs
- use loading state by user service
2024-06-24 23:08:40 +03:00
Caleb Owens
80cf077b16
Undo oopsie
2024-06-24 21:21:40 +02:00
Caleb Owens
eb2205b92b
sadfsadfafds
2024-06-24 21:14:03 +02:00
Caleb Owens
3ac69f8ccb
fix linting errors
2024-06-24 21:14:03 +02:00
Caleb Owens
a06a9518a4
Allow passing in a height override to the line group
2024-06-24 21:14:03 +02:00
Caleb Owens
869982ce93
Remove storybook-build script
2024-06-24 21:14:03 +02:00
Caleb Owens
a4e791dfd6
Add comments and tweak styles
2024-06-24 21:14:03 +02:00
Caleb Owens
ece26f0f11
Fix story bookks
2024-06-24 21:14:03 +02:00
Caleb Owens
ee8e4c8a30
Seperate the concept of style and color
2024-06-24 21:14:03 +02:00
Caleb Owens
5735cbe13a
Added in base nodes
2024-06-24 21:14:03 +02:00
Caleb Owens
a7a18f47db
Formattign and stuff
2024-06-24 21:14:01 +02:00
Caleb Owens
857230e233
Remove unused commitlines components
2024-06-24 21:13:28 +02:00
Caleb Owens
6bb005e220
Move over to new commit lines
2024-06-24 21:13:23 +02:00
Caleb Owens
11be4c2d77
different forkpoint start
2024-06-24 20:38:43 +02:00
Caleb Owens
72cc22502b
Implement same forkpoint rendering logic
2024-06-24 20:38:43 +02:00
Caleb Owens
23ae910763
Implement line manager
2024-06-24 20:38:43 +02:00
Caleb Owens
c8d7f8b44c
Add examples with storybook
2024-06-24 20:38:43 +02:00
Caleb Owens
0d24e39d75
Introduce new commit lines renderer
2024-06-24 20:38:43 +02:00
Caleb Owens
f869293d1f
Update commit terminology in frontend
2024-06-24 20:38:43 +02:00
Nico Domino
a2bbc4e2e2
fix: use @sentry/vite-plugin to upload sourcemaps and create releases ( #4166 )
2024-06-24 18:23:12 +02:00
Nico Domino
d013b7baf7
fix: improve git remoteUrl parsing ( #4147 )
2024-06-24 17:53:22 +02:00
Sebastian Thiel
cf2adf4d68
Merge pull request #4154 from rockingskier/patch-1
...
fix: update wording in Project settings AI options
2024-06-24 17:16:35 +02:00
Ben
f2ddbfdf7b
fix: update wording in Project settings AI options
2024-06-24 17:14:28 +02:00
Pavel Laptev
57e63b84bb
UI fix: jumpy sidebar width if it's folded ( #4164 )
2024-06-24 16:47:51 +02:00
Kiril Videlov
be94363b44
Merge pull request #4163 from gitbutlerapp/dependabot/cargo/cargo-26791762c9
...
Bump tauri from 1.6.7 to 1.6.8 in the cargo group across 1 directory
2024-06-24 16:44:01 +02:00
dependabot[bot]
b0579da1db
Bump tauri from 1.6.7 to 1.6.8 in the cargo group across 1 directory
...
Bumps the cargo group with 1 update in the / directory: [tauri](https://github.com/tauri-apps/tauri ).
Updates `tauri` from 1.6.7 to 1.6.8
- [Release notes](https://github.com/tauri-apps/tauri/releases )
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.6.7...tauri-v1.6.8 )
---
updated-dependencies:
- dependency-name: tauri
dependency-type: direct:production
dependency-group: cargo
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-24 14:30:04 +00:00
Kiril Videlov
8a24b7363a
Merge pull request #4115 from gitbutlerapp/dependabot/cargo/cargo-c9137a7768
...
Bump the cargo group with 2 updates
2024-06-24 16:27:59 +02:00
Kiril Videlov
b6c41e572f
Merge pull request #4162 from gitbutlerapp/better-exe-resolution
...
Use `gitoxide` to more reliably find the Git executable on Windows. (#1419 )
2024-06-24 16:26:07 +02:00
Sebastian Thiel
cd20bbb859
Use gitoxide to more reliably find the Git executable on Windows. ( #1419 )
...
Previously, Windows installations that didn't put git.exe into their PATH
were unable to have their executable found.
`gitoxide` has the same problem to solve and can now 'find harder' in
known installation locations.
This capability is now used here, instead of hard-coding `git.exe` or `git`.
2024-06-24 16:03:15 +02:00
Kiril Videlov
4477cfcb1d
Merge pull request #3948 from Byron/watcher-refactor
...
watcher refactor
2024-06-24 15:47:12 +02:00
