oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,806 Commits 1 Branch 0 Tags
e2a2e40599fec9fa772df8aa558d4d7b75678951
Commit Graph
708 Commits
Author SHA1 Message Date
JuliaandMax Brunsfeld 0324ca3b08 Be more specific about clearing (leader, follower) row 
Previously anyone unfollowing someone would clear all other rows for
other followers leading to an incorrect state, fix and test

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 15:29:20 -05:00
Max Brunsfeld 0dc92bec5c Retrieve room id from the project when following/unfollowing 
Previously, we were accidentally using the project id as the room id.
 2023-02-22 11:34:55 -05:00
JuliaandAntonio Scandurra e403b868b7 Add followers table to sqlite scheme for tests 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-02-22 11:22:37 -05:00
Julia 4513c40993 Following face piles finally take their first breath 2023-02-22 11:21:23 -05:00
JuliaandMax Brunsfeld 4ffc8cd9fd Fix deadlock in db get_room 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:21:23 -05:00
Julia 2592ec7265 Initial tracking of unfollows on collab server 2023-02-22 11:21:23 -05:00
JuliaandAntonio Scandurra d6462c611c Begin tracking follow states on collab server 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-02-22 11:21:23 -05:00
Julia bda37ffb9c Enforce rustfmt on CI & clean up some let-else format errors 2023-02-20 13:27:35 -05:00
Max Brunsfeld 010eba509c Make Project::save_buffer and ::save_buffers into methods 2023-02-20 09:42:44 -08:00
Max Brunsfeld cdf64b6cad Unify save and save_as for local worktrees 
This fixes state propagation bugs due to missing RPC calls in save_as.
 2023-02-17 17:21:48 -08:00
Max Brunsfeld 3a7cfc3901 Move the save and save_as code paths close together 2023-02-17 17:21:48 -08:00
Max BrunsfeldandNathan Sobo eebce28b32 Respect UpdateBufferFile messages on guest buffers without file 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2023-02-17 12:38:04 -08:00
Antonio Scandurra 7be868e372 Avoid creating more than one room when inviting multiple people at once 
Previously, when initiating a call by calling multiple people, only
the first person would get the call while all the others would briefly
show a "pending" status but never get the call.

This would happen because `ActiveCall` was trying to a create a different
room for each person called, because the original room creation hadn't finished
and so a `ModelHandle<Room>` wasn't being store in the active call.

With this commit, only one room can be created at any given time and further
invites have to wait until that room creation is done.
 2023-02-14 12:03:30 +01:00
Antonio Scandurra 087d51634d Fix test that wasn't properly verifying disconnection from livekit 2023-02-14 10:46:29 +01:00
Mikayla Maki ea39983f78 Removed old experiments settings and staff mode flag, added new StaffMode global that is set based on the webserver's staff bit 2023-01-27 15:43:12 -08:00
Kay Simmons ea0dd8972f Merge pull request #2090 from zed-industries/workspace-window-position-persistence 
Workspace window position persistence
 2023-01-27 15:24:01 -08:00
Kay Simmons a1308d20ce Merge pull request #2105 from zed-industries/fix-focus-stealing-when-collaborating 
Limit focus grabbing in followed pane
 2023-01-27 15:23:43 -08:00
Kay Simmons 0f93386071 Add run until parked to test_fs_operations to ensure both update chunks are completed before asserting the changes 2023-01-27 15:07:51 -08:00
Kay Simmons 77a4f907a0 removed invalid focus assertion 2023-01-27 13:43:36 -08:00
Antonio Scandurra 5431488a9a collab 0.5.4 2023-01-27 11:07:12 +01:00
Antonio Scandurra ac7618da17 Merge pull request #2103 from zed-industries/connection-staleness 
Fix connection staleness issues
 2023-01-27 11:01:24 +01:00
Max Brunsfeld 1b45911857 Omit hidden worktrees when showing projects in collaboration UI 2023-01-26 14:47:37 -08:00
Petros AmoiridisandAntonio Scandurra 73af155dd6 Refactor Database::remove_contact 
Refactor it to avoid sending irrelevant messages to update the UI.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-26 19:01:51 +02:00
Antonio Scandurra 74aeec360d Cancel pending call when participant leaves room after a reconnection 
Previously, if a user temporarily disconnected while there was a pending
call, we would fail to cancel such pending call when the caller left the
room. This was due to the caller reconnecting and having a different connection
id than the one originally used to initiate the call.
 2023-01-26 16:44:55 +01:00
Kay Simmons 5eac797a93 mostly working now 2023-01-25 11:36:38 -08:00
Kay Simmons 15799f7af6 wip 2023-01-25 11:32:19 -08:00
Petros AmoiridisandAntonio Scandurra e928c1c61e Test removing a contact 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 17:31:42 +02:00
Petros AmoiridisandAntonio Scandurra 5d4eb2b7ae Push responder and requester to remove_contacts 
When we ask the server to remove a contact we need to push the requester and responder ids to `remove_contacts` so that when the UI updates, the correct contacts will disappear from the list.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 13:10:29 +02:00
Mikayla Maki d060114f00 Added complete scripts for generating third party license files 2023-01-23 12:47:12 -08:00
Max Brunsfeld 2f42af2ac3 Add confirm_quit setting 2023-01-20 13:02:38 -08:00
Antonio Scandurra a58b39f884 Merge branch 'main' into optimize-large-multi-buffers 2023-01-19 16:18:21 +01:00
Max Brunsfeld 17b4bfdf98 Merge pull request #2045 from zed-industries/fewer-unsaved-prompts 
Avoid prompting to save when closing an untitled buffer that is still open elsewhere
 2023-01-18 15:10:19 -08:00
Mikayla Maki 203f569f2e collab 0.5.3 2023-01-18 12:52:58 -08:00
Antonio Scandurra 8ca0f9ac99 Fix compile errors 2023-01-18 13:58:01 +01:00
Max Brunsfeld 8651320c9f Make workspace items expose their underlying models, remove file-related methods 2023-01-17 17:21:06 -08:00
Joseph T. Lyons c3b102f5a8 Add users to mailing list when using an invite link 2023-01-17 16:46:01 -05:00
Antonio Scandurra dc88a67f50 Fix assertions 2023-01-17 18:09:45 +01:00
Antonio Scandurra cc788dc5f7 Verify saved_version, saved_version_fingerprint and saved_mtime 2023-01-17 16:46:06 +01:00
Antonio Scandurra 2cd9db1cfe Ensure Buffer::{is_dirty,has_conflict} converge in randomized test 2023-01-17 16:32:51 +01:00
Max Brunsfeld 02f6928328 collab 0.5.2 2023-01-11 14:00:44 -08:00
Max Brunsfeld 74f8b493b2 collab 0.5.1 2023-01-11 13:25:28 -08:00
Max BrunsfeldandAntonio Scandurra 49379924cb Avoid dropping is_complete column for backward compatibility 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2023-01-11 13:25:02 -08:00
Mikayla Maki 048da9ddce collab 0.5.0 2023-01-11 10:50:16 -08:00
Mikayla Makiandkay a3da41bfad Fix test failures due to dependency on Settings global in client for telemetry 
co-authored-by: kay <kay@zed.dev>
 2023-01-10 16:39:03 -08:00
Antonio Scandurra 529ccbda3a Introduce git index mutations to randomized collaboration test 
The test now fails at the following seed:

```bash
SEED=850 ITERATIONS=1 OPERATIONS=131 cargo test --package=collab random
```
 2023-01-08 08:52:16 -07:00
Nathan Sobo 213658f1e9 Fix tests that failed due to defaulting the grouping interval to zero in tests 2023-01-06 17:56:21 -07:00
Antonio ScandurraandNathan Sobo 8487ae77e7 Share new worktrees when resharing project 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-01-06 12:58:19 -07:00
Nathan Sobo 1006ada458 Update scan_id on worktree entries when there is a conflict 
Forgetting to do this meant we were unable to sync changes with reconnecting
guests in some cases.
 2023-01-04 13:59:16 -07:00
Nathan Sobo 789bbf15b7 Update buffer files when synchronizing buffers 
It's possible that the host was disconnected when attempting to notify
guests of a file save, so we need to transmit this in order to correctly
update the file's mtime.

Next failing seed OPERATIONS=200 SEED=6894
 2023-01-04 12:33:48 -07:00
Nathan Sobo 1dd085fc92 Introduce completed_scan_id to worktree 
We need to know the most recent scan id we have actually completed. This is to
handle the case where a guest disconnects when we're in the middle of streaming
worktree entries to them. When they reconnect, they need to report a scan_id
from before we started streaming the entries, because we have no record of when
the stream was interrupted.

Next failure:
SEED=5051 ITERATIONS=1 OPERATIONS=200 cargo test --release --package=collab random -- --nocapture
 2023-01-03 18:26:57 -07:00