oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,480 Commits 1 Branch 0 Tags
438dd42f7dfa408a7815ed2a50b44fb76e5ebddf
Commit Graph
9009 Commits
Author SHA1 Message Date
Max Brunsfeld 438dd42f7d Fix bugs in handling mutual following 
* Propagate all of leader's views to a new follower, even if those views
  were originally created by that follower.
* Propagate active view changes to followers, even if the active view is
  following that follower.
* Avoid redundant active view updates on the client.
 2023-10-05 13:28:46 -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
Mikayla Maki b0e56b7c54 107 channel touch ups (#3087) 
Release Notes:

- Add user avatars to channel chat messages
- Group messages by sender
- Fix visual bugs in new chat and note buttons
 2023-10-04 15:14:39 -07:00
Max Brunsfeld df2fa87e6b collab 0.23.1 2023-10-04 15:12:17 -07:00
Max Brunsfeld a27be35325 Ensure chat messages are retrieved in order of id (#3086) 
Also, remove logic for implicitly marking chat messages as observed when
they are fetched. I think this is unnecessary, because the client always
explicitly acknowledges messages when they are shown.

Release Notes:

- Fixed a bug where chat messages were shown out of order (preview only)
 2023-10-04 15:10:49 -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
Max Brunsfeld d09767a90b Ensure chat messages are retrieved in order of id 2023-10-04 14:43:53 -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
Conrad Irwin a4e77af571 Fix panic in increment 2023-10-04 15:13:01 -06:00
Mikayla 5074bccae4 Add image avatars to channel messages 2023-10-04 14:04:02 -07:00
Conrad IrwinandMikayla Maki ff1722d307 Fix tracking newly saved buffers 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-10-04 14:44:21 -06:00
Joseph T. Lyons 6cb674a0aa collab 0.23.0 2023-10-04 15:01:38 -04:00
Joseph T. Lyons 6db47478cf v0.108.x dev 2023-10-04 15:00:53 -04: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 3bc7024f8b Fix unit test 
co-authored-by: Conrad <conrad.irwin@gmail.com>
 2023-10-03 20:03:57 -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
Max BrunsfeldandMikayla af09861f5c Specify uuid crate in the root Cargo.toml 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-10-03 17:39:24 -07:00
Conrad Irwin 55d2b9b3c9 join channels (#3082) 
Release Notes:

- Clicking on a channel in the sidebar will now join the channel and
open the notes
- If you join a channel that already shared projects, you will join the
projects automatically and follow the host.
- Clicking on the current channel in the sidebar will re-open the notes.
- Chat can now be accessed from the right click menu of channels.


- (probably not worth mentioning) Various improvements to hover states
and tooltips in the collab ui; and if you click on a channel while in
another call, confirm before switching.
 2023-10-03 13:54:11 -06:00
Conrad Irwin 044fb9e2f5 Confirm on switching channels 2023-10-03 13:45:48 -06:00
MikaylaandMax 6007c8705c Upgrade SeaORM to latest version, also upgrade sqlite bindings, rustqlite, and remove SeaQuery 
co-authored-by: Max <max@zed.dev>
 2023-10-03 12:16:53 -07:00
Conrad Irwin d696b394c4 Tooltips for contacts 2023-10-03 12:54:39 -06:00
MikaylaandMax 32c4138758 Added db message and edit operation observation 
Co-authored-by: Max <max@zed.dev>
 2023-10-03 11:39:59 -07: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
Joseph T. LyonsandJulia b10255a6dd Update cpu and memory event code 
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-10-03 13:29:08 -04:00
Kyle Caverly cf5d89d13c Leverage embeddings query to collapse syntax nodes if not selected (#3067) 
Reverts zed-industries/zed#3049
 2023-10-03 12:02:47 +03:00
KCaverly 9f160537ef move collapsed only matches outside item parent in embedding.scm 2023-10-03 11:56:45 +03: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 d9813a5bec show host in titlebar (#3072) 
Release Notes:

- show host in the titlebar of shared projects
- clicking on faces in the titlebar will now always follow the person
(it used to toggle)
- clicking on someone in the channel panel will follow that person
- highlight the currently open project in the channel panel

- fixes a bug where sometimes following between workspaces would not
work
 2023-10-02 21:02:02 -06:00
Conrad Irwin d7867cd1e2 Add/fix mouse interactions in current call sidebar 2023-10-02 19:38:45 -06:00
Mikayla 32b4b4d24d Add message and operation ACK messages to protos 2023-10-02 17:10:03 -07:00
Joseph T. Lyons 7d32a717af Add memory and cpu events (#3080) 
Release Notes:

- N/A
 2023-10-02 19:42:49 -04:00
Joseph T. LyonsandJulia 892350fa2d Add memory and cpu events 
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-10-02 19:35:31 -04:00
Max BrunsfeldandMikayla 0db4b29452 Avoid N+1 query for channels with new messages 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-10-02 16:22:28 -07:00
Max BrunsfeldandMikayla d9d997b218 Avoid N+1 query for channels with notes changes 
Also, start work on new timing for recording observed notes edits.

Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-10-02 15:58:34 -07:00
Max BrunsfeldandMikayla 84c4db13fb Avoid spurious notifies in chat channel select 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-10-02 15:57:59 -07:00
Conrad Irwin 528fa5c57b Refactor to remove toggle_follow 2023-10-02 16:51:02 -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
Marshall BowersNate ButlerPiotr OsiewiczNate
 		9e1f7c4c18 Mainline GPUI2 UI work (#3079) 
This PR mainlines the current state of new GPUI2-based UI from the
`gpui2-ui` branch.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Co-authored-by: Nate <nate@zed.dev>
 2023-10-02 18:20:47 -04:00
Julia 3d68fcad0b Detach completion confirmation task when selecting with mouse 
Otherwise the spawn to resolve the additional edits never runs causing
autocomplete to never add imports automatically when clicking with the
mouse
 2023-10-02 13:18:49 -04:00
Conrad Irwin 7f44083a96 Remove unused function 2023-10-02 11:03:55 -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
Conrad Irwin 9dc292772a Add a screen for gpui tests 
Allows me to test notifications
 2023-10-02 09:53:30 -06:00