mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 20:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
16523 commits 777 branches 798 tags 284 MiB
Commit graph

1234 commits

Author SHA1 Message Date
Conrad Irwin
3c0052850c Merge branch 'main' into channel-guests 2024-01-05 10:05:59 -07:00
Conrad Irwin
4a7233f8f0 Fixy fix 2024-01-04 19:43:12 -07:00
Conrad Irwin
931bd687dc Uncomment editor tests 
Co-Authored-By: Julia <julia@zed.dev>
 2024-01-04 13:58:19 -07:00
Conrad Irwin
d2afc97b53 Tidy up branch 2024-01-04 11:55:14 -07:00
Conrad Irwin
1930258d39 Show guests in fewer places 2024-01-03 19:31:43 -07:00
Conrad Irwin
c3402024bc Fix privilege escalation when guests invite people 2024-01-03 19:31:43 -07:00
Conrad Irwin
9fe17a1d1d Prevent guests from screen-sharing, unmuting or screen sharing 2024-01-03 19:31:43 -07:00
Conrad Irwin
bf304b3fe7 Track room participant role 
(Also wire that through to project collaboration rules for now)
 2024-01-03 19:30:32 -07:00
Conrad Irwin
88ed5f7290 Plumbing to pass role for room participants 2024-01-03 19:30:32 -07:00
Max Brunsfeld
28c39aae17 Start work on read-only project access for channel guests 
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 19:30:32 -07:00
Joseph T. Lyons
5944fcb999 collab 0.33.0 2024-01-03 17:20:01 -05:00
Joseph T. Lyons
9936b07472 Bump collab version back to what it was before 2024-01-03 17:19:39 -05:00
Max Brunsfeld
f5ba22659b Remove 2 suffix from gpui 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:59:39 -08:00
Max Brunsfeld
3c81dda8e2 Remove 2 suffix from live_kit_client 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:49:33 -08:00
Max Brunsfeld
dfcb17fe74 Remove 2 suffix for theme 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:41:01 -08:00
Max Brunsfeld
4305c5fdbe Remove 2 suffix for ui, storybook, text 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:33:51 -08:00
Max Brunsfeld
0cf65223ce Remove 2 suffix for collab, rope, settings, menu 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:29:16 -08:00
Max Brunsfeld
5b35dedc5f Add nightly environment for collab 
Also, move postgrest service + deployment into a separate manifest
file, which is deployed via a separate script, `deploy-postgrest`.
This way, we don't have unused postgrest instances in preview and
nightly, since those use the prod database.

Co-authored-by: Conrad <conrad@zed.dev>
 2024-01-02 14:29:21 -08:00
Joseph T. Lyons
4c0856e096 collab 0.32.0 2023-12-20 13:15:44 -05:00
Joseph T. Lyons
7cd6825eee Add backtrace hash to collab server panic api 2023-12-18 11:12:23 -05:00
Joseph T. Lyons
07a266d93f collab 0.31.0 2023-12-13 12:39:29 -05:00
Joseph T. Lyons
0cab3de0ae collab 0.30.1 2023-12-08 12:48:02 -05:00
Joseph T. Lyons
7964b35607 Add release channel to panic collab upload 2023-12-08 12:10:25 -05:00
Joseph T. Lyons
5ae2060783 collab 0.30.0 2023-12-06 12:34:47 -05:00
Kirill Bulatov
b43dc480a9 Integration tests for excluded files 2023-12-05 12:45:44 +02:00
Kirill Bulatov
f0ca7141b8 Ignore excluded files on worktree entry refresh 2023-12-05 12:30:29 +02:00
Max Brunsfeld
5dd9db3607 collab 0.29.1 2023-12-01 11:50:05 -08:00
Max Brunsfeld
4479628342 Prevent moving a channel into its descendant 2023-12-01 11:41:38 -08:00
Kirill Bulatov
69bfd47cf9 Exclude gitignored files' diagnostics from project panel and its indicator. 
The diagnostics are collected and available still, since that might become a settings/UI toggle later.
Also, buffer diagnostics are still updated for gitignored files.
 2023-11-30 15:46:30 +02:00
Joseph T. Lyons
10c4df20e9 collab 0.29.0 2023-11-22 13:05:29 -05:00
Kirill Bulatov
8180938401 Fix most of the TODOs 2023-11-17 21:40:57 +02:00
Kirill Bulatov
5f468970f0 Fix some of the old tests 2023-11-17 21:40:57 +02:00
Kirill Bulatov
a5c615ceb4 Pass a new query parameter into the search 2023-11-17 21:40:56 +02:00
Mikayla
75a80811b3
WIP 2023-11-06 11:18:56 -08:00
Joseph T. Lyons
51ecf8e6b4 collab 0.28.0 2023-11-01 14:50:29 -04:00
Max Brunsfeld
841a5ef7b8 collab 0.27.0 2023-10-25 17:38:09 +02:00
Mikayla Maki
f67f42779b
Rename IIFE to maybe (#3165) 
Too good of an idea to forget

Release Notes:

- N/A
 2023-10-25 17:09:12 +02:00
Joseph T. Lyons
c44d1cda9a collab 0.26.0 2023-10-25 16:24:53 +02:00
Mikayla
26a3d41dc7
Change from try (reserved keyword) to maybe 2023-10-25 07:10:21 -07:00
Max Brunsfeld
90f65ec9fe
Remove logic for multiple channel parents (#3162) 
This PR simplifies our state management for channels, and logic for
inheriting channel permissions, by removing the ability for channels to
have multiple parent channels.
 2023-10-25 15:57:55 +02:00
Max Brunsfeld
b5cbfb8f1d Allow moving channels to the root 2023-10-25 15:50:37 +02:00
Max Brunsfeld
32367eba14 Set up UI to allow dragging a channel to the root 2023-10-25 15:39:02 +02:00
Conrad Irwin
b8bd070a83
Fix panic by disallowing multiple room joins (#3149) 
Release Notes:

- Fixed panic that could occur when switching channels quickly
 2023-10-24 23:57:08 +02:00
Conrad Irwin
dfc34e582a Fix extra race 2023-10-24 18:54:55 +02:00
Max Brunsfeld
5c03b6a610 Remove logic for multiple channel parents 
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Kyle <kyle@zed.dev>
Co-authored-by: Joseph <joseph@zed.dev>
 2023-10-24 17:29:23 +02:00
Max Brunsfeld
cc9e92857b
Guest roles (#3140) 
Release Notes:

- Added a "guest" role to channels, and made that the default when a new
user joins a public channel.
 2023-10-24 17:29:14 +02:00
Kirill Bulatov
e9ce935991 Rework prettier tests 
Do not infuse `FakeNodeRuntime` with prettier exceptions, rather keep
the default formatter installation method as no-op.
 2023-10-24 14:25:46 +02:00
Conrad Irwin
3358420f6a fix format 2023-10-24 11:17:17 +02:00
Conrad Irwin
aa6990bb6b Fix set_channel_visibility for public channels 2023-10-24 10:55:10 +02:00
Conrad Irwin
e6087e0ed9 Fix tests 2023-10-24 09:46:46 +02:00