21 Commits

Author	SHA1	Message	Date
Mikayla	13255ef133	Poke at getting the project panel showing up	2023-11-12 23:22:02 -08:00
Mikayla	9b30f490c7	Merge branch 'main' into add-collab-tests	2023-11-08 09:57:08 -08:00
Nathan Sobo	1949fa5147	Merge remote-tracking branch 'origin/main' into register-actions	2023-11-07 21:56:08 -07:00
Nathan Sobo	814e62050c	Register actions globally before main	2023-11-07 20:58:37 -07:00
Conrad Irwin	0233864e92	Fix loading keyfiles	2023-11-07 12:04:37 -07:00
Antonio Scandurra	82a018996b	WIP	2023-11-07 17:54:14 +01:00
Mikayla	75a80811b3	WIP	2023-11-06 11:18:56 -08:00
Mikayla	d11ff14b57	Remove the 2s from source code	2023-11-02 10:55:02 -07:00
Nathan Sobo	11b6d9e33a	Split out a foreground and background executor	2023-11-01 13:53:45 -06:00
Max Brunsfeld	57ffa8201e	Start removing the Send impl for App ... Co-authored-by: Antonio <antonio@zed.dev> Co-authored-by: Nathan <nathan@zed.dev>	2023-11-01 13:53:45 -06:00
Julia	db34de6be4	Port zed/src/languages to zed2	2023-10-30 21:52:29 -04:00
Conrad Irwin	b875be9689	Fix settings2 tests	2023-10-26 11:39:32 +02:00
Conrad Irwin	07b9ec29e6	Revert "Fix settings2 crate tests" ... This reverts commit 6e9c779c51.	2023-10-26 11:33:58 +02:00
Conrad Irwin	6e9c779c51	Fix settings2 crate tests	2023-10-26 11:27:23 +02:00
Marshall Bowers	b5eae86b67	Merge branch 'zed2' of github.com:zed-industries/zed into zed2	2023-10-25 20:38:03 +02:00
Marshall Bowers	e67048ee7b	Load themes from settings and rework Settings trait	2023-10-25 20:37:55 +02:00
Antonio Scandurra	9986e526e5	Stop depending on gpui in client2 and settings2	2023-10-25 18:47:03 +02:00
Marshall Bowers	d6bd000aa8	Rename cx.global_default_mut to cx.global_default	2023-10-24 17:58:14 +02:00
Antonio Scandurra	ce75be91e1	Checkpoint	2023-10-22 18:25:24 +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