Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
18682 commits 1103 branches 1111 tags 398 MiB
Commit graph

164 commits

Author SHA1 Message Date
Conrad Irwin
27c5343707
hosted projects (#8627) 
- **Allow joining a hosted project**

You can't yet do anything in a hosted project, but you can join it and
look how empty it is.

Release Notes:

- N/A
 2024-03-04 19:17:40 -07:00
Conrad Irwin
c31626717f
channel projects (#8456) 
Add plumbing for hosted projects. This will currently show them if they
exist
but provides no UX to create/rename/delete them.

Also changed the `ChannelId` type to not auto-cast to u64; this avoids
type
confusion if you have multiple id types.


Release Notes:

- N/A
 2024-02-26 22:15:11 -07:00
Conrad Irwin
c6826a61a0
talkers (#8158) 
Release Notes:

- Added an "Unmute" action for guests in calls. This lets them use the
mic, but not edit projects.
 2024-02-22 10:07:36 -07:00
Conrad Irwin
2294d99046
revert single channel click (#7738) 
- Revert "collab tweaks (#7706)"
- Revert "2112 (#7640)"
- Revert "single click channel (#7596)"
- Reserve protobufs
- Don't revert migrations

Release Notes:

- N/A

**or**

- N/A
 2024-02-13 12:53:49 -07:00
Conrad Irwin
efe23ebfcd
single click channel (#7596) 
- Open channel notes and chat on channel click
- WIP
- Fix compile error
- Don't join live kit until requested
- Track in_call state separately from in_room



Release Notes:

- Improved channels: you can now be in a channel without joining the
audio call automatically

**or**

- N/A

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2024-02-09 14:18:27 -07:00
Conrad Irwin
074acacdf7
Do more on channel join (#7268) 
This change makes it so that if you are the first to join a channel,
your project is automatically shared.

It also makes it so that if you join a channel via a link and there are
no shared projects, you open the notes instead of an empty workspace
with nothing.

This is to try and address the discoverability of project sharing: we've
had
two reviews that have talked about channels, but not talked about
sharing
projects into them, which makes me suspect they didn't know about the
feature.

Release Notes:

- Added a setting `share_on_join` (defaulting to true). When set, and
you join an empty channel, your project is automatically shared.
 2024-02-02 09:52:30 -07:00
Piotr Osiewicz
6c82380232 chore: Fix clippy::needless_borrow up to an editor 2024-01-21 15:03:24 +01:00
Max Brunsfeld
e57c32effb
Avoid playing newly published audio tracks when deafened (#4040) 
Release Notes:

- Fixed a bug where the 'deafen' button would only apply to audio from
the call's current participants, but not any participants who joined
after the button was pressed.
- Fixed a bug where after being granted write access to a channel, the
microphone icon appeared non-muted, even though audio was not shared.
 2024-01-15 14:08:49 -08:00
Max Brunsfeld
e90794d3ec Add and enhance tests for muting/deafening, fix exposed logic errors 2024-01-15 14:03:38 -08:00
Max Brunsfeld
c2cf28804a Don't run newly published audio tracks when deafened 
Also, simplify the management of the muted and deafened state in Room.
 2024-01-12 15:12:29 -08:00
Conrad Irwin
50f3bbbc8b Open chat when joining a channel with guests 
(and close it when leaving a channel again)
 2024-01-12 15:08:14 -07:00
Conrad Irwin
f0d490c671 Open chat panel for guests 2024-01-12 10:34:24 -07:00
Conrad Irwin
dc158f708f Update chat panel with current channel 2024-01-12 10:23:30 -07:00
Conrad Irwin
f418bd907d Stop following when project is unshared 
Before this change the views would continue to update in the background
of the "disconnected" dialogue, which was disconcerting.
 2024-01-10 23:09:09 -07:00
Max Brunsfeld
75fdaeb56f Detect when a track is unpublished due to reconnecting to livekit 
Co-authored-by: Julia <julia@zed.dev>
 2024-01-10 16:12:26 -08:00
Max Brunsfeld
2d1eb0c56c Expose a single updates stream from live_kit_client::Room 
Co-authored-by: Julia <julia@zed.dev>
 2024-01-10 16:10:52 -08:00
Conrad Irwin
4da9d61a42 Implement live kit promotion/demotion 2024-01-09 16:10:12 -07:00
Conrad Irwin
8669b08161 Failing test for unmuting microphone 2024-01-08 22:30:03 -07:00
Conrad Irwin
844d161c40 Allow adding write access to guests 2024-01-08 22:02:56 -07:00
Conrad Irwin
be426e67cc Tidy up guest count 2024-01-04 12:22:45 -07:00
Conrad Irwin
1930258d39 Show guests in fewer places 2024-01-03 19:31:43 -07:00
Conrad Irwin
9fe17a1d1d Prevent guests from screen-sharing, unmuting or screen sharing 2024-01-03 19:31:43 -07:00
Conrad Irwin
bf304b3fe7 Track room participant role 
(Also wire that through to project collaboration rules for now)
 2024-01-03 19:30:32 -07:00
Max Brunsfeld
28c39aae17 Start work on read-only project access for channel guests 
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 19:30:32 -07:00
Max Brunsfeld
53bdf6beb3 Remove 2 suffix for client, call, channel 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:02:14 -08:00
Conrad Irwin
4a6a17d866 Merge branch 'main' into zed2 2023-10-27 10:55:15 +02:00
Antonio Scandurra
516236e044 Disable livekit on zed2 2023-10-26 17:15:19 +02:00
Antonio Scandurra
637cff3ebd WIP 2023-10-26 17:15:19 +02:00
Conrad Irwin
b8bd070a83
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
fd8e6110b1 Fix panic by disallowing multiple room joins 2023-10-20 14:34:25 -06:00
Conrad Irwin
e03e5364d2 Wire through LiveKit permissions 2023-10-19 23:23:33 -06:00
Conrad Irwin
0eff7c6ca9 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
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
Mikayla
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
Mikayla
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
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
0f39b63801 Rename color_index to participant_index 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-09-28 11:37:22 -07:00
Max Brunsfeld
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
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
Max Brunsfeld
404f76739c Format let-else statements 2023-08-25 10:11:32 -07:00
Max Brunsfeld
1ffde7bddc Implement calling contacts into your current channel 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-15 14:56:54 -07:00