zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 10:57:22 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,273 Commits 663 Branches 720 Tags 179 MiB
26b03afa60
Commit Graph

6273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia
6f6d72890a Once again respect user settings for git gutter 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-03 15:42:30 -04:00
Max Brunsfeld
f3d83631ef Remove unnecessary min_id_length option from amplitude requests 2022-10-03 12:13:27 -07:00
Julia
e6487de069 Rename head text to indicate that it's not always going to be from head 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-03 15:11:06 -04:00
Julia
a5c2f22bf7 Move git gutter settings out of editor settings 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-03 14:53:33 -04:00
Max Brunsfeld
06813be5c8 Mark platform as "Zed" for telemetry events from the app 
Co-authored-by: Joseph Lyons <joseph@zed.dev>
 2022-10-03 11:05:45 -07:00
Julia
8f4b3c3493 Store repo content path as absolute 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-03 14:00:58 -04:00
Max Brunsfeld
4477f95ee6 Set staff user property in telemetry 
Co-authored-by: Joseph Lyons <joseph@zed.dev>
 2022-10-03 10:52:57 -07:00
Julia
9427bb7553 Be clearer about using GitFilesIncluded setting 2022-10-03 11:58:48 -04:00
Antonio Scandurra
1e45198b9f Emit event on Room when a user shares a new project 2022-10-03 17:12:07 +02:00
Antonio Scandurra
ad323d6e3b Automatically fetch remote participant users in Room 2022-10-03 16:09:49 +02:00
Antonio Scandurra
da6106db8e Prevent calls from users who aren't contacts 2022-10-03 15:54:20 +02:00
Antonio Scandurra
bec6b41448 Fix randomized integration test failure 2022-10-03 15:50:47 +02:00
Antonio Scandurra
6426037653 Adapt integration tests to always pass a room id to Project::share 
Randomized test is failing, so we'll look into that next.
 2022-10-03 15:44:11 +02:00
Mikayla Maki
01176e04b7 Added clarification for git gutter settings 2022-10-02 18:42:03 -07:00
Mikayla Maki
c237075102 Touched up settings text 2022-10-02 18:35:19 -07:00
Mikayla Maki
0f1d71c38f
Merge branch 'main' into git-gutter 2022-10-02 18:03:50 -07:00
Mikayla Maki
56b4162023 Fix stray merge failure 2022-10-02 18:02:25 -07:00
Antonio Scandurra
fd42811ef1 Cache CGEventSource and avoid leaking CGEvent when handling events 2022-10-02 18:01:49 -07:00
Max Brunsfeld
34926abe83 0.57.0 2022-10-02 18:01:49 -07:00
Max Brunsfeld
1aa554f4c9 Fix FakeServer to expect new GetPrivateUserInfo request 2022-10-02 18:01:49 -07:00
Mikayla Maki
52dbf2f9b8 add proto stuff 2022-10-02 18:01:37 -07:00
Mikayla Maki
5769cdc354 made git diff rendering respect line wrap 2022-10-02 18:00:13 -07:00
Julia
7f84abaf13 Increment protocol version again for previous commit 2022-10-02 14:11:35 -04:00
Mikayla Maki
512f817e2f Added proto messages for updating the head text 2022-10-01 18:18:35 -07:00
Mikayla Maki
8c24c858c9 Touched up comments 2022-09-30 17:36:22 -07:00
Mikayla Maki
a1299d9b68 Fixed 1 test 2022-09-30 17:34:14 -07:00
Mikayla Maki
af0974264c Refactored git repository code to seperate out repository entry tracking data and git2 mocking code. 
Co-authored-by: Max <max@zed.dev>
Co-authored-by: Julia <julia@zed.dev>
 2022-09-30 17:33:34 -07:00
Julia
c95646a298 WIP Start refactoring separation of concerns for repo metadata 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-30 18:25:25 -04:00
Julia
42b7820dbb Perform git diff on remote buffer open 2022-09-30 18:05:09 -04:00
Julia
ce7f6dd082 Start a test for remote git data updating 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-09-30 15:51:32 -04:00
Julia
6540936970 Fix some panics in tests 2022-09-30 13:51:54 -04:00
Julia
1c5d15b85e Use sumtree instead of iterator linear search for diff hunks in range 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-30 13:32:54 -04:00
Antonio Scandurra
964a5d2db7 WIP: require sharing projects on a given Room 2022-09-30 18:21:47 +02:00
Julia
bce25918a0 Fix test build 2022-09-30 11:13:22 -04:00
Antonio Scandurra
074b8f18d1 Rip out project registration and use sharing/unsharing instead 2022-09-30 12:23:57 +02:00
Antonio Scandurra
be8990ea78 Remove project join requests 2022-09-30 11:35:50 +02:00
Antonio Scandurra
761ae3ae6f
Merge pull request #1673 from zed-industries/fix-cgevent-memory-leak 
Cache `CGEventSource` and avoid leaking `CGEvent` when handling events
 2022-09-30 09:04:25 +01:00
Antonio Scandurra
25bba396ef Cache CGEventSource and avoid leaking CGEvent when handling events 2022-09-30 09:51:03 +02:00
Max Brunsfeld
a977593f3d 0.57.0 2022-09-29 16:47:20 -07:00
Max Brunsfeld
6f81f7bd6d
Merge pull request #1670 from zed-industries/metrics-id-uuid 
Identify users in amplitude via a separate 'metrics_id' UUID
 2022-09-29 15:53:15 -07:00
Max Brunsfeld
35a537dae0 Fix FakeServer to expect new GetPrivateUserInfo request 2022-09-29 14:34:15 -07:00
Max Brunsfeld
5d09083a7d Identify users in amplitude via a separate 'metrics_id' UUID 2022-09-29 13:15:21 -07:00
Antonio Scandurra
b35e8f0164 Remove projects from contact updates 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-09-29 19:40:36 +02:00
Julia
fcf11b1181 Bump protocol version to be ahead of main 2022-09-29 13:16:02 -04:00
Julia
e865b85d9c Track index instead of head for diffs 2022-09-29 13:16:02 -04:00
Mikayla Maki
9fe6a5e83e made git stuff slightly more themable 2022-09-29 13:16:02 -04:00
Nate Butler
b395fbb3f2 wip 2022-09-29 13:16:02 -04:00
Nate Butler
8a2430090b WIP Git gutter styling 2022-09-29 13:16:02 -04:00
Mikayla Maki
113d3b88d0 Added test, and fix, for changed_repos method on LocalWorktree 2022-09-29 13:16:02 -04:00
Julia
f7714a25d1 Don't pretend this is async 2022-09-29 13:16:02 -04:00