Commit Graph
167 Commits
Author SHA1 Message Date
Conrad Irwin d4ef764305 Merge branch 'main' into links 2023-10-09 20:08:48 -06:00
Conrad Irwin 8922437fcd code review 2023-10-09 19:06:55 -06:00
Max Brunsfeld 1d29709c32 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 b807b3c785 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 abfb4490d5 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 63a230f92e Make joining on boot work 2023-10-06 16:11:45 -06:00
Conrad Irwin 4128e2ffcb Fix panic if the host is not there. 2023-10-06 15:18:25 -06:00
Max Brunsfeld 3412bb75be Remove call -> channel dependency 2023-10-06 13:39:10 -07:00
dd0edcd203 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 23ee8211c7 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 18e7305b6d 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 39af2bb0a4 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 555c9847d4 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 ca0a4bdf8e Introduce a WorkspaceStore for handling following 2023-09-28 18:58:52 -07:00
Max Brunsfeld 38a9e6fde1 Fix removal of followers on Unfollow 2023-09-28 16:46:43 -07:00
Max Brunsfeld e9c1ad6acd 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 a8b35eb8f5 Merge branch 'main' into allow-following-outside-of-projects 2023-09-28 11:58:28 -07:00
Max BrunsfeldandConrad 0f39b63801 Rename color_index to participant_index
Co-authored-by: Conrad <conrad@zed.dev>
2023-09-28 11:37:22 -07:00
545b5e0161 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 0897ed561f 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 f34c6bd1ce Start work on allowing following without a shared project 2023-09-21 13:14:15 -07:00
Max Brunsfeld a91f5244a9 Mute on join if ZED_IMPERSONATE is set 2023-09-08 16:24:37 -07:00
Joseph T. Lyons 39e13b6675 Allow call events to be logged without a room id 2023-09-06 22:53:05 -04:00
Joseph T. Lyons 653d4976cd Add operation for opening channel notes in channel based calls 2023-09-05 17:13:09 -04:00
Max Brunsfeld 404f76739c Format let-else statements 2023-08-25 10:11:32 -07:00
MikaylaandMax a7a4e2e369 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 f66e6863fa Add channel id to call events
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2023-08-21 13:50:04 -04:00
Mikayla 0524abf114 Lazily initialize and destroy the audio handle state on call initiation and end 2023-08-15 23:19:11 -07:00
Max BrunsfeldandMikayla 1ffde7bddc Implement calling contacts into your current channel
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-08-15 14:56:54 -07:00
Max Brunsfeld ddf3642d47 Avoid flicker when moving between channels 2023-08-15 13:18:56 -07:00
Max BrunsfeldandMikayla 13982fe2f4 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 30e1bfc872 Add the ability to jump between channels while in a channel 2023-08-02 17:13:09 -07:00
Mikayla Makiandmax 003a711dea Add room creation from channel join
co-authored-by: max <max@zed.dev>
2023-07-31 16:54:12 -07:00
Mikayla Makiandmax 92fa879b0c 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 6095525b56 Add microphone toggle events (#2765)
Release Notes:

- N/A
2023-07-20 16:10:20 -04:00
Joseph T. Lyons 7d3d54652b Remove unused method 2023-07-20 15:54:26 -04:00
Kirill Bulatov a5e63fbf77 Properly display keybindings in context menus 2023-07-20 12:18:04 +03:00
Mikayla Maki 1e4bddd276 fmt 2023-07-19 12:34:56 -07:00
Mikayla Maki 5ceb258b3e 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
Joseph T. LyonsandMax Brunsfeld 6da5008f32 Fix screen sharing panic introduced by call events
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2023-07-12 16:12:07 -04:00
Joseph T. LyonsandMax Brunsfeld 98a0113ac3 Add call events
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2023-07-11 13:58:55 -04:00
Nate Butler a7ce602bac Update collaboration sounds, add sounds to screensharing 2023-07-04 16:18:42 -04:00
Mikayla Maki 0e4c904091 Add joined sound effect when new participants join the room 2023-07-03 13:36:03 -07:00
Mikayla Maki d2127825e3 Add first-pass sound support to Zed 2023-07-03 13:30:04 -07:00
Mikayla Maki 138de37cbf Add basic sound handling infrastructure 2023-06-30 16:10:49 -07:00
Piotr Osiewicz 2ddf0e12bf Undeafen: unmute if user was not muted prior to deafening 2023-06-28 11:10:56 +02:00
Mikayla Maki 5d02b49058 Added muted and currently speaking tracking 2023-06-27 19:23:13 -07:00
Mikayla Maki 60ce584427 WIP: Add mute icons 2023-06-27 13:12:52 -07:00
Piotr Osiewicz 3104275d87 Keep users muted once they undeafen themselves 2023-06-27 17:19:18 +02:00
Piotr Osiewicz a9b5c1d867 Remove unnecessary call to context.notify 2023-06-26 12:45:50 +02:00