gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-10-27 13:39:19 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,920 Commits 119 Branches 924 Tags 62 MiB
ffc2a993f1
Commit Graph

1920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nikita@galaiko.rocks
ffc2a993f1 --verbose build 2023-07-18 12:54:33 +02:00
nikita@galaiko.rocks
a837895a86 do not cache pnpm in berlin 2023-07-18 10:27:54 +02:00
nikita@galaiko.rocks
5ca9a644d2 cargo fmt 2023-07-18 09:28:01 +02:00
nikita@galaiko.rocks
3c579ef577 consider adding the same hunk an update 2023-07-18 09:28:01 +02:00
GitButler
16b70977c4 file card next basic styling 2023-07-18 01:12:41 +02:00
Ian Donahue
c1e90b5ed5
Merge pull request #732 from gitbutlerapp/ian/card-and-hunk-space-adjustment 
Ian/card and hunk space adjustment
 2023-07-17 17:26:34 +02:00
idonahue
1b761b15e3 pnpm format 2023-07-17 17:22:10 +02:00
idonahue
76ef62cfa7 Card and hunk space adjustment 2023-07-17 17:17:45 +02:00
nikita@galaiko.rocks
1c71dfd511 proxy remote branch autors avatars 2023-07-17 16:13:16 +02:00
nikita@galaiko.rocks
922046d9c3 singleton assets proxy 2023-07-17 16:13:16 +02:00
GitButler
1300888d82 rm assets mod 2023-07-17 14:49:26 +02:00
GitButler
2ebb1438c9 store singleton zipper in a state 2023-07-17 14:49:26 +02:00
Ian Donahue
09a8c78c1a
Merge pull request #705 from gitbutlerapp/ian/button-fixes-july-13 
Ian/button fixes july 13
 2023-07-17 14:43:13 +02:00
GitButler
18f1e0f265 styling FileCardNext (copying from the onld one) 2023-07-17 14:41:40 +02:00
Nikita Galaiko
d4ea56e38e cleanup tauri deps 2023-07-17 13:41:58 +02:00
Nikita Galaiko
d1fc5d23e0 move butler to another crate 2023-07-17 13:41:58 +02:00
Nikita Galaiko
f0f615c150 refactor cmd 2023-07-17 10:47:22 +02:00
Nikita Galaiko
f23ff295fc fix merge conflicts 2023-07-17 10:42:57 +02:00
Nikita Galaiko
c923722cad make upstream optional 2023-07-17 09:12:20 +02:00
Nikita Galaiko
b2fb64c071 use merge name & branch, remove description 2023-07-17 09:12:20 +02:00
Nikita Galaiko
a985bc9769 set bump type inside the pipeline 2023-07-17 08:07:11 +02:00
Nikita Galaiko
1b5525fd8e separate builds by channel inside the s3 bucket 2023-07-17 08:07:11 +02:00
Kiril Videlov
5d49f59f48 add syntax highliting 2023-07-16 22:05:54 +02:00
Kiril Videlov
22abebc056 rendering of file sections 2023-07-16 22:05:54 +02:00
Kiril Videlov
96079c52a5 fixes 2023-07-16 22:05:54 +02:00
Kiril Videlov
e6f1d76da3 recommend vitest vscode plugin 2023-07-16 22:05:54 +02:00
Kiril Videlov
5bc8f4df54 preprocess files splitting them in sections 2023-07-16 22:05:54 +02:00
Kiril Videlov
c73aedfb87 remove test that does nothing 2023-07-16 22:05:54 +02:00
Scott Chacon
116575386d just default to patch bump 2023-07-16 12:17:57 +02:00
Nikita Galaiko
e48c8b02bb use channel in the release updater url 2023-07-14 15:01:49 +02:00
Nikita Galaiko
4dc5f66873 rm channel from s3 dist 2023-07-14 14:14:30 +02:00
GitButler
be9adcea51 Remove pathline if no commits on virtual branch 2023-07-14 14:05:04 +02:00
Mattias Granlund
c9872f70d6 Improve UX around resolving merge conflicts 
- resolve conflict button updates state
- message at top changes when only commit is left
- actually close modal after going ahead with conflicts
 2023-07-14 13:51:44 +02:00
Nikita Galaiko
4d343b4849 fix nightly action 2023-07-14 13:09:00 +02:00
Kiril Videlov
61a4695194 fix vbranch file contents to include deltas 2023-07-14 13:07:39 +02:00
Nikita Galaiko
556db1290d nightly builds 2023-07-14 13:06:22 +02:00
Nikita Galaiko
dd16428451 rm duplicated diff calculation 2023-07-14 12:36:55 +02:00
Nikita Galaiko
9054c004cf extract diff to a separate mod 2023-07-14 12:36:55 +02:00
Kiril Videlov
28cc3e545a add file content to the vbranch files 2023-07-14 11:45:45 +02:00
Mattias Granlund
4643d4e796 Remove unnecessary ipc.ts file 2023-07-14 10:21:07 +02:00
Nikita Galaiko
8dabbc29d4 move conflicts to a separate mod 2023-07-14 10:12:40 +02:00
Mattias Granlund
8a6314eb27 Use bundled tailwind nesting plugin 
See documentation at:
https://tailwindcss.com/docs/using-with-preprocessors#nesting
 2023-07-14 09:48:33 +02:00
Nikita Galaiko
e5d8282339 rm usnused code 2023-07-14 09:32:37 +02:00
Nikita Galaiko
c16b772739 do not cache rust on aarch 2023-07-14 08:53:11 +02:00
Scott Chacon
d80dbb1c44
fix conflict thing (#707) 
* fix conflict thing
* test failed correctly
 2023-07-13 17:57:41 +02:00
Mattias Granlund
503921f7bf Add logging for ipc calls 2023-07-13 17:53:54 +02:00
Mattias Granlund
d243b24458 Some flow control for merge conflicts 2023-07-13 17:53:54 +02:00
Mattias Granlund
c04a8f717c Use setContext/getContext for BranchController 2023-07-13 17:53:54 +02:00
Mattias Granlund
fecd3fe67d Change where setContext is called for userSettings 2023-07-13 17:53:54 +02:00
Kiril Videlov
14c2164d9d no message no commit button 2023-07-13 17:29:05 +02:00