Commits
Fix prod compile error
64ee1bb7a5 • Nathan Sobo • Nov 2, 2023
Fix post-merge compile errors
2079cd641e • Nathan Sobo • Nov 2, 2023
Merge remote-tracking branch 'origin/main' into gpui2-no-send
db9ccd7f34 • Nathan Sobo • Nov 2, 2023
Get language2 tests passing by not blocking on a foreground task
57dfc50687 • Nathan Sobo • Nov 2, 2023
Get project2 tests green
53066df522 • Nathan Sobo • Nov 2, 2023
WIP - flush_fs_events
401ddc6f49 • Max Brunsfeld • Nov 2, 2023
Fix hangs in new dispatcher
6ee93125d0 • Max Brunsfeld • Nov 2, 2023
beautiful diff
90facc051a • Conrad Irwin • Nov 1, 2023
Use run_until_parked instead of blocked in tests
cd10ba9e06 • Conrad Irwin • Nov 1, 2023
Checkpoint
3f34a8e7ec • Nathan Sobo • Nov 1, 2023
Split out a foreground and background executor
11b6d9e33a • Nathan Sobo • Nov 1, 2023
wip
dd1a2a9e44 • Max Brunsfeld • Nov 1, 2023
Start removing the Send impl for App
57ffa8201e • Max Brunsfeld • Nov 1, 2023
And more unused imports
ea7fdef417 • Conrad Irwin • Nov 1, 2023
Remove two more hanging tests
a5d37d3510 • Conrad Irwin • Nov 1, 2023
More unused imports
cfe0ddc61a • Conrad Irwin • Nov 1, 2023
Comment out hanging project2 tests
c467fa955b • Max Brunsfeld • Nov 1, 2023
Merge branch 'main' into zed2-project-test
291d35f337 • Max Brunsfeld • Oct 31, 2023
Implement start/finish waiting for gpui2
8db6b78fdd • Conrad Irwin • Oct 31, 2023
Actually deliver test events to subscribers
0e9a82711c • Conrad Irwin • Oct 31, 2023
Fix block to allow for sync progress
81f8e81e48 • Conrad Irwin • Oct 31, 2023
Call flush_effects in test context update()
b8e007c6ec • Conrad Irwin • Oct 31, 2023
Fix entity map drop behavior
3e5379526e • Conrad Irwin • Oct 31, 2023
v1
adc426b668 • Conrad Irwin • Oct 26, 2023
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
452006560e • Marshall Bowers • Oct 26, 2023
ui2: Remove `ElementExt` trait
ed233d583f • Marshall Bowers • Oct 26, 2023
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
6784ccd9fe • Marshall Bowers • Oct 26, 2023
Rename `S` type to `V`
1887f3b594 • Marshall Bowers • Oct 26, 2023
Remove unused `state_type`
8a70ef3e8f • Marshall Bowers • Oct 26, 2023
ui2: Clean up `take`s
eb19071d84 • Marshall Bowers • Oct 26, 2023
ui2: Clean up `drain`s
7b4a895ab9 • Marshall Bowers • Oct 26, 2023
Merge branch 'gpui2-element-renderer' into zed2
d62c51a4b8 • Marshall Bowers • Oct 26, 2023
Fix compile errors with lsp2
6fe393db2a • Max Brunsfeld • Oct 26, 2023
Enable client tests
69e5ecc015 • Max Brunsfeld • Oct 26, 2023
zed2: Capture language server stderr during startup/init and log if failure (#3176)
0eafb8886d • Julia • Oct 26, 2023
Fix the formatting
27d2accb51 • Kirill Bulatov • Oct 26, 2023
Update mouse position during file drag and drop
0a04c5734b • Kirill Bulatov • Oct 26, 2023
Merge branch 'zed2-hangs' into zed2
a4b7e3c9f6 • Max Brunsfeld • Oct 26, 2023
Add `install_cli2`
06c22206af • Antonio Scandurra • Oct 26, 2023
Merge branch 'zed2-room' into zed2
6172cd9015 • Antonio Scandurra • Oct 26, 2023
Fix fs2 import on zed
693246ba26 • Conrad Irwin • Oct 26, 2023
Fix settings2 tests
b875be9689 • Conrad Irwin • Oct 26, 2023
Revert "Fix settings2 crate tests"
07b9ec29e6 • Conrad Irwin • Oct 26, 2023
Fix settings2 crate tests
6e9c779c51 • Conrad Irwin • Oct 26, 2023
Fix macro some more
6cf7d0b81c • Conrad Irwin • Oct 26, 2023
Fix small bugs in gpui2::test
6185c935a6 • Conrad Irwin • Oct 26, 2023
Use quit to end tests
5651ef7ca2 • Conrad Irwin • Oct 26, 2023
Clearer error on importing both gpui and gpui2
51aa0d6a94 • Conrad Irwin • Oct 26, 2023
Use `Display` instead of custom `to_string`
9c10152c89 • Marshall Bowers • Oct 26, 2023
Removed unused `ui2::color` module
28ef30f7a2 • Marshall Bowers • Oct 26, 2023
Fix errors in passing TestAppContext in async gpui2 tests
c5763cdb99 • Antonio Scandurra • Oct 25, 2023
Introduce a `gpui2::test` macro
43d230cb2d • Antonio Scandurra • Oct 25, 2023
Fix z-index targeting for drag and drop
7ec9cc08c7 • Marshall Bowers • Oct 25, 2023
Clean up some warnings
5355007719 • Marshall Bowers • Oct 25, 2023
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
b5eae86b67 • Marshall Bowers • Oct 25, 2023
Load themes from settings and rework `Settings` trait
e67048ee7b • Marshall Bowers • Oct 25, 2023
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
98e2490807 • Marshall Bowers • Oct 25, 2023
Make theme converter spit out valid Rust structs
a0fe859d87 • Marshall Bowers • Oct 25, 2023
Fix error
6f6495ccbf • Antonio Scandurra • Oct 25, 2023
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
08a4e53cfe • Marshall Bowers • Oct 25, 2023
theme2: Add Rosé Pine themes
c8a86c2dd1 • Marshall Bowers • Oct 25, 2023
theme2: Add Sandcastle theme
cee8175c19 • Marshall Bowers • Oct 25, 2023
Print out `Theme` structs in `theme_converter`
751df45263 • Marshall Bowers • Oct 25, 2023
Start work on theme converter
6b5947a1fa • Marshall Bowers • Oct 25, 2023
Rename `player` to `players`
437d147935 • Marshall Bowers • Oct 25, 2023
Remove reference to removed `ThemeColor`
0867175a4e • Marshall Bowers • Oct 25, 2023
Add note about fixing `dead_code` and `unused_variables` warnings in `ui2`
4fcbc91aca • Marshall Bowers • Oct 25, 2023
Remove `ThemeColor` in favor of `theme2::Theme`
e1032c5341 • Marshall Bowers • Oct 25, 2023
Rename `theme2` getter to `theme`
bb3f59252e • Marshall Bowers • Oct 25, 2023
Rename `theme` getter to `old_theme`
258496700f • Marshall Bowers • Oct 25, 2023
Reference `theme2` colors in `ThemeColor`
8043d0d8a9 • Marshall Bowers • Oct 25, 2023
Load `Theme` from `theme2` into the storybook
dd34bb273e • Marshall Bowers • Oct 25, 2023
Add OS file drop event handler
a01b507ef4 • Kirill Bulatov • Oct 24, 2023
Update `Cargo.lock`
5b04f965fa • Marshall Bowers • Oct 24, 2023
Fix compilation
77991ad865 • Kirill Bulatov • Oct 24, 2023
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
afad2fbfa2 • Marshall Bowers • Oct 24, 2023
Rename `cx.global_default_mut` to `cx.global_default`
d6bd000aa8 • Marshall Bowers • Oct 24, 2023
Finish up `ThemeRegistry` and remove `AnyAssetSource`
4ca7ddfc42 • Marshall Bowers • Oct 24, 2023
Merge branch 'zed2' into theme2
51c66f508b • Marshall Bowers • Oct 24, 2023
Checkpoint
4740d6ed61 • Marshall Bowers • Oct 24, 2023
WIP
09866ec3e9 • Marshall Bowers • Oct 24, 2023
Add `AnyAssetSource`
9f8aaa4cdb • Marshall Bowers • Oct 24, 2023
Checkpoint
191285a8f1 • Antonio Scandurra • Oct 24, 2023
Remove failed attempt at eliminating static bounds on entities
9f9137cf76 • Nathan Sobo • Oct 24, 2023
Lower the default state intensities
9f48cdac83 • Nate Butler • Oct 24, 2023
Merge branch 'n/elevation' into zed2
bfb37bbe94 • Nate Butler • Oct 24, 2023
Add missing bounds to `Themed`
8117e7933c • Marshall Bowers • Oct 24, 2023
Merge branch 'fewer-bounds' into zed2
2285a35016 • Nathan Sobo • Oct 24, 2023
Remove `set_` prefix for `List` setters
cf380a9f62 • Marshall Bowers • Oct 24, 2023
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
24e21a4c29 • Marshall Bowers • Oct 24, 2023
Merge branch 'gpui2' into zed2
bb35583998 • Marshall Bowers • Oct 24, 2023
Fix the branch compilation
4d5ca37edb • Kirill Bulatov • Oct 24, 2023
WIP
9a53da28bc • Antonio Scandurra • Oct 24, 2023
WIP
953857f8e3 • Antonio Scandurra • Oct 24, 2023
WIP
18eb4a7292 • Antonio Scandurra • Oct 24, 2023
WIP
4d621f355d • Antonio Scandurra • Oct 23, 2023
WIP
05cbceec24 • Antonio Scandurra • Oct 23, 2023
WIP
21d4546a86 • Antonio Scandurra • Oct 23, 2023
WIP
7832120a4c • Antonio Scandurra • Oct 23, 2023
WIP
efbf0c828d • Antonio Scandurra • Oct 23, 2023