 Marshall Bowers
|
31cfb83723
|
Merge branch 'main' into import-theme
|
2023-11-06 12:08:46 -05:00 |
|
|
Julia
|
97445f3fc3
|
zed2: Actually find downloaded binary in Elixir cached binary method
|
2023-11-06 11:31:31 -05:00 |
|
|
Marshall Bowers
|
f9701564ce
|
Merge branch 'main' into import-theme
|
2023-11-03 15:41:12 -04:00 |
|
|
Marshall Bowers
|
9b1559bada
|
Exclude source themes from Zed2 binary
|
2023-11-03 11:11:10 -04:00 |
|
|
Antonio Scandurra
|
305c7b29a2
|
Merge remote-tracking branch 'origin/main' into editor2
|
2023-11-03 14:47:49 +01:00 |
|
|
Kirill Bulatov
|
574176ae6d
|
Remove and add more todosmerge .
|
2023-11-03 13:22:11 +02:00 |
|
|
Kirill Bulatov
|
5b401b32e9
|
Move journal2 to workspace2
|
2023-11-03 12:55:06 +02:00 |
|
|
Kirill Bulatov
|
24a215e4fd
|
Uncomment persistence tests
|
2023-11-03 12:38:09 +02:00 |
|
|
Antonio Scandurra
|
2a74c3967f
|
Remove unused code
|
2023-11-03 10:11:13 +01:00 |
|
|
Antonio Scandurra
|
252bac2e2e
|
Uncomment more editor code
|
2023-11-03 10:09:00 +01:00 |
|
|
Antonio Scandurra
|
f2d987c0ee
|
Call editor::init
|
2023-11-03 09:06:25 +01:00 |
|
|
Nathan Sobo
|
63d08003aa
|
Merge remote-tracking branch 'origin/rich_text2' into editor2
|
2023-11-02 20:34:52 -06:00 |
|
|
Conrad Irwin
|
0fca49be33
|
WIP
|
2023-11-02 15:27:49 -06:00 |
|
|
Conrad IrwinandNathan
|
2e06b2586a
|
Fix error handling of open_path
Co-Authored-By: Nathan <nathan@zed.dev>
|
2023-11-02 14:34:43 -06:00 |
|
|
Marshall Bowers
|
5bb88445e5
|
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
|
13b85165d3
|
Disable selective warnings to make cargo check happy
|
2023-11-02 13:28:58 -06:00 |
|
|
Conrad Irwin
|
fdeff77625
|
Merge remote-tracking branch 'origin/main' into zed2-workspace
|
2023-11-02 13:16:24 -06:00 |
|
|
Mikayla
|
d8b8390702
|
Remove the 2s from source code
|
2023-11-02 10:55:02 -07:00 |
|
|
Conrad IrwinandAntonio
|
64ddd2696e
|
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
|
ed895ca952
|
WIP
|
2023-11-02 07:46:49 -06:00 |
|
|
Antonio Scandurra
|
89ba26eab3
|
Checkpoint
|
2023-11-02 11:05:24 +01:00 |
|
|
Nathan Sobo
|
8582cb05c8
|
WIP: Merge branch 'main' into zed2-workspace
|
2023-11-01 22:35:02 -06:00 |
|
|
Nathan Sobo
|
c5a361d12b
|
Merge remote-tracking branch 'origin/main' into gpui2-no-send
|
2023-11-01 21:10:31 -06:00 |
|
|
KCaverly
|
e4403876a2
|
port text2 to zed2
|
2023-11-01 16:13:53 -04:00 |
|
|
Nathan Sobo
|
8b342b1332
|
Split out a foreground and background executor
|
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
|
432f10621c
|
WIP
|
2023-11-01 11:45:31 -07:00 |
|
|
Kirill Bulatov
|
0bb1b28bd5
|
WIP
|
2023-11-01 15:37:51 +02:00 |
|
|
Kirill Bulatov
|
880f5f278b
|
WIP
Uncomment more methods in workspace2.rs
|
2023-11-01 14:47:29 +02:00 |
|
|
Nathan Sobo
|
3a939de217
|
WIP
|
2023-10-31 22:32:18 -06:00 |
|
|
Nathan Sobo
|
a8afca8ad8
|
Checkpoint
|
2023-10-31 11:16:08 -06:00 |
|
|
Nathan Sobo
|
80996e6b64
|
WIP
|
2023-10-31 11:03:01 -06:00 |
|
|
KCaverly
|
8dcbe21096
|
wip
|
2023-10-31 12:00:45 -04:00 |
|
|
KCaverly
|
db2190a3fc
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace
|
2023-10-31 11:39:34 -04:00 |
|
|
KCaverly
|
52a4261de9
|
wip
|
2023-10-31 11:32:56 -04:00 |
|
|
Antonio Scandurra
|
c50d9d1b4e
|
Merge branch 'zed2' into zed2-workspace
|
2023-10-31 10:20:03 +01:00 |
|
|
Julia
|
6e45e454ff
|
Port zed/src/languages to zed2
|
2023-10-30 21:52:29 -04:00 |
|
|
Mikayla
|
0244be8819
|
Merge branch 'zed2' into zed2-workspace
|
2023-10-30 16:53:21 -07:00 |
|
|
KCaverly
|
db45e39e18
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2-ai
|
2023-10-30 14:47:13 -04:00 |
|
|
Antonio Scandurra
|
3895aba120
|
Rename Handle to Model
|
2023-10-30 19:44:01 +01:00 |
|
|
KCaverly
|
84fffd7599
|
port ai crate to ai2, with all tests passing
|
2023-10-30 14:40:31 -04:00 |
|
|
Antonio Scandurra
|
4ec2b9a12c
|
Merge branch 'zed2' into zed2-workspace
|
2023-10-30 12:16:34 +01:00 |
|
|
Joseph T. Lyons
|
02a7548566
|
Port journal to GPUI2
|
2023-10-28 11:37:25 -04:00 |
|
|
Conrad Irwin
|
4553df4148
|
Port changes from #3118 to zed2
|
2023-10-27 13:27:55 +02:00 |
|
|
Joseph T. Lyons
|
315c1e6022
|
Revert "Add activity_indicator2"
This reverts commit 456c659c2a.
|
2023-10-26 17:13:40 +02:00 |
|
|
Joseph T. Lyons
|
456c659c2a
|
Add activity_indicator2
|
2023-10-26 16:49:39 +02:00 |
|
|
Antonio Scandurra
|
2c60471877
|
Make zed2 compile again
|
2023-10-26 15:45:30 +02:00 |
|
|
Antonio Scandurra
|
c5fb0e6c1f
|
Merge branch 'zed2' into zed2-workspace
|
2023-10-26 15:34:55 +02:00 |
|
|
Max BrunsfeldandJospeh
|
bcfa9b7b9c
|
Fix compile errors with lsp2
Co-authored-by: Jospeh <joseph@zed.dev>
|
2023-10-26 14:48:04 +02:00 |
|
|
Max Brunsfeld
|
e49b849e27
|
Merge branch 'zed2-hangs' into zed2
|
2023-10-26 12:48:35 +02:00 |
|