mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 02:48:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
11584 commits 769 branches 798 tags 274 MiB
Commit graph

262 commits

Author SHA1 Message Date
Mikayla
6fdf101745
Update database and RPC to provide configured feature flags 2023-08-25 14:34:32 -07:00
Kirill Bulatov
8ed280a029 Rebase fixes 2023-08-25 14:30:07 +03:00
Kirill Bulatov
80e8714241 Send inlay hint resolve requests 2023-08-25 14:26:17 +03:00
Kirill Bulatov
3434990b70 Store inlay hint resolve data 2023-08-25 14:26:17 +03:00
Max Brunsfeld
90f22cb0d2 Replicate editor state when following into channel notes 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-24 12:36:01 -07:00
Mikayla
199be8241c
Add following into channel notes 
co-authored-by: max <max@zed.dev>
 2023-08-24 11:25:20 -07:00
Mikayla
5a0315c4d5
Achieve end to end channel buffer synchronization 
co-authored-by: max <max@zed.dev>
 2023-08-23 18:34:43 -07:00
Max Brunsfeld
95ea664725
WIP 2023-08-23 18:34:43 -07:00
Max Brunsfeld
71611ee7a2
Get join_buffer_for_channel compiling 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-23 18:34:43 -07:00
Mikayla
364ed1f840
WIP: pass synchronize channel buffers integration test 2023-08-23 18:34:43 -07:00
Mikayla
a7a4e2e369
Add buffer integration test 
Rearrange channel crate structure
Get channel buffer from database

co-authored-by: Max <max@zed.dev>
 2023-08-23 18:34:43 -07:00
Max Brunsfeld
1ffde7bddc Implement calling contacts into your current channel 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-15 14:56:54 -07:00
Max Brunsfeld
b3447ada27 Dial in the channel creating/renaming UI 
* Ensure channel list is in a consistent state with no flicker while the
  channel creation / rename request is outstanding.
* Maintain selection properly when renaming and creating channels.
* Style the channel name editor more consistently with the non-editable
  channel names.

Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-09 17:11:57 -07:00
Mikayla
a3623ec2b8
Add renames 
co-authored-by: max <max@zed.dev>
 2023-08-09 12:20:48 -07:00
Max Brunsfeld
87b2d599c1 Flesh out channel member management 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 14:12:08 -07:00
Max Brunsfeld
7a04ee3b71 Start work on exposing which channels the user has admin rights to 2023-08-03 18:31:00 -07:00
Max Brunsfeld
a7e883d956 Implement basic channel member management UI 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-03 14:49:01 -07:00
Mikayla Maki
6c4964f071
WIP: continue channel management modal and rename panel to collab_panel 2023-08-03 11:40:55 -07:00
Max Brunsfeld
a9de73739a WIP 2023-08-02 12:15:06 -07:00
Mikayla Maki
74437b3988
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 Maki
92fa879b0c
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 Brunsfeld
4b94bfa045 Set up basic RPC for managing channels 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-07-28 17:05:56 -07:00
Kirill Bulatov
652909cdba Post-rebase fixes 2023-06-29 22:39:33 +03:00
Kirill Bulatov
890b164278 Forward inlay hint refresh requests to clients, test coop inlay hints 2023-06-29 22:25:49 +03:00
Kirill Bulatov
8acc5cf8f4 Deserialize more LSP inlay hint information 2023-06-29 22:25:49 +03:00
Kirill Bulatov
6e3d1b962a Draft the initial protobuf changes 2023-06-29 22:25:48 +03:00
Max Brunsfeld
5350164db9 Get integration test passing. Wait for expand entry on remote projects. 2023-06-22 10:34:28 -07:00
Max Brunsfeld
cd823ede4d 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
aa6f2f1816 Remove logic for marking worktree entries as collapsed 2023-06-22 10:34:28 -07:00
Max Brunsfeld
4c03231863 Maintain on the background scanner a set of expanded directories 2023-06-22 10:34:28 -07:00
Mikayla Maki
28ba27c9c5
Merge branch 'main' into stream-git-statuses 2023-06-07 14:12:58 -07:00
Joseph Lyons
7c60f636d5 Fix typos 2023-06-02 22:02:19 -04:00
Mikayla Maki
22e4086658
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
8f95435548 Replicate project-specific settings when collaborating 2023-05-30 18:08:03 -07:00
Kirill Bulatov
e2ff829f98 Use Transaction instead of ProjectTransaction 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2023-05-25 16:12:14 +03:00
Kirill Bulatov
aa58d0fd77 Do not send edits over the wire 2023-05-25 12:55:44 +03:00
Kirill Bulatov
58a56bdda2 Always use server formatting settings 2023-05-25 09:45:50 +03:00
Kirill Bulatov
b9dabb165e Use formatting options 2023-05-25 09:45:50 +03:00
Kirill Bulatov
3327e8a6dd Support remote sessions 2023-05-25 09:45:50 +03:00
Mikayla Maki
307dd2b83e
Update proto names to reflect new status info 2023-05-15 16:20:01 -07:00
Mikayla Maki
2b80dfa81d
Update protos 2023-05-10 17:37:36 -07:00
Mikayla Maki
a58a33fc93
WIP: integrate status with collab 2023-05-10 17:37:36 -07:00
Kirill Bulatov
915154b047 Add initial include/exclude project search UI 2023-05-10 11:11:31 +03:00
Mikayla Maki
d8dac07408
Removed scan ID from repository interfaces 
co-authored-by: Max <max@zed.dev>
 2023-05-08 14:33:59 -07:00
Mikayla Maki
b6d6f5c650
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 Maki
8301ee43d6
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
2fe5bf419b
Add proto fields for repository entry maintenance 2023-05-08 14:33:59 -07:00
Max Brunsfeld
7258db7a4e
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
3f7533a0b4 Show source of diagnostic hovers 2023-04-27 14:35:34 -04:00
Max Brunsfeld
d298ce3fd3 Render more markdown features in hover popover 2023-04-26 15:33:10 -07:00