Commits

Merge remote-tracking branch 'origin/main' into zed2-workspace

269a72464d • Conrad Irwin • Nov 2, 2023

Remove commented-out label code

9c8220d04e • Marshall Bowers • Nov 2, 2023

Render active item in pane

3605afc163 • Marshall Bowers • Nov 2, 2023

Checkpoint: Basic tab bar structure

8b1b7a2f80 • Marshall Bowers • Nov 2, 2023

WIP

5a41eed120 • Conrad Irwin • Nov 2, 2023

Render status bar

8f0f5a9ba1 • Conrad Irwin • Nov 2, 2023

Add double click to zoom the window

803d2b6710 • Conrad Irwin • Nov 2, 2023

Render titlebar

bd54bfa4e1 • Conrad Irwin • Nov 2, 2023

Add back some window events for workspace

634aba89d2 • Conrad Irwin • Nov 2, 2023

Merge remote-tracking branch 'origin/main' into zed2-workspace

0bab1a92df • Conrad Irwin • Nov 2, 2023

WIP

52e195b47c • Nathan Sobo • Nov 2, 2023

WIP

d4e199cab1 • Antonio Scandurra • Nov 2, 2023

Implement WindowContext::remove_window

c1ca7ad41d • Antonio Scandurra • Nov 2, 2023

Implement AppState::test

089bf58934 • Antonio Scandurra • Nov 2, 2023

Checkpoint

32dded551c • Antonio Scandurra • Nov 2, 2023

Merge remote-tracking branch 'origin/main' into zed2-workspace

72156bf502 • Antonio Scandurra • Nov 2, 2023

WIP

51338d785c • Antonio Scandurra • Nov 2, 2023

Merge remote-tracking branch 'origin/main' into zed2-workspace

bda43ca1fe • Antonio Scandurra • Nov 2, 2023

Remove more Send bounds and remove `EraseViewState`

2fb4c04fc3 • Antonio Scandurra • Nov 2, 2023

Remove some stray Send bounds

b2c7ddc41f • Antonio Scandurra • Nov 2, 2023

Simplify contexts

18fcb41292 • Antonio Scandurra • Nov 2, 2023

Fix outstanding errors in gpui2

ff27700913 • Antonio Scandurra • Nov 2, 2023

WIP: Merge branch 'main' into zed2-workspace

3e7df82977 • Nathan Sobo • Nov 2, 2023

Finish main merge

6f38eb3252 • Mikayla • Nov 1, 2023

Merge branch 'main' into zed2-workspace

e82d8eb5b8 • Mikayla • Nov 1, 2023

WIP

1c1b53ecf6 • Mikayla • Nov 1, 2023

WIP

337a79e35f • Antonio Scandurra • Nov 1, 2023

WIP

c3a8bab4d2 • Antonio Scandurra • Nov 1, 2023

WIP

147db607c7 • Antonio Scandurra • Nov 1, 2023

WIP

e8857d959b • Kirill Bulatov • Nov 1, 2023

WIP

a9d7c86307 • Kirill Bulatov • Nov 1, 2023

WIP

73c97d0c10 • Kirill Bulatov • Nov 1, 2023

WIP

4d320f065e • Antonio Scandurra • Nov 1, 2023

WIP

d47ef6470b • Nathan Sobo • Nov 1, 2023

Remove one todo from the critical path

4da8ee1e1d • Nathan Sobo • Nov 1, 2023

WIP

0ecf6bde73 • Nathan Sobo • Oct 31, 2023

Remove Reference

fd15551d97 • Nathan Sobo • Oct 31, 2023

Checkpoint

8f1000ea10 • Nathan Sobo • Oct 31, 2023

Checkpoint

9798d65cf9 • Nathan Sobo • Oct 31, 2023

Checkpoint

90601fe4fd • Nathan Sobo • Oct 31, 2023

WIP

0a2fde8707 • Nathan Sobo • Oct 31, 2023

wip

fed391fe6b • KCaverly • Oct 31, 2023

Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace

551171a339 • KCaverly • Oct 31, 2023

wip

68a1c7ce4c • KCaverly • Oct 31, 2023

workspace2 is compiling

5550e80c4e • KCaverly • Oct 31, 2023

small window change

e315e1bb6c • KCaverly • Oct 31, 2023

wip progress

663e8aed8a • KCaverly • Oct 31, 2023

wip

eb4ac2c276 • KCaverly • Oct 31, 2023

wip

efce38fce2 • KCaverly • Oct 31, 2023

dock compiling with todos outstanding

8d0905e479 • KCaverly • Oct 31, 2023

WIP

bbe2dd1f8f • Antonio Scandurra • Oct 31, 2023

WIP: Make the item module compile again

14a6199b4b • Antonio Scandurra • Oct 31, 2023

Allow WeakView<T> to be hashed and compared

e8eea52d0f • Antonio Scandurra • Oct 31, 2023

Allow View<T> to be hashed and compared

46a99c5c41 • Antonio Scandurra • Oct 31, 2023

Introduce {Window,View}Context::defer

163fa3ff16 • Antonio Scandurra • Oct 31, 2023

WIP

538a9e1392 • Antonio Scandurra • Oct 31, 2023

Merge branch 'zed2' into zed2-workspace

00c92ae407 • Antonio Scandurra • Oct 31, 2023

Merge branch 'zed2' into zed2-workspace

3dadfb8ba8 • Mikayla • Oct 30, 2023

WIP

9688937468 • Antonio Scandurra • Oct 30, 2023

WIP

b9ce186d21 • Antonio Scandurra • Oct 30, 2023

WIP

89bcbe3eeb • Antonio Scandurra • Oct 30, 2023

WIP

d4d9fcc88c • Antonio Scandurra • Oct 30, 2023

Implement `activate_workspace_for_project`

e2ee9a28bf • Antonio Scandurra • Oct 30, 2023

Merge branch 'zed2' into zed2-workspace

bd750fbbe2 • Antonio Scandurra • Oct 30, 2023

Merge branch 'zed2' into zed2-workspace

821fe0f5b5 • Antonio Scandurra • Oct 26, 2023

Add spawn facilities to `AsyncWindowContext`

9ea79259d5 • Antonio Scandurra • Oct 26, 2023

Make `activate_workspace_for_project` compile

d9274416b4 • Antonio Scandurra • Oct 26, 2023

WIP

c8b5b085f4 • Antonio Scandurra • 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