Commit Graph
46 Commits
Author SHA1 Message Date
Mikayla a614cc433c Merge branch 'main' into welcome 2023-11-27 18:55:23 -08:00
Conrad Irwin 36dcc9e0df [Zed2] Collab UI (#3403)
Release Notes:

- N/A
2023-11-27 12:40:59 -07:00
Piotr Osiewicz a1378d9a90 Add mute handling 2023-11-24 15:16:03 +01:00
Joseph T. Lyons cb0f2196c9 Add app close events 2023-11-23 21:14:59 -05:00
Joseph T. Lyons 3d0fe1fdae Remove unused import 2023-11-22 23:03:11 -05:00
Joseph T. Lyons 16c9f9729e Disable app close event 2023-11-22 23:01:31 -05:00
Joseph T. Lyons cc2fb1ce75 Remove dbg 2023-11-22 16:26:15 -05:00
Joseph T. Lyons e6b98f983c Revert "Convert telemetry into a model"
This reverts commit dccb75b43f.
2023-11-22 16:16:44 -05:00
Joseph T. LyonsandJulia dccb75b43f Convert telemetry into a model
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-11-22 16:16:10 -05:00
Joseph T. LyonsandMikayla 11e4035f48 WIP
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-11-21 22:32:07 -05:00
Mikayla a11500cd55 WIP 2023-11-21 12:40:00 -08:00
Joseph T. Lyons 8c8ff42d79 Add app events 2023-11-20 15:51:36 -05:00
Joseph T. Lyons 2c70da8784 Restore commented-out code 2023-11-19 22:00:01 -05:00
Joseph T. Lyons 4eb07e37ea Remoe dbg!()s 2023-11-19 21:55:19 -05:00
Joseph T. Lyons e000d61ca8 Add timestamp delta to telemetry events 2023-11-19 21:52:28 -05:00
Kirill Bulatov 6db4451b25 Create new Zed release channel: nightly 2023-11-17 12:13:32 +02:00
Mikayla 9e6bd21fe8 checkpoint 2023-11-08 23:16:04 -08:00
Mikayla 9fd7066ac1 Get workspace compiling with new event emitters 2023-11-08 19:29:00 -08:00
Nathan Sobo a2fac01ccf Register actions globally before main 2023-11-07 20:58:37 -07:00
3faa7ead19 Re-introduce a macro for defining actions for ease of use
Co-Authored-By: Piotr Osiewicz <piotr@zed.dev>
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-07 11:30:58 -05:00
Max BrunsfeldandMarshall eeaa7c7685 Add channel2 crate
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-03 10:41:41 -07:00
Conrad Irwin 5e2813d913 git -> git3
This is needed for the editor.
2023-11-02 19:18:01 -06:00
Mikayla d8b8390702 Remove the 2s from source code 2023-11-02 10:55:02 -07:00
Nathan Sobo 8b342b1332 Split out a foreground and background executor 2023-11-01 13:53:45 -06:00
Max Brunsfeld 1da07b7433 wip 2023-11-01 13:53:45 -06:00
455983d912 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 c9e77d2918 Add the entity trait and implement for models, views, subscriptions, and observations 2023-10-30 17:50:21 -07:00
Joseph T. Lyons f12c384d4c Port PR #3131 to zed2 2023-10-30 17:41:26 -04:00
2a8cdf3638 Rename other references from "handle" to "model"
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Mikayla <mikayla@zed.dev>
2023-10-30 19:54:32 +01:00
Antonio Scandurra 3895aba120 Rename Handle to Model 2023-10-30 19:44:01 +01:00
Antonio Scandurra 3135db57c8 WIP 2023-10-26 17:15:19 +02:00
83d4b6c2a0 Enable client tests
* implement Executor::advance_clock

Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by:  Kyle <kyle@zed.dev>
Co-authored-by:  Joseph <joseph@zed.dev>
2023-10-26 14:44:13 +02:00
41d2ad8205 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
Marshall Bowers a3a72b77cc Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-25 20:38:03 +02:00
Marshall Bowers b219cfad15 Load themes from settings and rework Settings trait 2023-10-25 20:37:55 +02:00
Antonio Scandurra de8fde7026 Stop depending on gpui in client2 and settings2 2023-10-25 18:47:03 +02:00
Marshall Bowers 29e72d4d10 Rename cx.global_default_mut to cx.global_default 2023-10-24 17:58:14 +02:00
Antonio Scandurra 23ffeb259d WIP 2023-10-23 16:38:34 +02:00
Antonio Scandurra 96f7b2233f Checkpoint 2023-10-22 18:25:24 +02:00
Antonio Scandurra 8b9a00e097 WIP 2023-10-22 16:53:59 +02:00
Antonio Scandurra 2948362b60 WIP 2023-10-22 16:49:14 +02:00
Antonio Scandurra b973234da7 WIP 2023-10-22 16:33:59 +02:00
Antonio Scandurra f121e83c1f WIP 2023-10-22 16:27:23 +02:00
Antonio Scandurra 7b0d053363 WIP 2023-10-22 13:15:29 +02:00
Antonio Scandurra b18b19a846 WIP 2023-10-22 12:21:28 +02:00
Nathan Sobo dc2b48010a Checkpoint 2023-10-21 19:07:59 +02:00