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
Ian Donahue
1f0fc96d28
gitbutler joint commit
2023-07-06 16:23:03 +02:00
Mattias Granlund
ef95cefe04
Change all buttons to purple
2023-07-06 17:16:29 +03:00
Nikita Galaiko
46d8c203ea
try assuming target branch
2023-07-06 15:49:03 +02:00
Nikita Galaiko
dd94583186
propagate error message for unsupported push credentials
2023-07-06 10:11:59 +02:00
Mattias Granlund
16fef7d3af
Fix broken button UI
2023-07-05 20:34:22 +03:00
Mattias Granlund
031cc2bf70
Update the account/settings page
2023-07-05 20:34:22 +03:00
Mattias Granlund
91c42fc4d4
Moving to singular from users -> user
2023-07-05 20:34:22 +03:00
Ian Donahue
8dd8cb21c1
updated switch color on user settings page
2023-07-05 18:57:02 +02:00
GitButler
a1ba929fd1
2023-07-05 17:43:48 +02:00
GitButler
1a8a61c6f1
2023-07-05 17:33:00 +02:00
GitButler
4e94679552
Improved input layout in swimlanes
2023-07-05 17:14:51 +02:00
Nikita Galaiko
75bafd01a8
fix creating branch by moving hunks
2023-07-05 16:15:21 +02:00
Nikita Galaiko
84ea0e1e17
disallow pushing to user/pass remotes
2023-07-05 16:10:19 +02:00
Mattias Granlund
ec8ab70613
Style no projects view for alpha
2023-07-05 16:22:32 +03:00
Nikita Galaiko
d89784a7e1
move repository lock from session writer to a higher level
2023-07-05 14:15:32 +02:00
Nikita Galaiko
6e71c75e83
fix commit message reference
2023-07-05 12:29:40 +02:00
Nikita Galaiko
c78ab6bc4a
lock get_current_session
2023-07-05 12:20:09 +02:00
Nikita Galaiko
d82781631e
remove println
2023-07-05 12:20:09 +02:00
Nikita Galaiko
ed9247f74c
handle errors
2023-07-05 12:20:09 +02:00
Nikita Galaiko
e89bd9bdf6
share storage lock to ensure consistancy
2023-07-05 11:00:49 +02:00
Nikita Galaiko
968c1e2840
fix new hunk ids
2023-07-05 10:10:02 +02:00
Kiril Videlov
79e469f039
update everything on first target set
2023-07-05 09:58:41 +02:00
Mattias Granlund
704dd9efde
Revert to textarea for commit message
...
Also moves the expand collapse toggle into the menu for a cleaner ui.
- expand/collapse toggle under menu
- use rows attribute for textarea height
- from 2-10 rows
2023-07-05 10:27:27 +03:00
Nikita Galaiko
6563f9c9bf
fetch --prune
2023-07-05 08:41:06 +02:00
Mattias Granlund
d9316c858d
Update modal style to match design
2023-07-04 20:29:30 +03:00
