Commit Graph
519 Commits
Author SHA1 Message Date
Max Brunsfeld f40f6d70c6 Replace disconnected channel notes views when re-opening the notes 2023-10-12 12:38:23 -07:00
Max Brunsfeld 2a3951e49d Exclude disconnected channel views from following messages 2023-10-12 11:55:39 -07:00
Conrad Irwin 9a3d79d4b5 Make collaboration warning more useful 2023-10-11 09:50:22 -06:00
Conrad Irwin 36c95ae516 Merge branch 'main' into links 2023-10-09 20:08:48 -06:00
Conrad Irwin 1e6395331b Code quality 2023-10-09 09:44:09 -06:00
Conrad Irwin 9ae2983a6f Add "Copy Link" to channel right click menu 2023-10-09 09:30:00 -06:00
Max Brunsfeld a829cd1f89 Remove workspace -> channel dependency 2023-10-06 14:19:25 -07:00
Conrad Irwin 9da086cfce Code to allow opening zed:/channel/1234
Refactored a bit how url arguments are handled to avoid adding too much
extra complexity to main.
2023-10-05 14:57:45 -07:00
Mikayla aa11e374c3 re-unify markdown parsing between hover_popover and chat 2023-10-05 14:22:41 -07:00
Mikayla 320f369536 Improve chat rendering 2023-10-05 11:58:41 -07:00
Mikayla 5db6722eee Fix bug where chat text wouldn't wrap to width 2023-10-05 11:06:29 -07:00
Mikayla 4dbb78ea12 Create markdown text element and add to channel chat 2023-10-04 17:47:30 -07:00
Mikayla Maki da13e9dd92 Remove old code from notes icon click handler (#3085)
Release Notes:

- Fix clicking the notes icon when people are in the channel (preview
only)
2023-10-04 15:15:25 -07:00
Mikaylaandconrad 9b2dee6983 Fix hit boxes and hover styles for new buttons
co-authored-by: conrad <conrad.irwin@gmail.com>
2023-10-04 14:44:50 -07:00
Mikayla 8c16b13329 Adjust channel rendering to group related messages 2023-10-04 14:29:08 -07:00
Conrad Irwin 4b4694c13a Remove old code from notes icon click handler 2023-10-04 15:18:26 -06:00
Mikayla be2d6dc1af Add image avatars to channel messages 2023-10-04 14:04:02 -07:00
Mikaylaandmax 2417284d20 Add an RPC handler for channel buffer acks
co-authored-by: max <max@zed.dev>
2023-10-04 11:47:13 -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
Mikayla 2f82357b29 Fix channel messages test 2023-10-04 10:13:02 -07:00
Mikayla 6f21c99e95 Fix most tests for new chat changes 2023-10-03 20:50:17 -07:00
Mikaylaandconrad ed0adf7e96 Fix a few mouse event id bugs and move facepile to the left
co-authored-by: conrad <conrad.irwin@gmail.com>
2023-10-03 19:45:33 -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
Max Brunsfeld 6f6460a858 Merge branch 'main' into channel-changes 2023-10-03 17:52:28 -07:00
Max BrunsfeldandMikayla d2ca5522f5 Acknowledge channel notes and chat changes when views are active
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-10-03 17:40:10 -07:00
Conrad Irwin 875688d54e Confirm on switching channels 2023-10-03 13:45:48 -06:00
Conrad Irwin 08ad27ad97 Tooltips for contacts 2023-10-03 12:54:39 -06:00
Conrad Irwin a8175528fe Scroll so that collab panel is in good state for calls 2023-10-03 12:00:02 -06:00
Conrad Irwin 4e25c43f3a Update collab ui to join channels again 2023-10-03 11:36:01 -06: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 b72c74227b Add/fix mouse interactions in current call sidebar 2023-10-02 19:38:45 -06:00
Conrad Irwin 484ea0e8ee Fix bug in following
Prior to this change you could only follow across workspaces when you
were heading to the first window.
2023-10-02 16:29:42 -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
Mikayla 03777676aa Implement channel changes for messages 2023-10-01 22:32:11 -07:00
Mikayla 30ae808ce1 Add channel note indicator and clear changed status 2023-10-01 22:32:10 -07:00
Mikayla 2a02ec0b87 Channel notifications from the server works 2023-10-01 22:30:21 -07:00
Conrad IrwinandMax Brunsfeld a53a022583 Make following more good
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-09-29 17:59:19 -06:00
Conrad IrwinandMax Brunsfeld 7cda6fa956 Show host in titlebar
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-09-29 16:37:00 -06:00
Max Brunsfeld 3590da0c16 Show current user as follower when following in unshared projects 2023-09-29 15:08:25 -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
Mikayla e0373b0bc6 Fix space and copy/paste when editing a channel 2023-09-25 11:31:02 -07:00
Max Brunsfeld bbbed668c8 Simplify titlebar facepile click rendering / mouse handling 2023-09-21 17:12:59 -07:00
Max Brunsfeld e23d0b8c80 Allow following into channel notes regardless of project 2023-09-21 17:12:59 -07:00
Max Brunsfeld e8bcd6d63e Add initial failing test for following to channel notes in an unshared project 2023-09-21 13:14:15 -07:00
MikaylaandMax 48a48d18d0 Fix bug in channel rendering
Fix drag and drop stale state bug revealed by the channel panel

co-authored-by: Max <max@zed.dev>
2023-09-20 16:40:29 -07:00
Max Brunsfeld 992a86aada Fix opening channel notes from context menu 2023-09-20 13:45:35 -07:00
Mikayla Maki 9376900ab1 Add UI/UX for moving channels (#2976)
TODO:

- [x] Add drag and drop
- [x] Polish up in-flight decisions.
- [x] Fix chat panel panic
- [x] Add nice hover effect highlighting the matching ones
- [x] Fix and test keyboard

Release Notes:

- N/A
2023-09-19 17:56:22 -07:00