Commit Graph
790 Commits
Author SHA1 Message Date
Mikayla Maki 6cf4693b01 Add audio APIs to Zed
Share mic on joining room
2023-06-16 10:13:27 -07:00
Antonio Scandurra 2d88135321 Activate screen-sharing when leader activates a panel 2023-06-15 18:01:30 +02:00
Mikayla MakiandMax 9a667e9c7b Fixed a bug where buffer saved clocks would desynchronize in rare execution paths
co-authored-by: Max <max@zed.dev>
2023-06-07 16:10:45 -07:00
Mikayla Maki 35ef109e8d Merge branch 'main' into stream-git-statuses 2023-06-07 14:12:58 -07:00
Mikayla Maki 7b7282fa47 Fix several randomized test failures with the new git status implementation 2023-06-07 14:10:17 -07:00
Max Brunsfeld e41e8ad0ba Populate created local settings file with an empty JSON object and comments 2023-06-05 18:20:02 -07:00
Mikayla Makiandmax 032d8e4aa1 Improve test generation and implement status propogation
co-authored-by: max <max@zed.dev>
2023-06-05 17:30:12 -07:00
Mikayla Maki d478937043 Add statuses to test integration 2023-06-05 12:06:23 -07:00
Mikayla Makiandmax c589b13748 Remove stale comments
Implement status bubbling query with sum tree traversals

co-authored-by: max <max@zed.dev>
2023-06-02 16:41:01 -07:00
Max Brunsfeld ba6cd9a8a4 Add support for folder-specific settings (#2537)
This PR allows you to customize Zed's settings within a particular
folder by creating a `.zed/settings.json` file within that folder.

Todo

* [x] respect folder-specific settings for local projects
* [x] respect folder-specific settings in remote projects
* [x] pass a path when retrieving editor/language settings
* [x] pass a path when retrieving copilot settings
* [ ] update the `Setting` trait to make it clear which types of
settings are locally overridable

Release Notes:

* Added support for folder-specific settings. You can customize Zed's
settings within a particular folder by creating a `.zed` directory and a
`.zed/settings.json` file within that folder.
2023-05-31 16:27:08 -07:00
Mikayla MakiandJulia 3df36f560f WIP: Move statuses to be on their associated file entries in worktree
co-authored-by: Julia <julia@zed.dev>
2023-05-31 11:03:11 -07:00
Max Brunsfeld a2a96774fc Replicate project-specific settings when collaborating 2023-05-30 18:08:03 -07:00
Antonio ScandurraandNathan Sobo 7c547a09c9 Move history navigation logic to Workspace
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-05-29 19:47:59 +02:00
Kirill Bulatov 99509fc6ed Update LSP to the newest version 2023-05-28 21:55:08 +03:00
Kirill Bulatov 20a6ccd521 Have proper undo for both client and host 2023-05-25 18:29:57 +03:00
Kirill BulatovandAntonio Scandurra c125d0d92b Use Transaction instead of ProjectTransaction
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2023-05-25 16:12:14 +03:00
Kirill Bulatov 45852ccce3 Add integration tests 2023-05-25 09:45:50 +03:00
Kirill Bulatov e1e9ef9ed9 Process remote format typing also 2023-05-25 09:45:50 +03:00
Antonio Scandurra dee6f22ca2 Merge remote-tracking branch 'origin/main' into panels 2023-05-23 08:24:28 +02:00
Mikayla Maki 0ab4e0c702 Add run until parked for test 2023-05-22 18:40:12 -07:00
Antonio Scandurra 8f56c80d68 Merge branch 'main' into panels 2023-05-22 14:10:17 +02:00
Mikayla Maki b72cdb7362 Refactored apart the forward and the backwards iterator for diff hunks 2023-05-19 18:09:47 -07:00
Antonio Scandurra b6997ef75b Toggle project panel when opening new workspace in a dock-agnostic way 2023-05-19 15:27:18 +02:00
Mikayla Maki dae8bdef76 fmt 2023-05-18 14:31:08 -07:00
Mikayla Maki fced05ea25 Fixed an imprecise join in rejoin room 2023-05-18 14:29:18 -07:00
Max Brunsfeld ca973b874e Log how long it takes to handle each RPC message 2023-05-18 12:24:07 -07:00
Max Brunsfeld c261a01c7f Define theme/ui text style settings in theme crate 2023-05-17 14:44:59 -07:00
Max Brunsfeld ca02b558c8 Merge branch 'main' into setting-store 2023-05-17 09:55:24 -07:00
Max Brunsfeld 2f05e3d502 Define project settings in project crate 2023-05-16 17:45:04 -07:00
Max Brunsfeld a802da9dae Define editor settings in editor crate 2023-05-16 17:30:29 -07:00
Max Brunsfeld 56f2ff64ed Define language settings in the language crate 2023-05-16 17:29:53 -07:00
Mikayla Maki ee2b629435 Update proto names to reflect new status info 2023-05-15 16:20:01 -07:00
Mikayla Maki 50a6410ae8 fmt 2023-05-11 12:02:25 -07:00
Mikayla Maki 4e408e7758 Added status trickle up 2023-05-11 12:01:42 -07:00
Mikayla Maki c0d0eefb54 Update is_deleted when sending new repositories 2023-05-11 10:21:25 -07:00
Mikayla Maki 26658419a3 Remove the CORRECT, overly agressive deletion codepath 2023-05-11 09:24:36 -07:00
Mikayla Maki fec0b1acb4 fmt 2023-05-10 20:09:37 -07:00
Mikayla Maki ae50a2f213 Fixed bug in status deletion marking 2023-05-10 19:54:02 -07:00
Mikayla Maki 0c34c073ec Add randomized test for git statuses 2023-05-10 19:21:27 -07:00
Mikayla Maki 732949181b Add postgres migration 2023-05-10 17:50:35 -07:00
Mikayla Maki d0c4ee38de Add integration test for git status 2023-05-10 17:37:36 -07:00
Mikayla Maki d2ce29f171 Got basic replication working :) 2023-05-10 17:37:36 -07:00
Mikayla Maki e487896125 Update protos 2023-05-10 17:37:36 -07:00
Mikayla Maki c2c9c36e95 Fix bug in status detection when removing a directory 2023-05-10 17:37:36 -07:00
Mikayla Maki e920ede88c Revert "Convert git status calculation to use Entry IDs as the key instead of repo relative paths"
This reverts commit 728c6892c924ebeabb086e308ec4b5f56c4fd72a.
2023-05-10 17:37:36 -07:00
Mikayla Maki ea28af0c6a Convert git status calculation to use Entry IDs as the key instead of repo relative paths 2023-05-10 17:37:36 -07:00
Mikayla Maki c1839b2ba2 Fix compile errors 2023-05-10 17:37:36 -07:00
Mikayla Maki ac8f4d47f8 WIP: integrate status with collab 2023-05-10 17:37:36 -07:00
Max Brunsfeld 876d8b3e09 Ensure the SettingsStore global is added in tests 2023-05-10 16:39:59 -07:00
Antonio Scandurra f1363f8f70 Merge branch 'main' into panels 2023-05-10 15:23:37 +02:00