Commit Graph
15149 Commits
Author SHA1 Message Date
Marshall Bowers 4b793f44ef Wire up hacky children for Panel 2023-10-04 11:22:33 -04:00
Marshall Bowers aae4f00a4b Render Panel 2023-10-04 10:58:23 -04:00
Marshall Bowers 366a4918c3 Fix icon paths 2023-10-04 10:52:39 -04:00
Antonio Scandurra bc1801fb03 Checkpoint 2023-10-04 16:42:28 +02:00
Marshall Bowers 25cd12cf33 Fix icon name 2023-10-04 10:41:21 -04:00
Marshall Bowers 90e22da930 Render workspace 2023-10-04 10:37:29 -04:00
Marshall Bowers e6c7e57711 Merge branch 'gpui2' into marshall/gpui2-playground 2023-10-04 10:33:40 -04:00
Antonio Scandurra d385bc9cce Allow tinting images grayscale 2023-10-04 15:27:51 +02:00
Antonio Scandurra 1816ab95a0 Checkpoint: start rendering images 2023-10-04 15:03:21 +02:00
Antonio Scandurra 5c750b6880 Checkpoint: emojis rendering 2023-10-04 12:41:21 +02:00
Antonio Scandurra cd1c137542 WIP 2023-10-04 11:53:20 +02:00
Antonio Scandurra 4cf2ba20c2 Checkpoint: render SVGs 2023-10-04 10:51:47 +02:00
Antonio Scandurra a1ee2db6d1 Use Courier for now, to avoid panicking 2023-10-04 08:48:05 +02:00
Mikayla db8096ccdc Fix most tests for new chat changes 2023-10-03 20:50:17 -07:00
Nathan Sobo 25a2554bdd Checkpoint 2023-10-03 21:23:32 -06: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
Nathan Sobo 1e0ff65337 Checkpoint 2023-10-03 20:19:59 -06:00
Nathan Sobo da211bef96 Checkpoint 2023-10-03 20:04:17 -06: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
Nathan Sobo 7f9e3bc787 Checkpoint 2023-10-03 17:58:11 -06:00
Nathan Sobo d995192dde Checkpoint: Get basic workspace rendering 2023-10-03 17:39:03 -06:00
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
KCaverly 933c21f3d3 add initial (non updating status) toast 2023-10-03 16:53:57 +03:00
KCaverly f40d3e82c0 add user prompt for permission to index the project, for context retrieval 2023-10-03 16:26:08 +03:00
Antonio Scandurra 08464ee26e Checkpoint 2023-10-03 15:23:49 +02:00