Marshall Bowers
8cd112110e
Reconcile with upstream changes
2023-10-12 10:40:47 -04:00
Marshall Bowers
9581279919
Fix some merge errors
2023-10-12 10:27:50 -04:00
Marshall Bowers
002458f4c8
Merge branch 'gpui2' into gpui2-ui
2023-10-12 10:27:43 -04:00
Antonio Scandurra
564a8bdc19
Checkpoint
2023-10-12 14:58:31 +02:00
Antonio Scandurra
1f84cdb88c
Checkpoint
2023-10-12 14:49:06 +02:00
Antonio Scandurra
80c0a6ead3
Checkpoint
2023-10-12 13:25:49 +02:00
Antonio Scandurra
23f11fcd5e
Merge branch 'main' into gpui2
2023-10-12 10:55:17 +02:00
Nathan Sobo
3dad0d9811
Add group_active
2023-10-11 21:48:21 -06:00
Nathan Sobo
d920f7edc1
Add group hovers
2023-10-11 21:34:08 -06:00
Nathan Sobo
f37b83a0ea
WIP
2023-10-11 17:18:39 -06:00
Nate Butler
12573ed2e7
Refine project panel, list item
2023-10-11 19:15:27 -04:00
Conrad Irwin
be1800884e
Make collaboration warning more useful ( #3119 )
...
Release Notes:
- Fixed the titlebar upgrade UI to restart zed when an update is
available
2023-10-11 15:35:41 -06:00
Nathan Sobo
93c233b1cf
Checkpoint
2023-10-11 13:22:40 -06:00
Nathan Sobo
47b64a5074
Checkpoint
2023-10-11 12:51:56 -06:00
Joseph T. Lyons
d6fa06b3be
collab 0.24.0
2023-10-11 13:51:01 -04:00
Nathan Sobo
e2da2b232e
Checkpoint
2023-10-11 11:40:42 -06:00
Joseph T. Lyons
bdf1731db3
v0.109.x dev
2023-10-11 12:40:57 -04:00
Marshall Bowers
5477b87774
Hook up assistant panel
2023-10-11 12:38:06 -04:00
Marshall Bowers
7478e63ea0
Simplify state interactions
2023-10-11 12:32:05 -04:00
Marshall Bowers
922d1462a8
Merge branch 'gpui2-ui' of github.com:zed-industries/zed into gpui2-ui
2023-10-11 12:24:34 -04:00
Marshall Bowers
8f410d5e2e
Add support for switching between the project and collab panels
2023-10-11 12:24:33 -04:00
Nate Butler
0d8c743dfe
Refine project panel, list
2023-10-11 12:22:24 -04:00
Marshall Bowers
b6a9c58994
Push language selector handler down into StatusBar
2023-10-11 12:11:22 -04:00
Marshall Bowers
382693a199
Adjust icon color based on whether the various components are open
2023-10-11 12:09:08 -04:00
Marshall Bowers
acf2c2c6a5
Add ability to toggle the terminal
2023-10-11 12:01:17 -04:00
Antonio Scandurra
006f840570
Checkpoint
2023-10-11 17:53:29 +02:00
Conrad Irwin
2d6725a41a
Make collaboration warning more useful
2023-10-11 09:50:22 -06:00
Antonio Scandurra
457df8d3f3
Start and stop display link on the main thread
2023-10-11 16:38:54 +02:00
Antonio Scandurra
b6e4208ea8
Checkpoint
2023-10-11 15:08:28 +02:00
Antonio Scandurra
56fba5541a
Checkpoint
2023-10-11 14:19:04 +02:00
Antonio Scandurra
a69dbafe3c
Checkpoint
2023-10-11 12:47:19 +02:00
Antonio Scandurra
a9c69bf774
Checkpoint
2023-10-11 12:45:09 +02:00
Antonio Scandurra
b6a3d9ce59
Checkpoint
2023-10-11 11:03:08 +02:00
Antonio Scandurra
eebbc807e5
Checkpoint
2023-10-11 10:45:57 +02:00
Antonio Scandurra
0fb7364235
Checkpoint
2023-10-11 09:17:25 +02:00
Joseph T. Lyons
76191fe47d
Fix Discord text truncation
2023-10-11 01:54:32 -04:00
Nathan Sobo
f1cc62c21f
WIP
2023-10-10 22:49:47 -06:00
Nathan Sobo
f53b63eaf6
Checkpoint
2023-10-10 22:14:47 -06:00
Conrad Irwin
821997d372
Revert accidental build change
2023-10-10 19:59:57 -06:00
Conrad Irwin
85b76b1143
Don't wrap on paragraphs ( #3094 )
...
Release Notes:
- vim: `{` and `}` will no longer wrap around end of file
([#2116 ](https://github.com/zed-industries/community/issues/2116 )).
2023-10-10 19:25:40 -06:00
Conrad Irwin
9004254fbf
vim: Add shift-y ( #3117 )
...
Release Notes:
- vim: Add `Y` to copy line-wise (this copies vim's behaviour, which
differs from nvim's)
2023-10-10 19:25:32 -06:00
Conrad Irwin
1de9add304
vim: Add shift-y
2023-10-10 18:46:49 -06:00
Max Brunsfeld
7a39455af9
Fix inclusion of spurious views from other projects in FollowResponse ( #3116 )
...
A logic error in https://github.com/zed-industries/zed/pull/2993 caused
follow responses to sometimes contain extra views for other unshared
projects 😱 . These views would generally fail to deserialize on the
other end. This would create a broken intermediate state, where the
following relationship was registered on the server (and on the leader's
client), but the follower didn't have the state necessary for following
into certain views.
Release Notes:
- Fixed a bug where following would sometimes fail if the leader had
another unshared project open.
2023-10-10 15:53:11 -07:00
Max Brunsfeld
96d60eff23
Fix inclusion of spurious views from other projects in FollowResponse
2023-10-10 15:40:40 -07:00
Marshall Bowers
a69f93d214
Wire up toggling of project and chat panels
2023-10-10 18:35:20 -04:00
Marshall Bowers
8e1638b773
Add working toggle for LanguageSelector
2023-10-10 18:21:44 -04:00
Marshall Bowers
95ef61bc45
Thread click handler through from workspace to language selector
2023-10-10 18:02:08 -04:00
Marshall Bowers
c142676b20
Add click handlers to some of the buttons in the StatusBar
2023-10-10 17:26:53 -04:00
Marshall Bowers
be843227a1
Add on_click to IconButton
2023-10-10 17:26:33 -04:00
Marshall Bowers
48d9b49ada
Wire up click handlers on Buttons
2023-10-10 17:19:18 -04:00
Marshall Bowers