Commit Graph
12765 Commits
Author SHA1 Message Date
Nathan Sobo c57e19c8fa Checkpoint: Glyphs rendering how I'd like 2023-10-03 17:29:36 -06:00
Nathan Sobo 550d9a9f71 Checkpoint 2023-10-03 16:17:25 -06:00
Nathan Sobo 4208ac2958 WIP 2023-10-03 15:17:45 -06:00
Nathan Sobo 45429b5400 WIP 2023-10-03 14:25:29 -06:00
Nathan Sobo d3916b84c9 Checkpoint 2023-10-03 13:55:53 -06: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
Nathan Sobo 3b27d41c72 Checkpoint 2023-10-03 13:52:10 -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
Nathan Sobo a8c1958c75 Checkpoint 2023-10-03 13:03:29 -06: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
Joseph T. Lyons 8b0969b698 Update cpu and memory event code (#3081)
Release Notes:

- N/A
2023-10-03 13:36:35 -04: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
Nathan Sobo 3698e89b88 Checkpoint 2023-10-03 11:16:42 -06:00
Antonio Scandurra bfa211fb02 Checkpoint 2023-10-03 18:04:45 +02:00
Antonio Scandurra dc40ac854a WIP 2023-10-03 17:53:44 +02:00
Antonio Scandurra 2b6d041cb6 Checkpoint 2023-10-03 17:36:12 +02:00
Antonio Scandurra 8a58733d91 Checkpoint 2023-10-03 16:53:49 +02:00
Antonio Scandurra e49b411205 Checkpoint 2023-10-03 16:30:41 +02:00
Antonio Scandurra 08464ee26e Checkpoint 2023-10-03 15:23:49 +02:00
Antonio Scandurra 12ba10bc2c Checkpoint 2023-10-03 14:48:08 +02:00
Nathan Sobo dcaf4c905f Checkpoint 2023-10-03 05:57:15 -06:00
Nathan Sobo 6046ed4f5c Checkpoint 2023-10-03 05:51:59 -06: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
Marshall Bowers 30afc8b1d2 WIP: Panel 2023-10-02 20:16:55 -04: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
Marshall Bowers 74ac6eb8a3 Begin building out new ui crate in storybook2 2023-10-02 18:59:44 -04: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
Marshall Bowers 9a9a35bf40 Move Sized bound up onto StyleHelpers 2023-10-02 18:46:25 -04:00
Marshall Bowers d14dc35efe Merge branch 'gpui2' into marshall/gpui2-playground 2023-10-02 18:36:22 -04: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
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
Marshall Bowers 77e67c19fe Fix deadlock when obtaining the font ID 2023-10-02 16:10:41 -04:00
Nathan Sobo 91582257fb WIP 2023-10-02 14:02:28 -06:00
Nathan Sobo 66ef5549e9 Checkpoint 2023-10-02 13:34:07 -06:00
Nathan Sobo 79e1e1a747 Checkpoint 2023-10-02 13:16:10 -06:00
Nathan Sobo 0b13c0a437 Checkpoint 2023-10-02 12:47:45 -06:00
Julia 08361eb84e Detach completion confirmation task when selecting with mouse (#3078)
Otherwise the spawn to resolve the additional edits never runs causing
autocomplete to never add imports automatically when clicking with the
mouse

Release Notes:

- Fixed auto-complete additional edits, such as auto-import, not
applying when selecting a completion with a mouse click.
2023-10-02 13:32:06 -04:00