yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
633 Commits
Author SHA1 Message Date
Max BrunsfeldandMikayla 20f804d1b9 Implement basic channel member management UI 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-03 14:49:01 -07:00
Mikayla Maki 88fb1b89f2 WIP: continue channel management modal and rename panel to collab_panel 2023-08-03 11:40:55 -07:00
Max Brunsfeld e12e58c413 WIP 2023-08-02 12:15:06 -07:00
Mikayla Makiandmax c9a92422bd Add remove channel method 
Move test client fields into appstate and fix tests

Co-authored-by: max <max@zed.dev>
 2023-08-01 16:06:27 -07:00
Mikayla Makiandmax a7fd3f4037 Add room creation from channel join 
co-authored-by: max <max@zed.dev>
 2023-07-31 16:54:12 -07:00
Mikayla Makiandmax f63051148b Add ability to join a room from a channel ID 
co-authored-by: max <max@zed.dev>
 2023-07-31 16:53:57 -07:00
Max BrunsfeldandMikayla 0886ea1dcb Set up basic RPC for managing channels 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-07-28 17:05:56 -07:00
Mikayla Maki a5868e7658 Move channels panel into collab and rename to collab panel 
remove contacts popover and add to collab panel
 2023-07-28 13:24:42 -07:00
Kirill Bulatov 3a66693941 Post-rebase fixes 2023-06-29 22:39:33 +03:00
Kirill Bulatov 25129daf7a Forward inlay hint refresh requests to clients, test coop inlay hints 2023-06-29 22:25:49 +03:00
Kirill Bulatov 851bc593b4 Deserialize more LSP inlay hint information 2023-06-29 22:25:49 +03:00
Kirill Bulatov 9a80c8c8d0 Draft the initial protobuf changes 2023-06-29 22:25:48 +03:00
Max Brunsfeld dbfa5136e9 Get integration test passing. Wait for expand entry on remote projects. 2023-06-22 10:34:28 -07:00
Max Brunsfeld e7aacf59c8 Add a bit to each entry indicating if it's outside of the worktree root 2023-06-22 10:34:28 -07:00
Max Brunsfeld 6690be7b40 Remove logic for marking worktree entries as collapsed 2023-06-22 10:34:28 -07:00
Max Brunsfeld 5850c521c9 Maintain on the background scanner a set of expanded directories 2023-06-22 10:34:28 -07:00
Max Brunsfeld 924aeac9f1 Bump protocol version 2023-06-09 11:50:15 -07:00
Mikayla Maki 35ef109e8d Merge branch 'main' into stream-git-statuses 2023-06-07 14:12:58 -07:00
Joseph Lyons 4b5a7ec94a Fix typos 2023-06-02 22:02:19 -04: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
Mikayla Makiandjulia b2303fb1ea WIP: Move statuses to entries 
co-authored-by: julia <julia@zed.dev>
 2023-05-31 12:55:31 -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 c53a8ea6d5 Bump protocol version 2023-05-31 09:03:45 -07:00
Max Brunsfeld a2a96774fc Replicate project-specific settings when collaborating 2023-05-30 18:08:03 -07: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 f5340df2fa Do not send edits over the wire 2023-05-25 12:55:44 +03:00
Kirill Bulatov 64af35dd99 Always use server formatting settings 2023-05-25 09:45:50 +03:00
Kirill Bulatov adaae861b6 Use formatting options 2023-05-25 09:45:50 +03:00
Kirill Bulatov 5e4717898a Support remote sessions 2023-05-25 09:45:50 +03:00
Mikayla Makiandmax 686b607b8e Update git repositories to be streamed with their entries 
co-authored-by: max <max@zed.dev>
 2023-05-15 16:22:00 -07:00
Mikayla Maki ee2b629435 Update proto names to reflect new status info 2023-05-15 16:20:01 -07:00
Mikayla Maki 420e895c6d Send the root branch along with it's entry 2023-05-12 09:37:02 -07:00
Mikayla Maki f42c88aa0a Bump protocol version 2023-05-10 17:38:29 -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 ac8f4d47f8 WIP: integrate status with collab 2023-05-10 17:37:36 -07:00
Kirill Bulatov c95f4a81e2 Add initial include/exclude project search UI 2023-05-10 11:11:31 +03:00
Mikayla Maki 1f544cf486 Bump protocol version number 2023-05-08 14:34:14 -07:00
Mikayla Maki 858efd1f63 Fix styling of titlebar highlights 2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 134e12a79d Removed scan ID from repository interfaces 
co-authored-by: Max <max@zed.dev>
 2023-05-08 14:33:59 -07:00
Mikayla MakiMaxPetros
 		950b5873a6 WIP: re-arranging the RepositoryEntry representation 
Added branches to the randomized test to check the git branch
Added the remaining database integrations in collab

Co-authored-by: Max <max@zed.dev>
Co-authored-by: Petros <petros@zed.dev>
 2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 46db4cbb79 WIP: Add repository entries to collab and synchronize when rejoining the room 
co-authored-by: Max <max@zed.dev>
 2023-05-08 14:33:59 -07:00
Mikayla Maki 8f3c07b943 Add proto fields for repository entry maintenance 2023-05-08 14:33:59 -07:00
Max Brunsfeld 405fd098ea Merge pull request #2417 from zed-industries/hover-markdown 
Render markdown more correctly in the editor hover popover
 2023-04-27 14:15:04 -07:00
Julia df8cc2de32 Show source of diagnostic hovers 2023-04-27 14:35:34 -04:00
Max Brunsfeld 5b9470d2b1 Render more markdown features in hover popover 2023-04-26 15:33:10 -07:00
Max Brunsfeld d1f33d7052 🎨 Specify more dependencies at the workspace level 2023-04-24 17:41:55 -07:00
Max Brunsfeld a17f009b00 Use a workspace dependency for the futures crate 2023-04-24 09:43:31 -07:00
Julia 8bf39af93d Bump protocol version 2023-04-20 08:58:41 -07:00
JuliaandNathan Sobo 2ae3ba38c2 Start getting diagnostics sets to work with multiple servers 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-04-20 08:58:41 -07:00