gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-23 17:43:47 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,808 Commits 156 Branches 1,066 Tags 61 MiB
82939782eb
Commit Graph

1808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
82939782eb bump svelte-loadable-store 2023-07-11 15:17:49 +02:00
Mattias Granlund
a1b034c5d3 Revert "Stable sort hunks by lines then time" 
This reverts commit 94e6ed09c9.
 2023-07-11 15:12:25 +03:00
idonahue
e1509d69f0 Center drop zone text 2023-07-11 11:58:16 +02:00
Mattias Granlund
94e6ed09c9 Stable sort hunks by lines then time 
When hunks have the same timestamp they get sorted randomly and
often jump places within a filecard.
 2023-07-11 11:45:45 +03:00
Mattias Granlund
1554c8a560 Fix path in file cards 
We are incorrectly dropping the last folder in the path.
 2023-07-11 11:42:53 +03:00
Nikita Galaiko
2da58af538 do not allow moving hunk to its origin lane 2023-07-11 10:14:43 +02:00
Nikita Galaiko
4ed39d7d9b do not sort files/hunks on the frontend 2023-07-11 10:14:43 +02:00
Nikita Galaiko
2c0f563bb2 rm unused code 2023-07-11 10:14:43 +02:00
Nikita Galaiko
b03ed2690c remove printlns 2023-07-11 10:14:43 +02:00
Mattias Granlund
3b9bb356a4 Revert broken change to new branch drop marker 2023-07-11 10:19:45 +03:00
Ian Donahue
c6be0f16f3
MR #672 from gitbutlerapp/ian/text-color-updates 
Ian/text color updates
 2023-07-10 19:12:35 +02:00
idonahue
54e8d689df pnpm format 2023-07-10 19:06:52 +02:00
idonahue
a720302ed8 file name on file card colors 2023-07-10 19:04:27 +02:00
idonahue
66f944f5ad Breadcrumb text color 2023-07-10 19:04:04 +02:00
idonahue
5c535b1952 Global text color 2023-07-10 19:03:49 +02:00
idonahue
d4066cac3d pnpm format 2023-07-10 18:47:12 +02:00
idonahue
b0b7e30ee5 All projects card background color updated 2023-07-10 18:47:12 +02:00
idonahue
30d63a1f8d Hunk visual updates 2023-07-10 18:47:12 +02:00
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
Nikita Galaiko
3971484faf fix attempts overflow 2023-07-10 16:46:50 +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
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