yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,481 Commits 5 Branches 0 Tags
5db6722eeef8158de0cd46ab4e30e4fd38bdab45
Commit Graph
12481 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mikayla Maki fb81b2278a 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 707f3ec403 collab 0.23.1 2023-10-04 15:12:17 -07:00
Max Brunsfeld e2fcc2a7f1 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 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
Max Brunsfeld 1967d3cddb Ensure chat messages are retrieved in order of id 2023-10-04 14:43:53 -07:00
Conrad Irwin b21014bc05 Fix panic in increment (#3084) 
Release Notes:

- Fixes a panic in vim when incrementing a non-number.
 2023-10-04 15:39:24 -06:00
Conrad Irwin 68ef59a6d0 save tweaks (#3031) 
- use SaveAll instead of Save
- TODO: fix where closing a multi-buffer gives a confusing save prompt
 2023-10-04 15:38:07 -06: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
Conrad Irwin b3ed440e5c Fix panic in increment 2023-10-04 15:13:01 -06:00
Mikayla be2d6dc1af Add image avatars to channel messages 2023-10-04 14:04:02 -07:00
Conrad Irwin 5d651fbdce Fix renaming (#3083) 
Release Notes:

- Fix bugs arising from saving an untitled buffer
 2023-10-04 14:50:31 -06:00
Conrad IrwinandMikayla Maki c125da4c8d Fix tracking newly saved buffers 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-10-04 14:44:21 -06:00
Joseph T. Lyons 0c4b4276f2 collab 0.23.0 2023-10-04 15:01:38 -04:00
Joseph T. Lyons ed781497fa v0.108.x dev 2023-10-04 15:00:53 -04:00
Mikayla Maki 2c7d15852e Show when a channel resource changes (#3074) 
This PR adds a mechanism for notifying the client when a channel note
has been edited or a message has been changed.

TODO: 
- [x] Fix infinite loop when opening the chat panel
- [x] Switch to client-side ack model of observation detection
- [x] Add client-side-only change detection (e.g. for when a channel
note is open locally but not focused)
- [x] Review implementation / query performance.
- [x] Fix lack of ACK on restart for channel buffers
- [x] remove channel note opening on click
- [x] Fix channel messages sent while chat channel is in the background
not showing the channel as changed.

Release Notes:

- N/A
 2023-10-04 11:57:33 -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
Mikaylaconradmax
 		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 f4dbf3dc0f Fix unit test 
co-authored-by: Conrad <conrad.irwin@gmail.com>
 2023-10-03 20:03:57 -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
Max BrunsfeldandMikayla a6eaeed919 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 aa03eecc7e 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 875688d54e Confirm on switching channels 2023-10-03 13:45:48 -06:00
MikaylaandMax 8052372c7c 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 08ad27ad97 Tooltips for contacts 2023-10-03 12:54:39 -06:00
MikaylaandMax dd375d1d4e Added db message and edit operation observation 
Co-authored-by: Max <max@zed.dev>
 2023-10-03 11:39:59 -07:00
Conrad Irwin a8175528fe Scroll so that collab panel is in good state for calls 2023-10-03 12:00:02 -06:00
Joseph T. Lyons 756a09a207 Update cpu and memory event code (#3081) 
Release Notes:

- N/A
 2023-10-03 13:36:35 -04:00
Conrad Irwin 4e25c43f3a Update collab ui to join channels again 2023-10-03 11:36:01 -06:00
Joseph T. LyonsandJulia ad54d17b32 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 ff90cd07a3 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 62710360eb move collapsed only matches outside item parent in embedding.scm 2023-10-03 11:56:45 +03: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 9d3b755448 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 b72c74227b Add/fix mouse interactions in current call sidebar 2023-10-02 19:38:45 -06:00
Mikayla 10496fabf5 Add message and operation ACK messages to protos 2023-10-02 17:10:03 -07:00
Joseph T. Lyons 12ee10d6e7 Add memory and cpu events (#3080) 
Release Notes:

- N/A
 2023-10-02 19:42:49 -04:00
Joseph T. LyonsandJulia 71b1bb2398 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 2305497209 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 2e8040aeda 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 90373d87a7 Avoid spurious notifies in chat channel select 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-10-02 15:57:59 -07:00
Conrad Irwin cbbbcdbf79 Refactor to remove toggle_follow 2023-10-02 16:51:02 -06:00