Kiril Videlov
|
324941ea0e
|
add tooltip on the allow rebasing toggle for lanes
|
2024-06-26 14:02:36 +02:00 |
|
Kiril Videlov
|
3fb7f3b8bb
|
add the ability to toggle the allow rebasing flag for lanes in the UI
|
2024-06-26 13:53:13 +02:00 |
|
Kiril Videlov
|
d17534d291
|
adds the ability to update the allow_rebasing flag on branches and fix tests
|
2024-06-26 10:23:31 +02:00 |
|
Pavel Laptev
|
8de4c3b651
|
Don't focus the last item if multiple selection (#4186)
|
2024-06-25 22:48:33 +02:00 |
|
Kiril Videlov
|
d4267b81d5
|
use per-branch flag to check if rebasing is allowed
|
2024-06-25 21:36:43 +02:00 |
|
Kiril Videlov
|
4a0cf76b53
|
make RPM bundles
|
2024-06-25 20:44:11 +02:00 |
|
Kiril Videlov
|
dc27f164f6
|
Merge pull request #4183 from gitbutlerapp/amend-commit-label-update
style: Correct spelling of "Ammend" to "Amend" in CardOverlay.
|
2024-06-25 20:14:16 +02:00 |
|
Kiril Videlov
|
2aa22a16de
|
style: Correct spelling of "Ammend" to "Amend" in CardOverlay.
|
2024-06-25 20:12:38 +02:00 |
|
Kiril Videlov
|
03214dcaa1
|
introduce a new flag for branches determining if rebasing is allowed
|
2024-06-25 20:10:27 +02:00 |
|
Caleb Owens
|
c0102d4f95
|
Merge pull request #4182 from gitbutlerapp/Remove-log-that-was-intended-at-one-point-in-time
Remove log that was intended at one point in time
|
2024-06-25 19:54:09 +02:00 |
|
Caleb Owens
|
e5b248c60b
|
Merge pull request #4181 from gitbutlerapp/Don-t-auto-generate-branch-names
Don't auto-generate branch names
|
2024-06-25 19:53:52 +02:00 |
|
Caleb Owens
|
5be7b26731
|
Remove log that was intended at one point in time
|
2024-06-25 19:46:55 +02:00 |
|
Caleb Owens
|
439320ebeb
|
Don't auto-generate branch names
|
2024-06-25 19:43:23 +02:00 |
|
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 |
|