Commit Graph
50 Commits
Author SHA1 Message Date
Max Brunsfeld 71a1a3904f wip 2023-08-02 15:52:56 -07:00
Max Brunsfeld e12e58c413 WIP 2023-08-02 12:15:06 -07:00
Mikayla Makiandmax a2a1d23b74 Add subchannel creation
co-authored-by: max <max@zed.dev>
2023-08-01 16:48:11 -07:00
Mikayla Makiandmax c9a92422bd Add remove channel method
Move test client fields into appstate and fix tests

Co-authored-by: max <max@zed.dev>
2023-08-01 16:06:27 -07:00
Mikayla Maki 824279d459 WIP: Add channel creation to panel UI 2023-08-01 13:22:06 -07:00
Mikayla Makiandmax a7fd3f4037 Add room creation from channel join
co-authored-by: max <max@zed.dev>
2023-07-31 16:54:12 -07:00
Mikayla Makiandmax f63051148b Add ability to join a room from a channel ID
co-authored-by: max <max@zed.dev>
2023-07-31 16:53:57 -07:00
Max BrunsfeldandMikayla 0886ea1dcb Set up basic RPC for managing channels
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-07-28 17:05:56 -07:00
Max BrunsfeldandMikayla 29cb60e740 Get DB channels query working with postgres
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-07-28 14:56:02 -07:00
Mikayla Maki dade666d51 implement recursive channel query 2023-07-28 13:24:43 -07:00
Mikayla Maki e7a7350529 WIP: Channel CRUD 2023-07-28 13:24:43 -07:00
Max Brunsfeld 3881f754ce WIP 2023-07-28 13:24:43 -07:00
Max Brunsfeld e7aacf59c8 Add a bit to each entry indicating if it's outside of the worktree root 2023-06-22 10:34:28 -07:00
Mikayla Maki 35ef109e8d Merge branch 'main' into stream-git-statuses 2023-06-07 14:12:58 -07:00
Mikayla Maki d478937043 Add statuses to test integration 2023-06-05 12:06:23 -07:00
Max Brunsfeld a2a96774fc Replicate project-specific settings when collaborating 2023-05-30 18:08:03 -07:00
Mikayla Maki 732949181b Add postgres migration 2023-05-10 17:50:35 -07:00
Mikayla Maki c5f4722a4a WIP: Change RepositoryEntry representation to be keyed off of the work directory
Removes branches button scaffolding
2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 46db4cbb79 WIP: Add repository entries to collab and synchronize when rejoining the room
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Max BrunsfeldandAntonio Scandurra 2c2bcf87f0 Lookup access tokens by id when authenticating a connection
This avoids the cost of hashing an access token multiple times,
to compare it to all known access tokens for a given user.

Co-authored-by: Antonio Scandurra <antonio@zed.dev>
2023-03-17 11:13:50 -07:00
Antonio Scandurra 1830d984c1 Create user record automatically when someone logs in on the website
Now that we are moving out of the private alpha, we should let everyone
in when they try to log into zed.dev.
2023-03-14 12:25:04 +01:00
JuliaandAntonio Scandurra a3d474af23 Begin tracking follow states on collab server
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-02-22 11:21:23 -05:00
Joseph T. Lyons af2da0f2f3 Add users to mailing list when using an invite link 2023-01-17 16:46:01 -05:00
Nathan Sobo e527caa26d WIP 2023-01-03 13:30:14 -07:00
Max BrunsfeldandJulia Risley 2dd709e002 Implement rejoining projects as guest when rejoining a room
Co-authored-by: Julia Risley <julia@zed.dev>
2022-12-20 15:02:26 -08:00
Antonio Scandurra 458b07bc3a Make host reconnection test pass when mutating worktree while offline 2022-12-20 17:30:58 +01:00
Antonio Scandurra 7ad68a05d7 Allow nulls in projects.host_connection_{id,server_id}
The server version on stable won't be able to fill values for those
columns when we deploy the migration to preview.

With this commit we're also dropping the unused `worktree_extensions`
and `project_activity_periods` tables. The last version of the server
on stable (0.2.6) doesn't contain any code that accesses those tables.
2022-12-15 11:30:51 +01:00
Antonio Scandurra b4a4b40623 Use "id" nomenclature more consistently 2022-12-15 10:15:59 +01:00
Max Brunsfeld c50083fff9 Fix stale server queries, use foreign keys from connectionsn to servers 2022-12-14 17:34:24 -08:00
Antonio Scandurra d661abda72 WIP 2022-12-14 18:02:39 +01:00
Antonio Scandurra f7070792a9 Introduce an epoch to ConnectionId and PeerId 2022-12-14 15:55:56 +01:00
Antonio Scandurra 8071e4abab Rename connection_lost to answering_connection_lost 2022-12-12 11:43:08 +01:00
Antonio Scandurra 7b91966883 Re-join room when client temporarily loses connection 2022-12-12 11:43:08 +01:00
Joseph T. Lyons fad9ffead0 Merge pull request #1941 from zed-industries/Allow-overwriting-signup-data
Allow overwriting signup data if a user signs up more than once with the same email address
2022-12-08 16:11:28 -05:00
Joseph Lyons 33bb73561d Ensure that subsequent signup happens after initial
We can't rely on the fact that the test won't run fast enough such that both `created_at`s are the same time.  This ensures the subsequent signup happens after the initial one and that the database doesn't overwrite the initial one.
2022-12-07 08:15:01 -05:00
Antonio Scandurra e1ac6969ad Add failing test showcasing inviting existing user via different email 2022-12-07 14:06:59 +01:00
Joseph Lyons 567c5d35a6 Clean up test 2022-12-07 07:12:27 -05:00
Joseph Lyons 88be85b671 Remove comment 2022-12-06 17:18:54 -05:00
Joseph Lyons 7c16866b9d Allow overwriting signup data if a user signs up more than once with the same email address 2022-12-06 17:12:12 -05:00
Antonio Scandurra dd6e608acb Query project count as i64 instead of i32 when gathering metrics
Using the latter will cause a type mismatch when performing the query.
2022-12-06 15:00:32 +01:00
Antonio Scandurra 3fac823050 Merge branch 'main' into reconnections-2 2022-12-02 19:09:33 +01:00
Antonio Scandurra 21f5e6d8a6 Clear stale data on startup
This is a stopgap measure until we introduce reconnection support.
2022-12-02 16:30:00 +01:00
Antonio Scandurra 8a5f89eb56 Use i32 to represent Postgres INTEGER types in Rust 2022-12-02 13:58:54 +01:00
Antonio Scandurra 0ddca2b768 Finish porting remaining db methods to sea-orm 2022-12-02 13:58:23 +01:00
Antonio Scandurra b5676d0eae WIP 2022-12-01 18:39:24 +01:00
Antonio Scandurra 4229c49a0c Replace i32 with u32 for database columns
We never expect to return signed integers and so we shouldn't use
a signed type. I think this was a limitation of sqlx.
2022-12-01 17:47:51 +01:00
Antonio Scandurra 5252f2f581 Implement Database::create_room 2022-12-01 15:22:20 +01:00
Antonio Scandurra 93c4dbeec2 Go back to a compiling state, panicking on unimplemented db methods 2022-12-01 15:13:57 +01:00
Antonio Scandurra 40f2e5730b Start using the new sea-orm backed database 2022-12-01 14:41:59 +01:00
Antonio Scandurra 0ad040f4d2 Start moving towards using sea-query to construct queries 2022-11-29 13:55:08 +01:00