Commit graph

40 commits

Author SHA1 Message Date
Kirill Bulatov
fd61683c46 WIP 2023-11-16 10:40:02 +02:00
Mikayla
9da0b78ead
Merge branch 'main' into tabs-n-splits 2023-11-15 23:41:25 -08:00
Mikayla
c70c0f9ae9
Remove initialize_workspace 2023-11-15 23:11:31 -08:00
Conrad Irwin
7f70712dac Uncomment enough to register the panel 2023-11-15 16:44:21 -07:00
Conrad Irwin
793fa6e3a4 Move placeholder titlebar render to collab_ui 2023-11-15 16:09:21 -07:00
Mikayla
3419aaf17e
Fix several shutdown related bugs 2023-11-14 11:42:58 -08:00
Mikayla
27574524b8
Restore quit action 2023-11-14 10:31:55 -08:00
Mikayla
caa0bae04f
Merge branch 'main' into core-actions 2023-11-14 10:11:39 -08:00
Max Brunsfeld
b893ac2a02 Merge branch 'main' into project-panel2 2023-11-14 09:33:48 -08:00
Mikayla
ee4957dd47
Implement most core actions 2023-11-14 00:06:33 -08:00
Mikayla
ec16e70336
Sketch in core zed actions code 2023-11-13 22:13:07 -08:00
Max Brunsfeld
b9e098ead8 Start work on creating gpui2 version of project panel 2023-11-09 16:51:03 -08:00
Mikayla
86630bbe59
Add extra clone 2023-11-08 22:16:08 -08: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
eb8a0e7148 Uncomment persistence tests 2023-11-03 12:38:09 +02:00
Antonio Scandurra
efa27cf9b8 Uncomment more editor code 2023-11-03 10:09:00 +01:00
Nathan Sobo
2a12e8f307 Merge remote-tracking branch 'origin/rich_text2' into editor2 2023-11-02 20:34:52 -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
Nathan Sobo
52e195b47c WIP 2023-11-02 07:46:49 -06:00
Antonio Scandurra
32dded551c Checkpoint 2023-11-02 11:05:24 +01:00
Mikayla
1c1b53ecf6
WIP 2023-11-01 11:45:31 -07:00
Kirill Bulatov
73c97d0c10 WIP
Uncomment more methods in workspace2.rs
2023-11-01 14:47:29 +02: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
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
Antonio Scandurra
1a54ac0d69 Rename Handle to Model 2023-10-30 19:44:01 +01:00
Antonio Scandurra
c8b5b085f4 WIP 2023-10-26 12:27:20 +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
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
b7d30fca2b WIP 2023-10-21 17:52:47 +02:00