Commit Graph

2709 Commits

Author SHA1 Message Date
Mattias Granlund
7ad43dfff7 Fix lint errors 2023-09-13 22:26:20 +02:00
Mattias Granlund
c353809869 Upgrade to prettier npm -> v3 2023-09-13 22:26:20 +02:00
Nikita Galaiko
1a0e1f7844
Merge pull request #1195 from gitbutlerapp/partial-commit-ui
Partial commit UI
2023-09-13 14:06:13 +02:00
Nikita Galaiko
395f73530c merged upstream 2023-09-13 13:54:05 +02:00
Nikita Galaiko
33cf7e7e63 remove files database 2023-09-13 13:53:59 +02:00
Nikita Galaiko
b3d3f34601
Merge pull request #1185 from gitbutlerapp/partial-commit-ui
Partial commit UI
2023-09-13 12:31:40 +02:00
Nikita Galaiko
3baa937129 one more fix 2023-09-13 10:37:45 +02:00
Nikita Galaiko
efb2364661 fix typescript 2023-09-13 10:36:19 +02:00
Nikita Galaiko
f3e51aa280 merged upstream 2023-09-13 10:30:07 +02:00
Nikita Galaiko
18e38e4d38 add hunk selection 2023-09-13 10:13:44 +02:00
Nikita Galaiko
e42f42a70c init hunk selection 2023-09-12 15:14:51 +02:00
Nikita Galaiko
4da0553405 more tests 2023-09-12 13:05:01 +02:00
Nikita Galaiko
64d2a6c40e minor fix 2023-09-12 13:01:10 +02:00
Nikita Galaiko
3a2e2ca34c consequential partial commits fix 2023-09-12 12:57:29 +02:00
Nikita Galaiko
ec9e5113a8 pnpm format 2023-09-12 11:02:08 +02:00
Nikita Galaiko
564471fb79 pnpm format 2023-09-12 11:02:08 +02:00
Nikita Galaiko
e530e3c25f add failing test 2023-09-12 11:00:27 +02:00
Mattias Granlund
1d8fb151fa Fix lint error from previous commit. 2023-09-11 22:13:01 +02:00
Mattias Granlund
c1659054cf Refactor file status computations
The getSummary method should never have been added to the class def.
2023-09-11 22:13:01 +02:00
Nikita Galaiko
2f9dd738cf partial commit ui 2023-09-11 15:24:47 +02:00
Nikita Galaiko
5209aea6e2 remeber node parent 2023-09-11 13:51:09 +02:00
Nikita Galaiko
bc7a18c4ba
Merge pull request #1184 from gitbutlerapp/refactor
extract CommitDialog
2023-09-11 08:34:15 +02:00
Nikita Galaiko
9283e233c4 extract CommitDialog 2023-09-11 08:32:13 +02:00
Kiril Videlov
49cc5f95b4 format 2023-09-08 13:01:44 +02:00
Kiril Videlov
8ae35c5543 preview commit content in app instead of opening the browser 2023-09-08 13:01:44 +02:00
Nikita Galaiko
3d3bb09e30
Merge pull request #1182 from gitbutlerapp/Virtual-branch
apply log level filter to file
2023-09-08 09:29:21 +02:00
Nikita Galaiko
489f64fffc apply log level filter to file 2023-09-08 09:25:29 +02:00
Nikita Galaiko
8367174b38
Merge pull request #1181 from gitbutlerapp/deb-builds
Deb builds
2023-09-07 18:32:31 +02:00
Nikita Galaiko
28abbda9dd upload debs to s3 2023-09-07 17:50:58 +02:00
Nikita Galaiko
04524fbc2c build debs 2023-09-07 17:29:27 +02:00
Nikita Galaiko
05557f69c5
Merge pull request #1180 from gitbutlerapp/fix-hunk-movement
Fix hunk movement
2023-09-07 17:22:58 +02:00
Nikita Galaiko
b79377c990 cargo fmt 2023-09-07 17:18:56 +02:00
Nikita Galaiko
6bcea9a891 allow specifying ownership for partial commit 2023-09-07 17:16:07 +02:00
Nikita Galaiko
756156e824 merged upstream 2023-09-07 17:15:47 +02:00
Nikita Galaiko
8482a4fec3
Merge pull request #1179 from gitbutlerapp/fix-hunk-movement
Fix hunk movement
2023-09-07 14:24:51 +02:00
Nikita Galaiko
2b6fc23382 fix tinykeys import 2023-09-07 14:04:53 +02:00
Nikita Galaiko
ed2d126d8c bumps 2023-09-07 13:48:04 +02:00
Nikita Galaiko
2ebe31ced6 merged upstream 2023-09-07 13:47:50 +02:00
Nikita Galaiko
e2687d5414
Merge pull request #1178 from gitbutlerapp/fix-hunk-movement
when updating branch ownership, use raw version
2023-09-07 09:57:07 +02:00
Nikita Galaiko
99a0c52345 when updating branch ownership, use raw version 2023-09-07 09:52:52 +02:00
Nikita Galaiko
dac296dedb
Merge pull request #1177 from gitbutlerapp/posthog-events
send posthog event on branch change
2023-09-06 15:24:14 +02:00
Nikita Galaiko
b98876da98 send posthog event on branch change 2023-09-06 15:05:56 +02:00
Nikita Galaiko
dff4eac8a0
Merge pull request #1174 from gitbutlerapp/restructure
new structure
2023-09-06 11:53:39 +02:00
Nikita Galaiko
746e8ccabc
new structure 2023-09-06 11:47:35 +02:00
Nikita Galaiko
fe5ebcca83
Merge pull request #1173 from gitbutlerapp/hunk-mtime
less noisy logs
2023-09-06 09:47:22 +02:00
Nikita Galaiko
342637f42d pnpm format 2023-09-06 09:41:09 +02:00
Nikita Galaiko
435be5a60f drop push parameter 2023-09-06 09:37:40 +02:00
Nikita Galaiko
7404117719 cargo fmt 2023-09-06 09:35:05 +02:00
Nikita Galaiko
8bfdc14a46 less noise in logs 2023-09-06 09:33:27 +02:00
Nikita Galaiko
5f03fcb2df merged upstream 2023-09-06 09:32:59 +02:00