Joseph T. Lyons
263b79c047
Merge branch 'main' into feedback-2
2023-12-06 23:16:54 -05:00
Joseph T. Lyons
853da8eaa6
WIP
2023-12-06 23:15:04 -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
Marshall Bowers
acf39c2f89
Wire up inline assist quick action ( #3519 )
...
This PR wires up the inline assist quick action in the toolbar.
Release Notes:
- N/A
2023-12-06 15:52:51 -05:00
Max Brunsfeld
6658543f3c
Bring back channel notes ( #3506 )
2023-12-06 12:45:46 -08:00
Marshall Bowers
591fc7e3af
Wire up inline assist quick action
2023-12-06 15:44:50 -05:00
Max Brunsfeld
c247a87491
Fix propagation of active item to followers
...
Enable channel buffer integration tests.
2023-12-06 12:18:48 -08:00
Kirill Bulatov
eeba1715d8
Use distinct version for zed2, append git hash to its nightly version
2023-12-06 22:04:45 +02:00
Marshall Bowers
01b7e0b079
Fix layout for terminal tabs ( #3514 )
...
This PR fixes the layout for terminal tabs.
We need to use an `h_stack` here to get the icon and the label to
position themselves next to each other instead of one on top of the
other.
Release Notes:
- N/A
2023-12-06 14:28:31 -05:00
Marshall Bowers
ea5e5e61ef
Port assistant crate to Zed2 ( #3513 )
...
This PR contains the initial port of the `assistant` crate to Zed2.
Release Notes:
- N/A
2023-12-06 14:04:01 -05:00
Joseph T. Lyons
38e979221b
collab 0.30.0
2023-12-06 12:34:47 -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
Marshall Bowers
180e597117
v0.117.x dev
2023-12-06 12:03:59 -05:00
Piotr Osiewicz
aac14f5c41
Merge branch 'main' into copilot2
2023-12-06 15:13:13 +01:00
Piotr Osiewicz
633224ed26
Signed out state is looking good
2023-12-06 13:00:57 +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
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
Antonio Scandurra
6688546075
WIP
2023-12-05 16:49:36 +01:00
Antonio Scandurra and Julia Risley
e2f77c34f9
Port semantic_index to gpui2
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-12-05 15:38:36 +01:00
Piotr Osiewicz
f0dcdf9f07
Editor2 tests ( #3486 )
...
Release Notes:
- N/A
2023-12-05 14:52:20 +01: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
Marshall Bowers
886f309729
Merge branch 'main' into editor2_tests
2023-12-04 14:09:23 -05:00
Julia
adeb5a8f9f
zed2: Port outline view
2023-12-04 11:44:32 -05:00
Conrad Irwin
b74b17c4f5
In-flight entertainment ( #3484 )
...
- +language_selector2
- Language Selector 2 working!
- Prevent languages showing in wrong order first
- copilot_menu2 (though only tested offling, which is insufficient)
- Dismiss tooltips at capture
- Get ChannelModal opening
[[PR Description]]
Release Notes:
- N/A
2023-12-03 13:06:29 -07: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
Piotr Osiewicz
f1cca04fa6
Uncomment copilot2 tests
2023-12-01 22:04:43 +01:00
Max Brunsfeld
3ae0ceaed8
collab 0.29.1
2023-12-01 11:50:05 -08:00
Julia
46e8e35f4d
Merge branch 'main' into zed2-breadcrumbs
2023-12-01 11:02:34 -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
Max Brunsfeld
2cb5a395e2
Bump Tree-sitter for a crash fix
2023-11-30 11:36:36 -08:00
Julia
e320627bd9
Merge branch 'main' into zed2-breadcrumbs
2023-11-30 11:38:29 -05:00
Max Brunsfeld
189fe50f89
Implement activity indicator in zed2
2023-11-29 17:18:21 -08:00
Joseph T. Lyons
99ff94db62
v0.116.x dev
2023-11-29 11:08:32 -05:00
Mikayla
d6a5f8a3aa
Merge branch 'main' into welcome2
2023-11-28 15:38:51 -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
Mikayla
8436b634b3
Add uiua and nu languages
2023-11-27 18:46:56 -08:00
Max Brunsfeld
4dbfdfdf02
Upgrade Tree-sitter for stack-overflow bugfix
2023-11-27 13:16:50 -08:00
Julia and Max Brunsfeld
54a1ef9697
zed2: Mostly port breadcrumbs & improve StyledText api
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-11-27 16:09:31 -05:00
Piotr Osiewicz
e50b80fdce
Replace unrendered frame with a frame counter
...
Move facepile to the left hand side
2023-11-27 13:02:21 +01:00
Piotr Osiewicz
c8970851b6
WIP, frames are being sent to the other end
2023-11-24 17:31:47 +01:00
Joseph T. Lyons