Joseph T. Lyons
df84b9d94e
Remove remnants from conflict resolution ( #3528 )
...
Fixes a couple of things that slipped through when going through the
last merge conflict
Release Notes:
- N/A
2023-12-06 23:44:49 -05:00
Joseph T. Lyons
263b79c047
Merge branch 'main' into feedback-2
2023-12-06 23:16:54 -05:00
Marshall Bowers
d910bd55d4
Port recent_projects to Zed2 ( #3525 )
...
This PR ports the `recent_projects` crate to Zed2 (`recent_projects2`).
Absent from this PR is wiring up the "Recent Projects" item in the title
bar. We'll come back to that soon.
Release Notes:
- N/A
2023-12-06 18:41:50 -05:00
Max Brunsfeld
1be1e3b5b5
Upgrade async-compression dep
2023-12-06 14:29:09 -08:00
Joseph T. Lyons
a364c9ed70
WIP
2023-12-06 17:27:10 -05:00
Max Brunsfeld and Nathan
5392e6ca24
Enable buffer font size adjustment in zed2
...
Co-authored-by: Nathan <nathan@zed.dev >
2023-12-06 13:52:33 -08:00
Joseph T. Lyons
f9bc8c2511
temp
2023-12-06 16:15:44 -05:00
Kirill Bulatov
eeba1715d8
Use distinct version for zed2, append git hash to its nightly version
2023-12-06 22:04:45 +02:00
Joseph T. Lyons
c6e2d20500
WIP
2023-12-06 14:13:44 -05:00
Antonio Scandurra
c62305edea
Merge remote-tracking branch 'origin/main' into assistant-2
...
# Conflicts:
# crates/ui2/src/components/icon.rs
2023-12-06 18:18:58 +01:00
Antonio Scandurra
f5edae4353
Introduce app menus in zed2 ( #3511 )
...
Release Notes:
- N/A
2023-12-06 18:17:02 +01:00
Marshall Bowers and Antonio
7ef93fefdd
Fix toolbar not appearing for initial pane ( #3512 )
...
This PR fixes an issues where the toolbar would not appear for the
center pane when Zed2 initially loads.
We resolved this by adding a call to initialize the center pane when the
workspace is initialized
Due to changes in the way subscriptions work we can on longer observe an
event that is emitted in the same event cycle in which the subscription
is created.
Because of this we need to explicitly initialize the center pane, as it
won't get performed by the subscription.
Release Notes:
- N/A
---------
Co-authored-by: Antonio <antonio@zed.dev >
2023-12-06 11:54:59 -05:00
Antonio Scandurra
4411c839cd
Load assistant panel
2023-12-06 14:23:05 +01:00
Antonio Scandurra
c9300e2384
Merge remote-tracking branch 'origin/main' into assistant-2
2023-12-06 12:53:02 +01:00
Antonio Scandurra
2be86deeaf
Start wiring up assistant2
2023-12-06 12:51:25 +01:00
Nathan Sobo
ec8cd7dccb
Merge remote-tracking branch 'origin/main' into app-menus
2023-12-05 16:54:38 -07:00
Nathan Sobo and Marshall
76e6f84910
Merge main
...
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-05 16:47:13 -07:00
Nathan Sobo and Marshall
a209ea2cf9
Get app menus basically working
...
- Everything is still disabled when there is no active window.
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-05 16:37:01 -07:00
Joseph T. Lyons
be231c3efd
Implement feedback actions
...
CopySystemSpecsIntoClipboard
RequestFeature
FileBugReport
2023-12-05 15:48:41 -05:00
Marshall Bowers
1b17e89ef1
Format code
2023-12-05 14:17:22 -05:00
Marshall Bowers
106c479785
Merge branch 'main' into pane-toolbar-tabbar-ui
2023-12-05 14:15:18 -05:00
Joseph T. Lyons
5bf1b4404a
Merge branch 'main' into feedback-2
2023-12-05 12:49:48 -05:00
Piotr Osiewicz and Nate
508dd48a80
Port quick_action_bar to zed2
...
Co-authored-by: Nate <nate@zed.dev >
2023-12-05 17:33:35 +01:00
Kirill Bulatov
5242f8031e
Port to gpui2
2023-12-05 16:13:39 +02:00
Max Brunsfeld
63fa23813f
Enable more collab UI features ( #3496 )
...
* Current Call section of the collab panel
* Improve the collab titlebar
* Add basic UI for following
Following only partially works, but the UI for following is now in
place.
2023-12-04 18:01:11 -08:00
Max Brunsfeld
42aaec9d32
Revert "Decouple workspace from call ( #3380 )"
...
This reverts commit 2df0a46cbe2704b92d2e
2023-12-04 17:05:44 -08:00
Julia
a3ccc3cd65
Zed2 outline view ( #3490 )
...
Release Notes:
- N/A
2023-12-04 15:56:53 -05:00
Nate Butler
ff5abcb9aa
Add temp nightly icon
2023-12-04 12:48:21 -05:00
Julia
adeb5a8f9f
zed2: Port outline view
2023-12-04 11:44:32 -05:00
Julia
04ccadad7f
Disable instance handshake in dev builds
2023-12-04 09:16:04 -05:00
Conrad Irwin
3d93aa7421
copilot_menu2 (though only tested offling, which is insufficient)
2023-12-01 23:43:02 -07:00
Conrad Irwin
94e188da8f
Language Selector 2 working!
2023-12-01 21:23:20 -07:00
Conrad Irwin
89bbc801d0
+language_selector2
2023-12-01 21:23:20 -07:00
Nathan Sobo and Max
6f7fe43d6f
Bind CloseWindow and Open actions on workspace
...
Co-Authored-By: Max <max@zed.dev >
2023-12-01 16:17:48 -07:00
Julia
46e8e35f4d
Merge branch 'main' into zed2-breadcrumbs
2023-12-01 11:02:34 -05:00
Conrad Irwin
f5df100bff
Show cursor position in status bar ( #3464 )
...
Passes the compiler so it must work!
(though it doesn't show up until we fix pane focus)
Release Notes:
- N/A
2023-11-30 16:40:42 -07:00
8580f27eed
Get feedback2 compiling
...
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com >
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com >
2023-11-30 16:07:54 -05:00
b7b137759f
init feedback2
...
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com >
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com >
2023-11-30 15:23:42 -05:00
Mikayla Maki
f825f085d2
Update main.rs
2023-11-30 10:06:08 -08:00
Conrad Irwin
6da5ae12a0
Show cursor position in status bar
2023-11-30 10:16:24 -07:00
Julia
e320627bd9
Merge branch 'main' into zed2-breadcrumbs
2023-11-30 11:38:29 -05:00
Kirill Bulatov
b0c1c5c98e
Port to gpui2
2023-11-30 13:07:47 +02:00
Kirill Bulatov
cc6109383d
Fix eslint diagnostics by passing worktree root during workspace init
2023-11-30 11:38:16 +02:00
Max Brunsfeld
189fe50f89
Implement activity indicator in zed2
2023-11-29 17:18:21 -08:00
Mikayla
d6a5f8a3aa
Merge branch 'main' into welcome2
2023-11-28 15:38:51 -08:00
Mikayla
330de46cf4
Restore welcome page and several pickers
2023-11-28 15:25:28 -08:00
Mikayla
4f97c7c98c
Implement all but the UI
2023-11-28 15:18:19 -08:00
Conrad Irwin
77cf299566
Merge branch 'main' into collab-panel2
2023-11-28 11:40:58 -07:00
Conrad Irwin
7260a5ef7e
Show channels and users in the sidebar
2023-11-27 19:57:55 -07:00
Mikayla
a614cc433c
Merge branch 'main' into welcome
2023-11-27 18:55:23 -08:00
Joseph T. Lyons