yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
39175 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Conrad Irwin 5f8ac7c29b Plumbing to pass role for room participants 2024-01-03 19:30:32 -07:00
Conrad Irwin b40a24fd40 TEMP 2024-01-03 19:30:32 -07:00
Max BrunsfeldConradMikayla
 		4ed92d64b7 Start work on read-only project access for channel guests 
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 19:30:32 -07:00
Joseph T. Lyons 80bc858ca2 Rename notification_store 2024-01-03 20:02:23 -05:00
Joseph T. Lyons 8c6056e92d Remove zed2-related comment 
This was the last result when searching for `zed2`
 2024-01-03 20:00:58 -05:00
Marshall Bowers 0664cfe89b Restore timestamp insertion for journal: new journal entry (#3870) 
This PR restores the insertion of the timestamp when using the `journal:
new journal entry` action.

Release Notes:

- Restored timestamp insertion when creating new journal entries.
 2024-01-03 18:09:55 -05:00
Marshall Bowers b3366ef872 Fix icon path for Icon::AudioOn (#3869) 
This PR fixes the icon path for `Icon::AudioOn` so that it points to a
file that exists.

Release Notes:

- Fixed the loading of the deafen icon in the call controls.
 2024-01-03 17:54:53 -05:00
Marshall Bowers 1dcb755fc5 Follow the project host when clicking their name in the title bar (#3868) 
This PR adds back the ability to follow the project host when clicking
on their name in the title bar.

Release Notes:

- Added back following the project host when clicking their name in the
title bar.
 2024-01-03 17:48:46 -05:00
Joseph T. Lyons bcc719621b Merge branch 'main' of https://github.com/zed-industries/zed 2024-01-03 17:20:36 -05:00
Joseph T. Lyons b550b3ae93 collab 0.33.0 2024-01-03 17:20:01 -05:00
Joseph T. Lyons be599d2e18 Bump collab version back to what it was before 2024-01-03 17:19:39 -05:00
Marshall Bowers fa0362e1f2 Fix predictive text color (#3867) 
This PR fixes the predictive text colors, which were no longer correct
after #3842.

Release Notes:

- Fixed predictive text colors.
 2024-01-03 17:09:01 -05:00
Nate Butler 3ddb104bdd Add additional keybinding icons (#3861) 
Note: There is still some consistency work to do between all the
keybinding icons. I'll tackle this at a later time.

- Adds `return`, `space`, `tab`, `escape`, `pgup` and `pgdn`
- Simplifies keybinding rendering (due to theme changes)
- Standardizes icon naming convention to use `_` everywhere.

Release Notes:

- Zed 2: Added additional keybinding icons
 2024-01-03 17:05:40 -05:00
Marshall Bowers b1a62f06ee Add empty state for project panel (#3863) 
This PR adds an empty state for the project panel.

It will now display an "Open a project" button.

Release Notes:

- Added an empty state for the project panel.
 2024-01-03 17:00:47 -05:00
Mikayla Maki cd12de5d2e Update Cargo.toml 2024-01-03 13:57:32 -08:00
Nate Butler 4ecea9c361 Restore keybinding changes 2024-01-03 16:55:56 -05:00
Mikayla Maki a76886c9c1 Update Cargo.toml 2024-01-03 13:55:55 -08:00
Nate Butler f1a3c3f576 Merge branch 'main' into additional-keybinding-icons 2024-01-03 16:49:34 -05:00
Max Brunsfeld a44f20c860 Replace zed with zed2 (#3862) 2024-01-03 13:33:54 -08:00
Max Brunsfeld f89c4d2347 Remove stray files 2024-01-03 13:25:04 -08:00
Mikayla Maki c1d065438b Update release_nightly.yml 2024-01-03 13:24:37 -08:00
Max Brunsfeld 165590d1b9 Remove unused scripts 2024-01-03 13:22:19 -08:00
Max Brunsfeld 65238ae15d Fix path to zed languages 2024-01-03 13:22:13 -08:00
Max Brunsfeld 7673f5586c Fix UI doc test 2024-01-03 13:21:45 -08:00
Max Brunsfeld 6b85fb5012 cargo fmt 2024-01-03 13:13:50 -08:00
Max BrunsfeldandMikayla 01b483b367 Remove 2 suffix from gpui_macros, fix compile errors in tests 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 13:12:21 -08:00
Max BrunsfeldandMikayla 75f0670dd6 Remove 2 suffix from gpui 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:59:39 -08:00
Max BrunsfeldandMikayla fd7acf1f00 Remove 2 suffix from live_kit_client 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:49:33 -08:00
Max Brunsfeld 05e7bbca97 Merge branch 'main' 2024-01-03 12:43:52 -08:00
Max BrunsfeldandMikayla ee573f7906 Remove 2 suffix for theme 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:41:01 -08:00
Max BrunsfeldandMikayla e2be87c688 Remove 2 suffix for ui, storybook, text 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:33:51 -08:00
Max BrunsfeldandMikayla 2e155121f8 Remove 2 suffix for collab, rope, settings, menu 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:29:16 -08:00
Max BrunsfeldandMikayla cd818cd329 Remove 3 suffix for git crate 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:11:59 -08:00
Max BrunsfeldandMikayla 7173f4a82b Remove 2 suffix for fs, db, semantic_index, prettier 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:09:42 -08:00
Marshall Bowers 7626d54559 Remove unneeded theme dependency 2024-01-03 15:07:08 -05:00
Marshall Bowers 00ce7ddba4 Remove unneeded theme dependency 2024-01-03 15:06:31 -05:00
Marshall Bowers 3fb380b95f Decouple theme_importer from old GPUI 1 crates (#3866) 
This PR decouples the `theme_importer` from the `theme` and `gpui`
crates.

We achieve this by inlining all of the relevant bits needed to
deserialize Zed1 themes.

This will allow us to continue to import Zed1 themes after we land
#3862.

Release Notes:

- N/A
 2024-01-03 15:03:52 -05:00
Marshall Bowers 7c1713f4a1 Decouple theme_importer from old GPUI 1 crates (#3866) 
This PR decouples the `theme_importer` from the `theme` and `gpui`
crates.

We achieve this by inlining all of the relevant bits needed to
deserialize Zed1 themes.

This will allow us to continue to import Zed1 themes after we land
#3862.

Release Notes:

- N/A
 2024-01-03 15:02:55 -05:00
Max BrunsfeldandMikayla f8cb050345 Remove 2 suffix for client, call, channel 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:02:14 -08:00
Max BrunsfeldandMikayla 8e704c8a47 Remove 2 suffix for lsp, language, fuzzy 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 11:58:02 -08:00
Max BrunsfeldandMikayla cdafb2d039 Remove 2 suffix for project 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 11:53:34 -08:00
Max BrunsfeldandMikayla e0b840925f Remove 2 suffix for ai, zed_actions, install_ci, feature_flags 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 11:48:46 -08:00
Max BrunsfeldandMikayla 74e6eb908f Remove 2 suffix for assistant, journal 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 11:14:01 -08:00
Max BrunsfeldandMikayla a13a885d6b Remove 2 suffix for workspace 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 11:08:51 -08:00
Max BrunsfeldandMikayla dcfa67d7dc Remove 2 suffix for multi_buffer, outline, copilot 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 11:01:58 -08:00
Max BrunsfeldandMikayla 602d158320 Remove 2 suffix for editor 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 10:58:57 -08:00
Max BrunsfeldandMikayla c6cceb8efe Remove 2 suffix for picker, feedback 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 10:55:34 -08:00
Max BrunsfeldandMikayla 8a45a99477 Remove 2 suffix for language_tools, search, terminal_view, auto_update 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 10:52:40 -08:00
Max BrunsfeldandMikayla 34a9916ae6 Remove 2 suffix for language selector, project panel, recent_projects, copilot_button, breadcrumbs, activity_indicator 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 10:47:33 -08:00
Max BrunsfeldandMikayla 450537ac2a Remove 2 suffix for vim, diagnostics, go_to_line, theme_selector, command_palette, file_finder 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 10:42:49 -08:00