Commit Graph
121 Commits
Author SHA1 Message Date
Nathan Sobo 6239b5ec60 Introduce ProjectPath and ProjectEntry structs
These replace tuples of (usize, Arc<Path>) and (usize, usize) respectively.
2021-10-02 19:39:04 -06:00
Nathan Sobo f00045544f Introduce a File trait object to buffer
This will remove the dependency of buffer on `worktree::File`
2021-10-02 19:01:29 -06:00
Antonio Scandurra 5cd2c56f95 Merge branch 'main' into project-browser 2021-09-30 10:01:48 +02:00
Max BrunsfeldandAntonio Scandurra 1cfdd07d40 Avoid fetching GH releases in home route
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2021-09-29 14:10:40 -07:00
6e8d35379c Remove session and errors middleware from static route
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-29 14:10:40 -07:00
Nathan Sobo 5536bf6dcc Merge branch 'main' into site-v2 2021-09-28 15:33:44 -06:00
Nathan Sobo a3f45c0d3b Merge branch 'worktree-cursor' into project-browser 2021-09-28 12:13:47 -06:00
Max BrunsfeldandNathan Sobo ab31ddfc31 Allow seeking SumTree cursor by multiple seek types per dimension
Also, remove the cursor's sum_dimension. Replace it with a
blanket implementation of Dimension for two-element tuples
of dimensions.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-24 18:23:53 -07:00
Nate 4013e45af6 Merge the updates and releases pages
* Remove unused story page
* Remove updates page
* Remove updates from nav
2021-09-24 17:04:02 -04:00
Nate a90ccbdc86 Merge branch 'main' into site-v2 2021-09-24 16:52:06 -04:00
Max Brunsfeld d561f50ab1 Extract from Workspace a Project model that stores a window's worktrees 2021-09-23 16:34:06 -07:00
Max Brunsfeld 39fbf7d4d1 Avoid verifying access tokens for out-of-date clients
Replace the 'VerifyToken' middleware with a 'process_auth_header' function
that we call in the '/rpc' handler after checking that the client's protocol
version matches.
2021-09-23 15:32:23 -07:00
Max Brunsfeld 06efb0968c Speed up login by avoiding unnecessary access token verification 2021-09-23 13:34:53 -07:00
Antonio ScandurraandNathan Sobo 2352725c58 💄
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-23 17:32:37 +02:00
Antonio Scandurra 511cbaa2bd Version the zrpc protocol using a X-ZRPC-VERSION header 2021-09-23 15:35:35 +02:00
Nate 4e6e789f34 Merge branch 'main' into site-v2 2021-09-22 12:14:58 -04:00
Antonio Scandurra 3e65fb4267 Leave joined worktrees when guest loses connection 2021-09-22 15:33:13 +02:00
Antonio Scandurra b47422ae28 Maintain connections correctly when leaving or unsharing worktrees 2021-09-22 15:24:11 +02:00
Antonio Scandurra 78fbd1307a Remove remote worktrees and close their buffers when host unshares 2021-09-22 14:50:32 +02:00
Antonio Scandurra d67227177a Allow leaving worktree while opening a buffer 2021-09-22 12:38:31 +02:00
Max Brunsfeld 6d0b84a467 💄 2021-09-21 13:48:34 -07:00
412535420b Allow joining worktrees by clicking them in the people panel
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 12:21:03 -07:00
Antonio ScandurraandNathan Sobo c90dc7235e Rename participants to guests in proto
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 18:30:49 +02:00
Antonio Scandurra 4a723a1fb9 Merge branch 'main' into people-panel 2021-09-21 17:29:07 +02:00
Antonio ScandurraandNathan Sobo 7c10faeccf Use more concrete names for Store return values
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 17:21:30 +02:00
Antonio Scandurra d381020a60 Add Server::{state,state_mut} to catch most deadlocks statically 2021-09-21 12:19:52 +02:00
Antonio Scandurra 0b11192fe3 Remove deadlock and make integration tests pass again 2021-09-21 11:58:31 +02:00
Antonio Scandurra 1954c6b00e Replace returned tuples with named structs in Store 2021-09-21 11:38:50 +02:00
Nathan Sobo aa671f1041 Fix remaining compilation errors 2021-09-20 19:44:30 -06:00
Max Brunsfeld 5dfd4be174 WIP 2021-09-20 18:05:46 -07:00
Max BrunsfeldandNathan Sobo 8f578e7521 Maintain server state consistency when removing a connection
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-20 15:45:33 -07:00
Max BrunsfeldandNathan Sobo a068019d94 Add ZED_IMPERSONATE env var, for testing
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-20 15:44:28 -07:00
Nate f933b40fe2 Add "interest" booleans to signups form
Co-Authored-By: Max Brunsfeld
<max@zed.dev>
2021-09-20 16:06:16 -04:00
Nate 8d08abf2a6 Merge branch 'main' into site-v2 2021-09-20 16:01:03 -04:00
Antonio Scandurra 67946b7224 Add an integration test to verify collaborators are kept up to date 2021-09-20 16:40:31 +02:00
Antonio Scandurra 3d4dbf3140 Maintain collaborators in UserStore 2021-09-20 15:05:41 +02:00
Antonio Scandurra 32111092bd Turn UserStore into a model 2021-09-20 14:40:06 +02:00
Antonio Scandurra ae9fb65315 Fix integration tests 2021-09-20 12:52:13 +02:00
Antonio Scandurra d8ea220acc Update collaborators as worktrees are opened/shared/closed 2021-09-20 12:29:32 +02:00
Nate a4d35d6c09 add community page content 2021-09-17 15:37:34 -04:00
Nate 8cd16982b1 add releases page 2021-09-17 14:59:02 -04:00
Antonio ScandurraandNathan Sobo f13af7dc59 WIP
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-17 18:37:00 +02:00
Antonio Scandurra f2825cceba Start on Presence as the backing model for the people panel 2021-09-17 16:18:41 +02:00
Antonio Scandurra 12fa309b7c Implement proto::GetCollaborators request 2021-09-17 14:36:50 +02:00
Max Brunsfeld e3c0d6980c Switch to a new flow for advertising, sharing and joining worktrees
Now, when you open a local worktree, we immediately send an `OpenWorktree` message
to the server, telling it the name of the folder that you've opened, and the names of all the
collaborators (based on a `.zed.toml` file). The server responds with a unique id for the
worktree.

When starting share this local worktree, you now include this previously-assigned id
in the `ShareWorktree` message.

When joining a worktree, there is no longer a need to provide an access token. The access
is controlled by the set of "collaborator logins" that were provided when the worktree
was initially opened by the host.
2021-09-16 18:39:29 -07:00
Nate 18fd689177 hook up updates + more styles 2021-09-16 17:12:24 -04:00
Nathan Sobo a1f0693599 Specify full TextStyles in EditorStyle 2021-09-16 14:12:38 -06:00
Max Brunsfeld 176ca9086e Rename OpenWorktree message to JoinWorktree
We'll repurpose the name 'OpenWorktree' for opening a local
worktree while signed in, and advertising the open status to
the worktree's collaborators.
2021-09-16 12:57:19 -07:00
Nathan Sobo 606aa148a6 Require a build_style callback to be passed to Editor on construction
We're going to use this to control the text style, so it really doesn't make sense to allow an editor to be constructed without it.
2021-09-16 13:20:12 -06:00
Max Brunsfeld f0093974ee Always store an rpc client on local worktrees
Even before sharing, we now want to advertise that the user is working
on a certain worktree, to make that visible to all of the worktree's
collaborators.
2021-09-16 11:06:49 -07:00