Commit Graph
26 Commits
Author SHA1 Message Date
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
Max BrunsfeldandJospeh 6fe393db2a Fix compile errors with lsp2
Co-authored-by: Jospeh <joseph@zed.dev>
2023-10-26 14:48:04 +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
Kirill Bulatov 483ac9491a Start fixing room2 2023-10-26 11:27:12 +02:00
Marshall Bowers e67048ee7b Load themes from settings and rework Settings trait 2023-10-25 20:37:55 +02:00
Marshall Bowers 4ca7ddfc42 Finish up ThemeRegistry and remove AnyAssetSource 2023-10-24 17:47:41 +02:00
Marshall Bowers 5fb8321ee0 Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-24 17:00:11 +02:00
Marshall Bowers 9f8aaa4cdb Add AnyAssetSource 2023-10-24 16:59:01 +02:00
Antonio Scandurra 11953e613b Checkpoint 2023-10-24 16:15:20 +02:00
Antonio Scandurra 7832120a4c WIP 2023-10-23 16:38:34 +02:00
Antonio Scandurra efbf0c828d WIP 2023-10-23 16:38:34 +02:00
Antonio Scandurra a72434f67b WIP 2023-10-23 12:16:33 +02:00
Antonio Scandurra 56462ef793 Checkpoint 2023-10-23 10:59:29 +02:00
Antonio Scandurra 72435af170 Checkpoint 2023-10-22 18:34:45 +02:00
Antonio Scandurra ce75be91e1 Checkpoint 2023-10-22 18:25:24 +02:00
Nathan Sobo 909fbb9538 Checkpoint 2023-10-21 19:07:59 +02:00
Nathan Sobo 89f4718ea1 Checkpoint 2023-10-21 18:48:30 +02:00
Antonio Scandurra 2e2825ae98 WIP 2023-10-21 18:41:09 +02:00
Antonio Scandurra 3740c9d852 WIP 2023-10-21 18:33:08 +02:00
Antonio Scandurra 7bb99c9b9c WIP 2023-10-21 18:30:44 +02:00
Antonio Scandurra aa3fb28f81 WIP 2023-10-21 18:21:14 +02:00
Antonio Scandurra b7d30fca2b WIP 2023-10-21 17:52:47 +02:00