Commit Graph
475 Commits
Author SHA1 Message Date
Conrad IrwinandMax Brunsfeld 92bb9a5fdc Make following more good
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-09-29 17:59:19 -06:00
Conrad IrwinandMax Brunsfeld 1cfc2f0c07 Show host in titlebar
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-09-29 16:37:00 -06:00
Max Brunsfeld 7adaa2046d Show current user as follower when following in unshared projects 2023-09-29 15:08:25 -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
Mikayla 667fc25766 Fix space and copy/paste when editing a channel 2023-09-25 11:31:02 -07:00
Max Brunsfeld 7711530704 Simplify titlebar facepile click rendering / mouse handling 2023-09-21 17:12:59 -07:00
Max Brunsfeld 4ffa167256 Allow following into channel notes regardless of project 2023-09-21 17:12:59 -07:00
Max Brunsfeld ed8b022b51 Add initial failing test for following to channel notes in an unshared project 2023-09-21 13:14:15 -07:00
MikaylaandMax f2f507e619 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 3633f091c5 Fix opening channel notes from context menu 2023-09-20 13:45:35 -07:00
Mikayla Maki e37373a636 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
Mikayla ac65e7590c Add hover styles to channels matching the current selection
Fix chat desync from moving / linking channels
2023-09-19 17:50:02 -07:00
Mikayla d5f0ce0e20 Finish implementing drag and drop 2023-09-19 15:51:00 -07:00
Mikayla f3b91082a6 Improve drag and drop to look and feel better
WIP: Change rendering of drag and drop based on alt-modifier
2023-09-19 14:48:34 -07:00
Mikayla 9bff3b6916 Add basic drag and drop support 2023-09-19 11:20:01 -07:00
Mikayla dadad397ef Finish optimizing channel representations and operations 2023-09-18 20:24:37 -07:00
Mikayla 5f9c56c8b0 WIP: Send the channel name and the channel edges seperately, so we're not repeating them constantly
This commit is currently broken and includes debug data for a failed attempt at rewriting the insert_edge logic
2023-09-15 17:57:23 -07:00
Mikayla 52057c5619 Simplify path representation in collab panel
Optimize set representation in collab
2023-09-15 13:35:46 -07:00
Mikayla 5400605483 Fix merge conflicts 2023-09-15 12:30:26 -07:00
Nate Butler 0aff0c105d Add missing logo_96 icon, fix a few incorrect paths (#2977)
🙈 I missed a few

Thanks @maxbrunsfeld / @mikayla-maki
2023-09-15 14:57:40 -04:00
Mikayla f9fff3a7b2 fmt 2023-09-15 11:39:56 -07:00
Mikayla 16707d16f6 Improve context-menu behavior 2023-09-15 11:39:56 -07:00
Mikayla 9afb67f2cf Implement final move, link, unlink db APIs 2023-09-15 11:39:56 -07:00
Mikayla cda54b8b5f Improve database and RPC API for moving and linking channels, improve test legibility 2023-09-15 11:39:55 -07:00
Mikayla 439f627d9a Add move, link, and unlink operations 2023-09-15 11:36:58 -07:00
Mikayla 77cdbdb12a remove extraneous depth field 2023-09-15 11:28:36 -07:00
Mikayla 8222102d01 Render the DAG 2023-09-15 11:28:34 -07:00
Nate Butler 9a4ecf0f88 Add missing logo_96 icon, fix a few incorrect paths 2023-09-15 14:21:33 -04:00
Max Brunsfeld 3dba52340e Update paths to moved icons 2023-09-15 11:14:04 -07:00
Max Brunsfeld 6c3fd2a687 Merge branch 'main' into chat-again 2023-09-15 11:06:39 -07:00
Max Brunsfeld 099969ed79 Ensure the chat panel is fully feature flagged 2023-09-15 10:13:43 -07:00
Nate Butler 24974ee2fa Unify icons using multiple variants, remove all unused icons 2023-09-15 12:50:49 -04:00
Max Brunsfeld 6ce672fb32 Add tooltips and actions for opening notes+call from chat
No keyboard shortcut yet.
2023-09-14 18:38:37 -07:00
Max Brunsfeld b75971196f Add buttons for opening channel notes and joining call, in chat panel header 2023-09-14 18:05:44 -07:00
Max Brunsfeld dd7c687041 Style the chat panel further 2023-09-14 17:19:08 -07:00
Max Brunsfeld 59269d422b Allow deleting chat messages 2023-09-14 16:29:40 -07:00
Max Brunsfeld f53a1ee46d Put channel call participants back in channel row
Open both the channel notes and the channel chat when clicking a channel
2023-09-11 13:44:41 -07:00
Nathan Sobo fe6f0a253b Merge remote-tracking branch 'origin/main' into chat-again 2023-09-11 12:08:01 -06:00
Nathan Sobo e0fdc7d0aa Eliminate PaintContext 2023-09-11 09:00:59 -06:00
Nathan Sobo a24d94cfda Eliminate LayoutContext 2023-09-11 08:47:00 -06:00
Max Brunsfeld f5f85b3f76 Add missing notify when changing ChatPanel's channel 2023-09-08 17:29:16 -07:00
Max Brunsfeld c2121c25c1 Restructure collab panel to allow opening chat + notes w/ one click 2023-09-08 17:06:39 -07:00
Nathan Sobo ebf8b32811 Checkpoint 2023-09-08 16:25:10 -06:00
Max Brunsfeld ed7bc91dbd Create chat panel settings 2023-09-08 13:28:19 -07:00
Max Brunsfeld ddda5a559b Restore chat functionality with a very rough UI 2023-09-08 09:59:35 -07:00
Joseph T. Lyons a0701777d5 Make tooltip title case to match other tooltips 2023-09-08 12:44:49 -04:00
Antonio Scandurra 4e818fed4a Make channel notes act as an editor to enable inline assistant 2023-09-08 11:20:49 +02:00