oak-team/oak-gpui
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,765 Commits 1 Branch 0 Tags
95ef61bc45efbcbfed13a040ec8da75d5c6f398e
Commit Graph
511 Commits
Author SHA1 Message Date
Mikayla c4870e1b6b re-unify markdown parsing between hover_popover and chat 2023-10-05 14:22:41 -07:00
Mikayla f57d563578 Improve chat rendering 2023-10-05 11:58:41 -07:00
Mikayla 44ada52185 Fix bug where chat text wouldn't wrap to width 2023-10-05 11:06:29 -07:00
Mikayla d298afba01 Create markdown text element and add to channel chat 2023-10-04 17:47:30 -07:00
Mikayla Maki acffc7e7f0 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 2f3c3d510f 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 73e78a2257 Adjust channel rendering to group related messages 2023-10-04 14:29:08 -07:00
Conrad Irwin f7cd0e84f9 Remove old code from notes icon click handler 2023-10-04 15:18:26 -06:00
Mikayla 5074bccae4 Add image avatars to channel messages 2023-10-04 14:04:02 -07:00
Mikaylaandmax 4d61d01943 Add an RPC handler for channel buffer acks 
co-authored-by: max <max@zed.dev>
 2023-10-04 11:47:13 -07:00
Mikaylaconradmax
 		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 e548572f12 Fix channel messages test 2023-10-04 10:13:02 -07:00
Mikayla db8096ccdc Fix most tests for new chat changes 2023-10-03 20:50:17 -07:00
Mikaylaandconrad 4ff80a7074 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 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
Max Brunsfeld 95342c8c33 Merge branch 'main' into channel-changes 2023-10-03 17:52:28 -07:00
Max BrunsfeldandMikayla 61e0289014 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 044fb9e2f5 Confirm on switching channels 2023-10-03 13:45:48 -06:00
Conrad Irwin d696b394c4 Tooltips for contacts 2023-10-03 12:54:39 -06:00
Conrad Irwin d8bfe77a3b Scroll so that collab panel is in good state for calls 2023-10-03 12:00:02 -06:00
Conrad Irwin 66dfa47c66 Update collab ui to join channels again 2023-10-03 11:36:01 -06: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 d7867cd1e2 Add/fix mouse interactions in current call sidebar 2023-10-02 19:38:45 -06:00
Conrad Irwin 27d784b23e 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 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
Mikayla 1d5b665f13 Implement channel changes for messages 2023-10-01 22:32:11 -07:00
Mikayla e0ff7ba180 Add channel note indicator and clear changed status 2023-10-01 22:32:10 -07:00
Mikayla 9ba975d6ad Channel notifications from the server works 2023-10-01 22:30:21 -07:00
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
Max BrunsfeldConradAntonio
 		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