171 commits

Author	SHA1	Message	Date
Marshall Bowers	363d7c6634	Exclude source themes from Zed2 binary	2023-11-03 11:11:10 -04:00
Antonio Scandurra	097171b9b8	Merge remote-tracking branch 'origin/main' into editor2	2023-11-03 14:47:49 +01:00
Kirill Bulatov	1a0cd3e09b	Remove and add more todosmerge .	2023-11-03 13:22:11 +02:00
Kirill Bulatov	f1fc07de94	Move journal2 to workspace2	2023-11-03 12:55:06 +02:00
Kirill Bulatov	eb8a0e7148	Uncomment persistence tests	2023-11-03 12:38:09 +02:00
Antonio Scandurra	2fccde5ab6	Remove unused code	2023-11-03 10:11:13 +01:00
Antonio Scandurra	efa27cf9b8	Uncomment more editor code	2023-11-03 10:09:00 +01:00
Antonio Scandurra	cdc82d01f7	Call editor::init	2023-11-03 09:06:25 +01:00
Nathan Sobo	2a12e8f307	Merge remote-tracking branch 'origin/rich_text2' into editor2	2023-11-02 20:34:52 -06:00
Conrad Irwin	583c36e24b	WIP	2023-11-02 15:27:49 -06:00
Conrad Irwin	9e5275cc18	Fix error handling of open_path ... Co-Authored-By: Nathan <nathan@zed.dev>	2023-11-02 14:34:43 -06:00
Marshall Bowers	54969877a4	Make the Zed2 window movable (#3218) ... This PR makes the Zed2 window movable and fixes a crash related to a `todo!()` that wasn't necessary. Release Notes: - N/A	2023-11-02 16:17:31 -04:00
Conrad Irwin	8283909dfd	Disable selective warnings to make cargo check happy	2023-11-02 13:28:58 -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
Conrad Irwin	634aba89d2	Add back some window events for workspace ... Co-Authored-By: Antonio <me@as-cii.com>	2023-11-02 10:03:03 -06:00
Nathan Sobo	52e195b47c	WIP	2023-11-02 07:46:49 -06:00
Antonio Scandurra	32dded551c	Checkpoint	2023-11-02 11:05:24 +01:00
Nathan Sobo	3e7df82977	WIP: Merge branch 'main' into zed2-workspace	2023-11-01 22:35:02 -06:00
Nathan Sobo	db9ccd7f34	Merge remote-tracking branch 'origin/main' into gpui2-no-send	2023-11-01 21:10:31 -06:00
KCaverly	77dbb15aa3	port text2 to zed2	2023-11-01 16:13:53 -04: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
Mikayla	1c1b53ecf6	WIP	2023-11-01 11:45:31 -07:00
Kirill Bulatov	a9d7c86307	WIP	2023-11-01 15:37:51 +02:00
Kirill Bulatov	73c97d0c10	WIP ... Uncomment more methods in workspace2.rs	2023-11-01 14:47:29 +02:00
Nathan Sobo	d47ef6470b	WIP	2023-10-31 22:32:18 -06:00
Nathan Sobo	90601fe4fd	Checkpoint	2023-10-31 11:16:08 -06:00
Nathan Sobo	0a2fde8707	WIP	2023-10-31 11:03:01 -06:00
KCaverly	fed391fe6b	wip	2023-10-31 12:00:45 -04:00
KCaverly	551171a339	Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace	2023-10-31 11:39:34 -04:00
KCaverly	68a1c7ce4c	wip	2023-10-31 11:32:56 -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	d5077d9d0c	Merge branch 'zed2' of github.com:zed-industries/zed into zed2-ai	2023-10-30 14:47:13 -04:00
Antonio Scandurra	1a54ac0d69	Rename Handle to Model	2023-10-30 19:44:01 +01: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
Conrad Irwin	b4225ac82a	Port changes from #3118 to zed2	2023-10-27 13:27:55 +02: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	58e8012d8c	Make zed2 compile again	2023-10-26 15:45:30 +02:00
Antonio Scandurra	821fe0f5b5	Merge branch 'zed2' into zed2-workspace	2023-10-26 15:34:55 +02:00
Max Brunsfeld	6fe393db2a	Fix compile errors with lsp2 ... Co-authored-by: Jospeh <joseph@zed.dev>	2023-10-26 14:48:04 +02:00
Max Brunsfeld	a4b7e3c9f6	Merge branch 'zed2-hangs' into zed2	2023-10-26 12:48:35 +02:00
Conrad Irwin	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
Antonio Scandurra	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