Commit Graph
184 Commits
Author SHA1 Message Date
Conrad Irwin a1fb3523d3 Merge branch 'main' into zed2 2023-10-27 10:55:15 +02:00
Antonio Scandurra 289f4a6fdc Disable livekit on zed2 2023-10-26 17:15:19 +02:00
Antonio Scandurra 3135db57c8 WIP 2023-10-26 17:15:19 +02:00
Conrad Irwin 837755b5c7 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 38a00ade0f Fix extra race 2023-10-24 18:54:55 +02:00
Mikayla 5ea75ddea6 Restore synchronization 2023-10-21 03:08:25 -07:00
Mikayla a798fd4a32 WIP: Add test for panic, temporarily rollback synchronization changes 2023-10-21 03:05:57 -07:00
Conrad Irwin 4177fb207b Fix panic by disallowing multiple room joins 2023-10-20 14:34:25 -06:00
Conrad Irwin ec356978a3 Wire through LiveKit permissions 2023-10-19 23:23:33 -06:00
Conrad Irwin db582b776b Add read-only channel notes support
Fix some bugs where ChannelNotes and ChannelChat had old cached channel
instances
2023-10-19 13:20:49 -06:00
Conrad Irwin 36c95ae516 Merge branch 'main' into links 2023-10-09 20:08:48 -06:00
Conrad Irwin b83ca0c3c4 code review 2023-10-09 19:06:55 -06:00
Max Brunsfeld b06ede0175 Avoid possible panic in Room::most_active_project
Participants' locations might momentarily reference projects that have already been unshared.
2023-10-09 15:04:01 -07:00
Max Brunsfeld 057666a0c4 Handle participants' participant index changing
This normally doesn't happen, but it can happen if a participant
loses connection ungracefully, restarts their app, and then
explicitly joins again.
2023-10-09 14:45:19 -07:00
Conrad Irwin f98ab0f1e3 Focus the currently active project if there is one
(also consider your own projects in "most_active_projects")
2023-10-09 12:05:26 -06:00
Conrad Irwin 30747d758d Make joining on boot work 2023-10-06 16:11:45 -06:00
Conrad Irwin 053fd3ab90 Fix panic if the host is not there. 2023-10-06 15:18:25 -06:00
Max Brunsfeld 3c812b590d Remove call -> channel dependency 2023-10-06 13:39:10 -07:00
15eb760874 Changed the on-click behavior of joining a channel to not open the chat, and only open 1 project instead of all projects
Co-authored-by: conrad <conrad.irwin@gmail.com>
Co-authored-by: max <max@zed.dev>
2023-10-04 11:46:08 -07:00
Mikaylaandconrad 62762d83d6 Lower frequency of popup warning when leaving a call
co-authored-by: conrad <conrad.irwin@gmail.com>
2023-10-03 19:30:05 -07:00
Conrad Irwin f886d26e3c Change channel join behavior
- Clicking on a channel name now joins the channel if you are not in it
- (or opens the notes if you are already there).
- When joining a channel, previously shared projects are opened
  automatically.
- If there are no previously shared projects, the notes are opened.
2023-10-02 23:20:06 -06:00
Conrad Irwin 19bb02c50e Ensure notifications are dismissed
Before this change if you joined a project without clicking on the
notification it would never disappear.

Fix a related bug where if you have more than one monitor, the
notification was only dismissed from one of them.
2023-10-02 11:01:21 -06:00
Max Brunsfeld c8dc666de8 Add ZED_ALWAYS_ACTIVE env var, use it in local collaboration script
This makes zed always behave as if the app is active, even if no window is focused.
It prevents the 'viewing a window outside of zed' state during collaboration.
2023-09-29 13:43:43 -07:00
Max Brunsfeld 447a8ffa81 Introduce a WorkspaceStore for handling following 2023-09-28 18:58:52 -07:00
Max Brunsfeld 893166c0fc Remove unused dependencies on theme 2023-09-28 17:13:10 -07:00
Max Brunsfeld c712acdfb2 Fix removal of followers on Unfollow 2023-09-28 16:46:43 -07:00
Max Brunsfeld 26b0382f31 Undo making project optional on stored follower states
Following works without a project, but following in unshared projects does
not need to be replicated to other participants.
2023-09-28 14:21:44 -07:00
Max Brunsfeld 0729b740c9 Merge branch 'main' into allow-following-outside-of-projects 2023-09-28 11:58:28 -07:00
Max BrunsfeldandConrad 13f4957210 Rename color_index to participant_index
Co-authored-by: Conrad <conrad@zed.dev>
2023-09-28 11:37:22 -07:00
0976bdc78d Assign unique color indices to room participants, use those instead of replica_ids
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Antonio <antonio@zed.dev>
2023-09-28 11:06:09 -07:00
Joseph T. LyonsandJulia 9ee1d7fab2 Rework call events api
There were time when events with bad data were being emitted. What we found was that places where certain collaboration-related code could fail, like sending an, would still send events, and those events be in a bad state, as certain elements weren't constructed as expected, thus missing in the event. The new API guarantees that we have data in the correct configuration. In the future, we will add events for certain types of failures within Zed.

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-09-26 14:18:32 -04:00
Max Brunsfeld 32bbc58a34 Start work on allowing following without a shared project 2023-09-21 13:14:15 -07:00
Max Brunsfeld 18c8af1b74 Mute on join if ZED_IMPERSONATE is set 2023-09-08 16:24:37 -07:00
Joseph T. Lyons 0b638e9115 Allow call events to be logged without a room id 2023-09-06 22:53:05 -04:00
Joseph T. Lyons a9bbb9b519 Add operation for opening channel notes in channel based calls 2023-09-05 17:13:09 -04:00
Max Brunsfeld 0596c2f103 Format let-else statements 2023-08-25 10:11:32 -07:00
MikaylaandMax 80c8940c36 Add buffer integration test
Rearrange channel crate structure
Get channel buffer from database

co-authored-by: Max <max@zed.dev>
2023-08-23 18:34:43 -07:00
Joseph T. LyonsandMax Brunsfeld b6fc142f3e Add channel id to call events
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2023-08-21 13:50:04 -04:00
Mikayla 81e0c0dd5c Lazily initialize and destroy the audio handle state on call initiation and end 2023-08-15 23:19:11 -07:00
Max BrunsfeldandMikayla 2223d15c96 Implement calling contacts into your current channel
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-08-15 14:56:54 -07:00
Max Brunsfeld c48492a1cb Avoid flicker when moving between channels 2023-08-15 13:18:56 -07:00
Max BrunsfeldandMikayla bd0c77061a Display intended mute status while still connecting to a room
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-08-14 16:47:26 -07:00
Mikayla Maki cca30c8481 Add the ability to jump between channels while in a channel 2023-08-02 17:13:09 -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
Joseph T. Lyons 837c2b50d7 Add microphone toggle events (#2765)
Release Notes:

- N/A
2023-07-20 16:10:20 -04:00
Joseph T. Lyons 51469f93f3 Remove unused method 2023-07-20 15:54:26 -04:00
Kirill Bulatov 923d7d849c Properly display keybindings in context menus 2023-07-20 12:18:04 +03:00
Mikayla Maki fff37b30ea fmt 2023-07-19 12:34:56 -07:00
Mikayla Maki 72f550e68d Mute mics by default
Fix bug when file ends in line with 1 more digit displayed than previous lines
Remove stale UI elements from voice call development
2023-07-19 12:34:24 -07:00