yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,317 Commits 5 Branches 0 Tags
2ec00a2e36f41e288a9c7017a99c889288edd12f
Commit Graph
154 Commits
Author SHA1 Message Date
Max Brunsfeld 4dcacc2e0d Merge pull request #1073 from zed-industries/window-menu 
Add a Window application menu
 2022-05-27 11:22:13 -07:00
Max Brunsfeld 352115d447 Adjust test to flush effects between splitting pane and following 
Panes now emit an event when adding the first item, so we need to flush
effects between splitting and following in order to avoid accidentally
cancelling the follow.
 2022-05-27 10:53:14 -07:00
Max Brunsfeld 4e308c6fa7 Emit an event when adding a worktree to a project 2022-05-27 10:48:47 -07:00
Keith Simmons 99db9f5383 Fix failing seed bin build and add bin builds to ci pipeline 2022-05-26 15:41:24 -07:00
Antonio Scandurra ce06f5ef2a Pretty-print JSON of server snapshot 2022-05-26 09:34:39 +02:00
Nathan Sobo 1ba10ddfb4 Implement /rpc_server_snapshot endpoint 
This returns a JSON snapshot of the state of the server
 2022-05-25 17:42:25 -06:00
Antonio Scandurra e121f87eea Merge pull request #1050 from zed-industries/ignored-files 
Show ignored entries in project panel
 2022-05-24 10:57:16 +02:00
Antonio Scandurra 4f5a32e850 Fix logic error when streaming ignored entries 
We were calling `next` twice, which led us to skip every other entry.
This commit also enhances the `test_share_project` integration test
to exercise this new streaming logic.
 2022-05-24 09:03:05 +02:00
Nathan Sobo 26a674aba7 Implement get_invite_code_for_user on test db 2022-05-23 18:07:23 -06:00
Nathan SoboandMax Brunsfeld bdc8941026 Update foreign key constraints to allow users to be deleted 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-23 17:46:06 -06:00
Nathan SoboandMax Brunsfeld 8f440348a5 Don't assign invite code when updating count from 0 to 0 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-23 17:28:05 -06:00
Nathan Sobo 212c138608 Set INVITE_LINK_PREFIX in K8s 2022-05-23 15:49:51 -06:00
Nathan Sobo d1bcff6ea8 Merge remote-tracking branch 'origin/main' into invite-codes-2 2022-05-23 15:46:39 -06:00
Antonio Scandurra 2ec31aa0b6 Broadcast proto::UnregisterProject when host closes a project 2022-05-23 15:38:01 +02:00
Nathan Sobo ed5f5dc722 Accept an optional email address when creating new users 2022-05-20 20:25:21 -06:00
Antonio ScandurraandNathan Sobo c34ead1401 Rename first_connection to connected_once 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-20 17:35:00 +02:00
Antonio Scandurra bb53ff8611 Send a ShowContacts message the first time a user connects to collab 2022-05-20 15:47:14 +02:00
Antonio Scandurra d3a80c0f7c Update users and invite count after an invite gets redeemed 2022-05-20 12:02:31 +02:00
Nathan SoboandAntonio Scandurra 3b4085b654 Add affordance to copy user's invite link if they have a code 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-19 17:57:46 -06:00
Max Brunsfeld a500249333 Replace build_workspace fn with an initialize function that takes a workspace 
This makes it clearer that the function is not providing necessary
dependencies to a workspace, but rather configuring it with all of
the panels and widgets which are defined in downstream crates.
 2022-05-19 16:50:22 -07:00
Max Brunsfeld e6011794ca Remove AppState from workspace actions 
This allows those actions to be bound to keystrokes in the keymap.
Also, remove the WorkspaceParams struct, simplify how Workspaces are
constructed.
 2022-05-19 14:37:26 -07:00
Nathan SoboandAntonio Scandurra a10b9e8c4c Add ability to get the user for an invite code in collab API 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-19 12:35:07 -06:00
Nathan SoboandAntonio Scandurra 505e773544 Enable descriptive HTTP errors to be returned from DB layer 
For now, we only use this when redeeming an invite code.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-19 11:55:55 -06:00
Nathan Sobo 0ad5734c22 WIP 2022-05-19 11:09:44 -06:00
Nathan Sobo 7f9e1b321a WIP 2022-05-18 16:14:58 -06:00
Nathan Sobo 304aa0d74a WIP 2022-05-18 11:51:47 -06:00
Nathan SoboandAntonio Scandurra 0331fdef6d Return 404 from API if no user is found 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-18 10:32:58 -06:00
Nathan SoboandAntonio Scandurra 597e0563fa Add ability to update invite count to collab API 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-18 10:23:08 -06:00
Nathan SoboandAntonio Scandurra dfa2bec181 Add invite codes / counts to users table 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-18 09:56:37 -06:00
Nathan SoboandAntonio Scandurra d6ac349a3f Log JSON in Kubernetes 
If you set LOG_JSON=true, we'll output JSON from the tracing subscriber instead of pretty-printing trace output.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-17 11:05:22 -06:00
Antonio Scandurra 32b92599e6 Merge branch 'main' into request-to-join-project 2022-05-17 14:55:20 +02:00
Antonio Scandurra 089c32940e Ensure join request reaches the server before disconnecting host in test 2022-05-17 14:50:28 +02:00
Antonio Scandurra 7103be853d Fix Store::remove_connection not removing guests from projects 2022-05-17 14:50:00 +02:00
Antonio Scandurra e062c97b68 WIP: accept to join requests if user is already participating 
There's a panic caused by `Store::check_invariants` that we still
need to figure out.
 2022-05-17 13:21:20 +02:00
Nathan Sobo 6be7161888 Cancel join requests when the requester closes the window 2022-05-16 20:29:36 -06:00
Antonio ScandurraandNathan Sobo 1738d4dbbe Show the reason why a join request was declined 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-16 19:57:50 +02:00
Antonio Scandurra 5733963edc WIP: decline pending join requests when project is unregistered 2022-05-16 17:46:08 +02:00
Antonio Scandurra a6a9aa6dc3 Uncomment randomized tests for contacts 2022-05-16 15:13:32 +02:00
Antonio Scandurra 1373403134 Delete commented-out code 2022-05-16 09:50:36 +02:00
Antonio Scandurra aa6d96a26d Initialize UserStore before client connects in integration tests 
This fixes a failure in `test_contacts` where we were receiving the
initial `proto::UpdateContacts` message before `UserStore` had a chance
to register a message handler for it.
 2022-05-16 09:48:24 +02:00
Keith Simmons 157de669ae Merge pull request #973 from zed-industries/selections-refactor 
Pull selections out of editor into selections collection
 2022-05-13 16:07:26 -07:00
Keith Simmons c95f74648a Rename selected_ranges and selected_display_ranges to remove redundant selected 2022-05-13 15:55:27 -07:00
Keith Simmons 2a984285a2 store buffer and display_map model handles on selections collection 2022-05-13 15:55:27 -07:00
Keith Simmons 851e04d46b Passing tests and removed local argument. Also pulled autoscroll argument out to change_selections 2022-05-13 15:55:27 -07:00
Keith Simmons 9b46bb0ee6 Move selection helpers to SelectionCollection, add update_anchor_selections, add a number of invariant preserving mutation functions to the MutableSelectionCollection 2022-05-13 15:55:17 -07:00
Max Brunsfeld 2afcbe8b63 Send RemoveProjectCollaborator to host in addition to ProjectUnshared 2022-05-13 15:04:48 -07:00
Max Brunsfeld 4f473eba7a Tell host to unshare project when last guest leaves 2022-05-13 14:57:55 -07:00
Antonio ScandurraandNathan Sobo b8383deda2 Fix randomized test failure caused by unsharing while guest was joining 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-13 17:39:13 +02:00
Antonio ScandurraandNathan Sobo b3fc910632 Make Project::share and Project::unshare private 
This is still in-progress because randomized tests are failing.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-13 17:17:20 +02:00
Max BrunsfeldandNathan Sobo 8d00fab9b1 Start work on requesting to join projects 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-12 17:53:11 -07:00