Marshall Bowers
aa41f97e38
Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2
2023-10-18 10:58:54 -04:00
Marshall Bowers
2b53c67789
Use SharedString for Labels
2023-10-18 10:58:50 -04:00
Antonio Scandurra
731ce1721a
Checkpoint
2023-10-18 16:55:55 +02:00
Marshall Bowers
8321b9430e
Wire up hover styles on Buttons
2023-10-18 10:53:42 -04:00
Marshall Bowers
7f69350e4d
Fix typo in doc comment
2023-10-18 10:45:20 -04:00
Marshall Bowers
1a156c1060
Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2
2023-10-18 10:44:43 -04:00
Antonio Scandurra
7149f99f02
Checkpoint
2023-10-18 16:43:20 +02:00
Marshall Bowers
5491398a64
Merge branch 'gpui2' into gpui2-ui
2023-10-18 10:43:15 -04:00
KCaverly
4b8771f3e2
Merge branch 'main' of github.com:zed-industries/zed into prompt_template
2023-10-18 10:42:16 -04:00
Kyle Caverly
fea6d70d4d
return code inside a markdown block during inline assist ( #3137 )
...
Reverted prior small change in inline prompting.
We should now only return code in a markdown block during inline
assists.
2023-10-18 10:40:53 -04:00
Antonio Scandurra
0e4bd485e0
Checkpoint
2023-10-18 16:36:48 +02:00
KCaverly
ed8a2c8793
revert change to return only the text and inside return all text inside markdown blocks
2023-10-18 10:35:11 -04:00
Antonio Scandurra
fecb27232e
Checkpoint
2023-10-18 16:30:48 +02:00
Antonio Scandurra
f58a9bad42
Checkpoint
2023-10-18 16:30:03 +02:00
Antonio Scandurra
f4d50c4dca
Checkpoint
2023-10-18 16:27:58 +02:00
Antonio Scandurra
036e266bae
Checkpoint
2023-10-18 16:21:52 +02:00
Antonio Scandurra
d98c347902
Checkpoint
2023-10-18 16:13:36 +02:00
Antonio Scandurra
1270bcc6ed
Checkpoint
2023-10-18 16:10:58 +02:00
Antonio Scandurra
8914b94577
Checkpoint
2023-10-18 15:46:17 +02:00
Antonio Scandurra
acca8ea786
Checkpoint
2023-10-18 15:24:35 +02:00
Antonio Scandurra
eaef1c8b8e
Checkpoint
2023-10-18 15:17:22 +02:00
Antonio Scandurra
0dfe70125b
Checkpoint
2023-10-18 14:41:46 +02:00
Antonio Scandurra
5afd83c883
Checkpoint
2023-10-18 14:36:16 +02:00
Mikayla
0ce1ec5d15
Restrict DAG-related functionality, but retain infrastructure for implementing symlinks
2023-10-18 05:28:05 -07:00
Antonio Scandurra
a61b34cab5
Checkpoint
2023-10-18 14:12:50 +02:00
Antonio Scandurra
ad1b96720a
Checkpoint
2023-10-18 13:36:26 +02:00
Antonio Scandurra
296a2b8e5d
Rename fill to bg
2023-10-18 09:39:23 +02:00
Antonio Scandurra
597a9f9548
Use text color to paint SVGs
2023-10-18 09:39:20 +02:00
Antonio Scandurra
e031718747
Checkpoint
2023-10-18 09:22:49 +02:00
Antonio Scandurra
6452ff203e
Checkpoint
2023-10-18 09:15:44 +02:00
Conrad Irwin
70aed4a605
Sync Role as part of channels
...
Begin to fix guest notifications
2023-10-17 22:48:44 -06:00
Max Brunsfeld
821419ee5b
Add a unit test for the mention-searching logic in MessageEditor
2023-10-17 20:15:49 -07:00
Conrad Irwin
72ed8a6dd2
Allow guests to chat
2023-10-17 19:03:02 -06:00
Max Brunsfeld
ee87ac2f9b
Start work on chat mentions
2023-10-17 17:59:42 -07:00
Max Brunsfeld
660021f5e5
Fix more issues with the channels panel
...
* Put the newest notifications at the top
* Have at most 1 notification toast, which is non-interactive,
but focuses the notification panel on click, and auto-dismisses
on a timer.
2023-10-17 15:43:06 -07:00
Conrad Irwin
783f05172b
Make sure guests join as guests
2023-10-17 15:40:23 -06:00
Marshall Bowers
79e0509bf9
Begin documenting flex styles
2023-10-17 17:32:30 -04:00
KCaverly
02853bbd60
added prompt template for repository context
2023-10-17 17:29:07 -04:00
Marshall Bowers
218922d9f8
Document gap styles
2023-10-17 17:21:52 -04:00
Marshall Bowers
7a2b04a5d1
Document border width styles
2023-10-17 16:47:37 -04:00
Marshall Bowers
dc32e56a9c
Document rounded styles
2023-10-17 16:35:21 -04:00
Marshall Bowers
490cc7ded6
Add more placeholder doc strings
2023-10-17 16:24:36 -04:00
KCaverly
a874a09b7e
added openai language model tokenizer and LanguageModel trait
2023-10-17 16:21:03 -04:00
Antonio Scandurra
4db0350f06
Checkpoint
2023-10-17 22:16:48 +02:00
Marshall Bowers
edc52e5b28
Tweak grammar
2023-10-17 16:16:38 -04:00
Marshall Bowers
a1a1284696
Document top/right/bottom/left styles
2023-10-17 16:13:55 -04:00
Marshall Bowers
6f849e8f64
Document padding styles
2023-10-17 16:10:30 -04:00
Marshall Bowers
3e32504526
Document .size()
2023-10-17 16:07:52 -04:00
Marshall Bowers
6e84d3cce0
Document margin styles
2023-10-17 16:06:11 -04:00
Marshall Bowers
8c02de6c61
Document width and height styles
2023-10-17 16:06:07 -04:00