Commit Graph
27 Commits
Author SHA1 Message Date
a2a28af052 Add Modals
P.S. this is all completely different now

Co-Authored-By: Marshall <marshall@zed.dev>
Co-Authored-By: Julia <julia@zed.dev>
2023-11-07 09:18:34 -07:00
Conrad Irwin 583c36e24b WIP 2023-11-02 15:27:49 -06:00
Conrad IrwinandNathan 9e5275cc18 Fix error handling of open_path
Co-Authored-By: Nathan <nathan@zed.dev>
2023-11-02 14:34:43 -06:00
Conrad Irwin 269a72464d Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 13:16:24 -06:00
Mikayla d11ff14b57 Remove the 2s from source code 2023-11-02 10:55:02 -07:00
Nathan Sobo 3e7df82977 WIP: Merge branch 'main' into zed2-workspace 2023-11-01 22:35:02 -06:00
KCaverly 77dbb15aa3 port text2 to zed2 2023-11-01 16:13:53 -04:00
Antonio Scandurra 00c92ae407 Merge branch 'zed2' into zed2-workspace 2023-10-31 10:20:03 +01:00
Julia db34de6be4 Port zed/src/languages to zed2 2023-10-30 21:52:29 -04:00
Mikayla 3dadfb8ba8 Merge branch 'zed2' into zed2-workspace 2023-10-30 16:53:21 -07:00
KCaverly 04ab68502b port ai crate to ai2, with all tests passing 2023-10-30 14:40:31 -04:00
Antonio Scandurra bd750fbbe2 Merge branch 'zed2' into zed2-workspace 2023-10-30 12:16:34 +01:00
Joseph T. Lyons 6b65d76014 Port journal to GPUI2 2023-10-28 11:37:25 -04:00
Joseph T. Lyons 98d03f6e7a Revert "Add activity_indicator2"
This reverts commit 88a3a57789.
2023-10-26 17:13:40 +02:00
Joseph T. Lyons 88a3a57789 Add activity_indicator2 2023-10-26 16:49:39 +02:00
Antonio Scandurra 821fe0f5b5 Merge branch 'zed2' into zed2-workspace 2023-10-26 15:34:55 +02:00
Max Brunsfeld a4b7e3c9f6 Merge branch 'zed2-hangs' into zed2 2023-10-26 12:48:35 +02:00
065d26f5b2 Get RPC2 tests passing
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Kyle <kyle@zed.dev>
2023-10-26 12:47:37 +02:00
Antonio Scandurra c8b5b085f4 WIP 2023-10-26 12:27:20 +02:00
Antonio Scandurra 6172cd9015 Merge branch 'zed2-room' into zed2 2023-10-26 11:57:11 +02:00
3bcae6d7de Add call2
Co-Authored-By: Kirill Bulatov <kirill@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-10-26 11:56:34 +02:00
Conrad Irwin 693246ba26 Fix fs2 import on zed 2023-10-26 11:41:15 +02:00
Marshall Bowers e67048ee7b Load themes from settings and rework Settings trait 2023-10-25 20:37:55 +02:00
Antonio Scandurra a72434f67b WIP 2023-10-23 12:16:33 +02:00
Antonio Scandurra 72435af170 Checkpoint 2023-10-22 18:34:45 +02:00
Nathan Sobo 909fbb9538 Checkpoint 2023-10-21 19:07:59 +02:00
Antonio Scandurra b7d30fca2b WIP 2023-10-21 17:52:47 +02:00