Ian Donahue
c27c1a650d
Merge pull request #669 from gitbutlerapp/sidebar-gussy-up-1
...
Sidebar gussy up 1
2023-07-10 18:13:40 +02:00
Mattias Granlund
2955a892a6
Change filename capitalisation
...
Also fixes a bug where target branch data was not updated after
clicking refresh.
2023-07-10 18:54:15 +03:00
idonahue
d555ea6c14
pnpm format
2023-07-10 17:46:12 +02:00
idonahue
922ab35c32
Merge branch 'master' into sidebar-gussy-up-1
2023-07-10 17:44:55 +02:00
idonahue
977852798a
fixed up the target branch and changed it to base branch
2023-07-10 17:29:15 +02:00
Mattias Granlund
0cab371c47
Sort branches, files, and hunks on load
2023-07-10 18:26:50 +03:00
Mattias Granlund
0d5537aa35
Rotate files/hunks on drag
2023-07-10 18:19:05 +03:00
Mattias Granlund
a907693985
Rename drag-zone -> drop-zone
2023-07-10 18:19:05 +03:00
GitButler
356e433f5b
gitbutler joint commit
2023-07-10 17:07:47 +02:00
Scott Chacon
8d72aadb5b
determine if a vbranch is current, also dont apply conflicting vbranches
2023-07-10 16:59:30 +02:00
Nikita Galaiko
3971484faf
fix attempts overflow
2023-07-10 16:46:50 +02:00
Scott Chacon
51d386628a
Merge remote-tracking branch 'origin/master' into sc-mergey-merge-merge
2023-07-10 16:15:09 +02:00
Scott Chacon
bee5b06ef9
can be in a multi-stage merge state
2023-07-10 16:14:52 +02:00
Ian Donahue
7942eb1bb3
Merge pull request #664 from gitbutlerapp/swimlane-styling-1
...
Swimlane styling 1
2023-07-10 16:10:36 +02:00
idonahue
8629704ba4
pnpm format
2023-07-10 15:58:54 +02:00
idonahue
1c960fbd89
Update BranchLane.svelte
2023-07-10 15:50:09 +02:00
Ian Donahue
de03042211
Merge pull request #663 from gitbutlerapp/ian/removed-toggle-button-outline
...
removed outline in toggle button
2023-07-10 15:20:30 +02:00
idonahue
2eb1130e2b
removed outline in toggle button
2023-07-10 15:07:43 +02:00
Mattias Granlund
9fb6e2bc6b
Disable Sentry for dev mode
...
The load function ends up getting called multiple times when wrapping it
with Sentry. Turning it off for now, but should be investigated.
2023-07-10 16:07:14 +03:00
Kiril Videlov
9d43f933b2
skip extra variable
2023-07-10 14:12:52 +02:00
Kiril Videlov
d4dde786df
remove the old stuff
2023-07-10 14:12:52 +02:00
Kiril Videlov
b5eee4cd2e
why is caching not working
2023-07-10 14:12:52 +02:00
Kiril Videlov
45640e505e
use the new thing
2023-07-10 14:12:52 +02:00
Kiril Videlov
933da5588a
make it a class
2023-07-10 14:12:52 +02:00
Kiril Videlov
e4c1329f51
use async
2023-07-10 14:12:52 +02:00
Kiril Videlov
22a554d3f4
first stab
2023-07-10 14:12:52 +02:00
Mattias Granlund
d2f57f7797
Turn drag & drop into a Svelte action
...
There are lots of things that different drop zones have in common, so this
commit abstracts that away.
2023-07-10 13:06:25 +03:00
Mattias Granlund
ebe1124ee4
Use exclamation mark for merge conflicts
2023-07-10 13:06:25 +03:00
Scott Chacon
ada424d754
Merge remote-tracking branch 'origin/master' into sc-mergey-merge-merge
2023-07-09 15:36:26 +02:00
Scott Chacon
b44c57d3bc
re-applying vbranches after getting out of date works
2023-07-09 15:29:59 +02:00
Mattias Granlund
de7973ccb8
Use Svelte Context API for passing user settings
2023-07-08 14:07:39 +03:00
Mattias Granlund
fce7ffde19
Add user settings store
...
- tray width
- ai hunks enabled
- theme
- zoom
2023-07-08 13:16:43 +03:00
Nikita Galaiko
3fe2f24cc5
fix creation virtual branch with ownership
2023-07-07 21:03:03 +02:00
idonahue
0dc2b76901
Hover over commit avatar works, but not transitioning
...
Will will need to figure out why the transition is not working on hover. Its probably something simple, but I can't identify now and need to log off.
2023-07-07 20:13:00 +03:00
idonahue
99eefcb772
Fixed truncation of virtual branch names in tray
2023-07-07 20:13:00 +03:00
idonahue
1bda2fa3df
Added minimum and maximum width for tray
2023-07-07 20:13:00 +03:00
Mattias Granlund
050e038fb1
One more fix for drop marker css
...
I will need to redo how the new branch dz changes styling when
drop is active. There are gaps in doing with sibling css that make it
flicker and sometimes stick to a state.
2023-07-07 18:33:37 +03:00
Mattias Granlund
e70dd4558e
Fix bug with lane menu location after scroll
2023-07-07 18:21:19 +03:00
Mattias Granlund
1e4e3be1bb
Fix clowny css mistake
2023-07-07 18:07:13 +03:00
Mattias Granlund
eac467414e
Fix sibling selector for new branch drop marker
2023-07-07 17:48:39 +03:00
Nikita Galaiko
00bad6d799
add app target
2023-07-07 16:33:33 +02:00
Mattias Granlund
2b19031a36
Replace svelte-dnd-action with native drag & drop
...
This commit is a bit of a relief, we now have less than 1/10th the
amount of code powering drag & drop.
Future work includes:
- extracting commonalities into a Svelte action
- applying css to new drop zone without using sibling selector
- styling
2023-07-07 15:58:12 +03:00
Scott Chacon
983d58061a
also apply a remote branch when we create a vbranch from it ( #649 )
2023-07-07 13:54:53 +02:00
Scott Chacon
d9632cea61
add modifiedAt to virtual branch file ( #648 )
2023-07-07 12:49:43 +02:00
Nikita Galaiko
0cc1b7ce79
in case of duplicates, prefer remote branches
2023-07-07 12:42:20 +02:00
Scott Chacon
360c7db73a
Fix behind branch vbranch creation ( #616 )
...
* clear command
* merge behind branches to upstream target before vbranch creation
2023-07-07 12:02:48 +02:00
Mattias Granlund
d0665739c2
Lint only changed files in CI
...
We can use `git diff --names-only` to get a list of files changed
between two revisions. The purpose is to stop lint errors from
untouched files showing up in code review.
2023-07-07 11:46:14 +02:00
Nikita Galaiko
32fcc9ea43
specify order on create request
2023-07-07 11:08:17 +02:00
idonahue
57f5f7dee0
pnpm
2023-07-06 16:23:03 +02:00
idonahue
3fee74d15e
decreased roundness
2023-07-06 16:23:03 +02:00
