gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-22 17:11:43 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,889 Commits 155 Branches 1,065 Tags 61 MiB
e48c8b02bb
Commit Graph

1889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
idonahue
42b143c94e Visual Studio Code branding name change from VS Code 2023-07-12 18:08:30 +02:00
Kiril Videlov
ea5fc09087 diff colors like in github 2023-07-12 16:45:58 +02:00
Scott Chacon
a2fb386263 fix checkout, fix some tests 2023-07-12 15:54:18 +02:00
Scott Chacon
24aaabfdab different way of unapplying a branch 2023-07-12 14:19:00 +02:00
Nikita Galaiko
cb233d6288 do not assume target branch 2023-07-12 13:40:52 +02:00
Nikita Galaiko
6ea6e5e4ec refresh target branch on set 2023-07-12 13:40:52 +02:00
Mattias Granlund
1d59ea805e Fix formatting 2023-07-12 11:50:10 +02:00
Mattias Granlund
b619a0a4c7 Tilt hunks/files less, but with some randomness 
Just because it's a bit fun, we can remove this at any time.
 2023-07-12 11:50:10 +02:00
Mattias Granlund
31fc27000a Change CSS px values to rem for better zoom 2023-07-12 11:50:10 +02:00
Mattias Granlund
48256ec795 Remove test data from tauri conf 2023-07-12 11:50:10 +02:00
Scott Chacon
01b85af2ef keeping merged state in HEAD 2023-07-12 11:47:10 +02:00
Nikita Galaiko
194f1646cf separate project repo revwalks 2023-07-12 11:25:19 +02:00
Kiril Videlov
3d95f78aba hunk syntax hightlighting 2023-07-12 11:14:20 +02:00
Kiril Videlov
7be225914d clarify settings copy around code descriptions 2023-07-12 11:06:23 +02:00
Ian Donahue
57dc6f4cdc
PR #684 from gitbutlerapp/ian/visual-changes-2023-07-11-1 
Ian/visual changes 2023-07-11-1
 2023-07-11 18:14:39 +02:00
Ian Donahue
b9c9b18aff
Merge branch 'master' into ian/visual-changes-2023-07-11-1 2023-07-11 18:09:50 +02:00
idonahue
c7d6582a83 pnpm format 2023-07-11 18:09:20 +02:00
idonahue
45563fad92 Fixed contextual menu color and width 2023-07-11 18:01:13 +02:00
idonahue
767d15fb9a Greater contrast between contextual menu and background 2023-07-11 17:59:08 +02:00
idonahue
ea1d0cb848 Updated the input text focus color to purple 2023-07-11 17:58:45 +02:00
GitButler
53a1076e1f Divider on context menu upddate 2023-07-11 17:21:12 +02:00
Mattias Granlund
2034254aae Remove all "if (building) {}" checks 
The main problem here was `invoke` being imported from `@tauri-app/api`
rather than `@tauri-app/api/tauri`.
 2023-07-11 17:36:30 +03:00
Nikita Galaiko
9ba26fc5b0 store target upstream name separately 2023-07-11 15:35:20 +02:00
Nikita Galaiko
82939782eb bump svelte-loadable-store 2023-07-11 15:17:49 +02:00
Scott Chacon
6e60522f11 getting write_tree to base properly 2023-07-11 14:37:30 +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
Scott Chacon
6cc89ef209 some small fixes and debugging, should be close 2023-07-11 10:50:29 +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
Scott Chacon
76639acbde got most of an epic test setup 2023-07-11 10:32:29 +02: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