Commit Graph
59 Commits
Author SHA1 Message Date
Piotr Osiewicz 54a3b56935 Merge remote-tracking branch 'origin/callback-handles' into search2 2023-11-21 00:40:20 +01:00
Max BrunsfeldandMikayla babd41916a Remove gpui (1) dependencies from zed2
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-11-20 10:46:16 -08:00
Piotr Osiewicz 07cc5904f8 Merge branch 'main' into search2 2023-11-20 18:37:41 +01:00
Mikayla ede7656f02 please work 2023-11-18 10:46:35 -08:00
Mikayla Maki e1285b9780 Add nightly release channel for zed2 (#3355)
Release Notes:

- N/A
2023-11-17 22:12:18 -08:00
Mikayla eb2e9a59b7 Fix bundling again 2023-11-17 18:27:11 -08:00
Mikayla 70d0421b3c Fix bundle script 2023-11-17 17:44:41 -08:00
Mikayla dd283b471a Add autoupdate2
co-authoredby: max@zed.dev
2023-11-17 15:48:32 -08:00
Julia 3655a96e54 Merge branch 'main' into unborked-git-zed2-diagnostics-view 2023-11-17 16:32:35 -05:00
Julia 967ef9d414 Render diagnostics view and such a bit more 2023-11-17 16:32:35 -05:00
Piotr Osiewicz dca2dc7b6b Merge branch 'main' into search2 2023-11-17 13:22:30 +01:00
Kirill Bulatov 6680e1e9fe Create new Zed release channel: nightly 2023-11-17 12:13:32 +02:00
Kirill Bulatov 89e44d4901 Remove binary target collisions between zed & zed2 2023-11-17 09:56:28 +02:00
Piotr Osiewicz 6b6a30c3da Merge branch 'main' into search2 2023-11-16 17:16:15 +01:00
Kirill BulatovandPiotr ab0a3f19ab Add an actual context menu into terminal-2
(click the text, not the pane!)

Co-Authored-By: Piotr <piotr@zed.dev>
2023-11-16 16:36:44 +02:00
Kirill Bulatov f638d4ce1d Add basic context menu element 2023-11-16 14:35:13 +02:00
Kirill Bulatov fd61683c46 WIP 2023-11-16 10:40:02 +02:00
Conrad Irwin 84bcbf1128 Add collab_ui2 2023-11-15 16:08:03 -07:00
Piotr Osiewicz b11bfa8821 Merge branch 'main' into search2 2023-11-15 12:54:26 +01:00
Conrad Irwin 80b7f75d24 Merge branch 'main' into file_finder 2023-11-14 13:34:25 -07:00
Mikayla caa0bae04f Merge branch 'main' into core-actions 2023-11-14 10:11:39 -08:00
Conrad Irwin 7d94d8940c Not working yet file-finder2 2023-11-14 09:28:18 -07:00
Mikayla ee4957dd47 Implement most core actions 2023-11-14 00:06:33 -08:00
Piotr Osiewicz dfd68d4cb8 WIP: start search2 2023-11-13 20:38:37 +01:00
Max Brunsfeld 1968becf94 Merge branch 'main' into project-panel2 2023-11-13 11:26:51 -08:00
Max Brunsfeld b9e098ead8 Start work on creating gpui2 version of project panel 2023-11-09 16:51:03 -08:00
Piotr Osiewicz d184e0d426 Start working on command_palette2 2023-11-09 17:54:05 +01:00
Mikayla Maki 8330fb5f10 port rope2 to zed2 (#3224)
port rope2 to zed2

Release Notes:

- NA
2023-11-08 20:19:05 -08:00
Conrad Irwin cbdd4aca89 Merge branch 'main' into go-to-line2 2023-11-08 14:46:52 -07:00
Mikayla 097efdebc5 WIP 2023-11-08 12:49:09 -08:00
Marshall Bowers acf37804eb Use a fork of ctor to silence warnings generated by macro (#3275)
This PR switches us over to a fork of `ctor` that contains the fixes
from https://github.com/mmastrac/rust-ctor/pull/295, backported to our
current version of `ctor` (v0.1.20).

Once 1) the `ctor` maintainer publishes a new version with that change
and 2) we're ready to upgrade to the latest version of `ctor` we can
switch back to the mainline version.

Release Notes:

- N/A
2023-11-08 15:05:19 -05:00
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
KCaverly a65c1776d8 port rope2 to zed2 2023-11-03 12:15:23 -04: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