yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,884 Commits 5 Branches 0 Tags
784666e69c5ebe21d1768aa52cd7c40b4cdfa607
Commit Graph
5248 Commits
Author SHA1 Message Date
Max BrunsfeldandMikayla Maki 52776f2594 Pass the 'Save' format trigger when formatting on save 
In an earlier refactor, I accidentally caused the 'Manual'
trigger to *always* be passed.

Co-authored-by: Mikayla Maki <mikayla@zed.dev>
 2023-02-24 17:11:35 -08:00
Mikayla Maki 8784d92bb0 Merge pull request #2216 from zed-industries/update-bromberg 
Update bromberg dependency to have alloc
 2023-02-24 14:41:32 -08:00
Mikayla Maki 8ea951a42a Update bromberg dependency to have alloc 2023-02-24 14:34:24 -08:00
Max Brunsfeld 332a63b96a collab 0.6.1 2023-02-24 09:44:23 -08:00
Mikayla Maki fdca0282d8 Revert "Remove borrow from reveal_path()" 2023-02-24 09:39:52 -08:00
Mikayla Maki 11b9b201cf Remove borrow from reveal_path() 2023-02-23 21:36:17 -08:00
Julia 127877d219 Merge pull request #2213 from zed-industries/per-project-follow-status 
Differentiate between follow state on a per-project basis
 2023-02-24 00:26:41 -05:00
Julia aae083923c Differentiate between follow state on a per-project basis 2023-02-24 00:07:17 -05:00
Max Brunsfeld 7345ad2d41 Merge pull request #2212 from zed-industries/initial-traffic-light-position 
Adjust window's traffic light position when setting its title
 2023-02-23 15:02:05 -08:00
Max Brunsfeld 7983912b72 Adjust window's traffic light position when setting its title 2023-02-23 14:44:45 -08:00
Mikayla Maki 1cbe0990e4 Merge pull request #2207 from zed-industries/project-panel-actions 
Fix project panel actions
 2023-02-23 14:31:29 -08:00
Mikayla Maki b0c603ecc3 Remove comment 2023-02-23 14:24:53 -08:00
Mikayla Maki 70f0950c9a Fix broken dock command 2023-02-23 14:15:29 -08:00
Mikayla Maki 730ea83ee0 Convert keymap context to use generics and Cow<'static> so we don't have to add .to_string() and .into() for each usage 2023-02-23 14:10:55 -08:00
Kay Simmons 04777cf816 Merge pull request #2210 from zed-industries/fix-enter-vim-normal-mode 
Fix enter in normal mode acting incorrectly
 2023-02-23 13:46:15 -08:00
Kay Simmons 24a448f00c Fix enter in normal mode acting incorrectly 2023-02-23 13:40:31 -08:00
Mikayla Maki 8d964e630f Reverts keymap precedence order change 2023-02-23 13:32:45 -08:00
Julia 253a3fc2a1 Add same grayscale logic to followers which leaders have 2023-02-23 15:59:37 -05:00
Antonio Scandurra bbbd79a3a2 Fix error when deleting rooms containing projects on refresh 
A foreign key violation was causing the server to never delete stale
rooms during `Database::refresh_room` due to having one or more project
records referencing the room.
 2023-02-23 15:54:35 +01:00
Antonio Scandurra 10881ed0a1 Fix compilation errors after restructuring room_transaction 2023-02-23 15:17:22 +01:00
Antonio Scandurra 088d3901e9 Merge branch 'main' into call-ui-follow-up 2023-02-23 15:15:46 +01:00
Antonio Scandurra 482d1b6789 Show avatar in user menu 2023-02-23 15:09:32 +01:00
Antonio Scandurra 7a0c129ad6 Avoid trying to reconnect to a room if client is signed out 2023-02-23 14:53:10 +01:00
Antonio Scandurra 38a12ff77e Tear down peer when signing out 2023-02-23 14:47:02 +01:00
Antonio Scandurra f8b5ca8fef Don't panic when rendering collab titlebar item while signed out 2023-02-23 14:46:02 +01:00
Petros Amoiridis 15d2d933e2 Merge pull request #2202 from zed-industries/petros/z-86-replace-terminal-tab-title-with-an-icon 
Replace terminal tab title with an icon
 2023-02-23 11:04:43 +02:00
Antonio Scandurra 42bf6ae38b Merge pull request #2200 from zed-industries/fix-slow-project-join 
Hold room lock through the entirety of a `room_transaction`
 2023-02-23 09:11:58 +01:00
Max Brunsfeld 8a88fe4968 Remove leave button from the title bar 2023-02-22 23:30:32 -08:00
Max Brunsfeld 781ad9501a Rearrange collab titlebar items to avoid movement of the toggle contacts button 
* Replace username in titelbar with a `...` user menu that shows
  the current user name and contains a sign-in/sign-out button.
* Move the '+' (toggle contacts) button back to the right side.
* Move the collaborators back to the right side.
* Move the share/unshare button to the left side, beside the project title
* Only show the share/unshare button when in a call.
 2023-02-22 22:56:11 -08:00
Max BrunsfeldandJoseph Lyons 45f2eebb2d Add missing tooltip for contacts menu button 
Co-authored-by: Joseph Lyons <joseph@zed.dev>
 2023-02-22 14:18:17 -08:00
Max Brunsfeld c0ac9544ba Bump RPC protocol version number 2023-02-22 13:40:14 -08:00
Max Brunsfeld de2051a89b collab 0.6.0 2023-02-22 12:35:15 -08:00
Max Brunsfeld abcf10d2be v0.76.x dev 2023-02-22 12:34:29 -08:00
Max Brunsfeld e34ff3fdb4 Merge pull request #2114 from zed-industries/new-collaboration-ui 
New collaboration UI part 1/N
 2023-02-22 12:32:41 -08:00
JuliaandMax Brunsfeld f9f5fc38d1 Be more specific about clearing (leader, follower) row 
Previously anyone unfollowing someone would clear all other rows for
other followers leading to an incorrect state, fix and test

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 15:29:20 -05:00
JuliaandMax Brunsfeld c094ca7b0d Add top level leave call button 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 14:44:23 -05:00
JuliaandMax Brunsfeld 31a31fb3fa Fiddle with titlebar item spacing 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 14:13:29 -05:00
JuliaandMax Brunsfeld 3d85c51976 Only show in-call share/unshare button if own project 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 13:40:43 -05:00
JuliaandMax Brunsfeld 57185f02fb Add style leader selection container 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 13:36:06 -05:00
Petros AmoiridisandJulia a098593d23 Add an icon to the terminal view tab 
The terminal icon already existed in `assets/icons`

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-02-22 20:30:44 +02:00
Petros AmoiridisandJulia f6561f0cb7 Deduplicate tab theme related code 
We've noticed that the search theme struct had two fields for a tab icon width and spacing. But we already have those in the tab theme struct. We decided to remove the duplicate and reuse the tab fields.

We also wanted to move where the spacing is being used. Instead of doing it at the left of the label, we do it at the right of the icon to match how it is done in other areas of the UI.

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-02-22 20:28:57 +02:00
Mikayla Maki d46f091080 Merge pull request #2201 from zed-industries/save-shortcuts 
Add OS UI Keybindings
 2023-02-22 09:16:19 -08:00
Mikayla Maki 36bf325979 Merge pull request #2198 from zed-industries/more-item-defaults 
Add more default impls to the item trait
 2023-02-22 09:14:12 -08:00
Mikayla MakiandAntonio bed59e03f4 Fixed keyboard shortcuts in mac os native panels 
co-authored-by: Antonio <antonio@zed.dev>
 2023-02-22 09:10:16 -08:00
Mikayla MakiandAntonio 40872c8bd4 Introduce an OSAction that can be associated with menu items for mac platform compatibility. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-02-22 09:02:31 -08:00
JuliaandMax Brunsfeld 2d1da9e310 Add mockup accurate avatar background 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:34:55 -05:00
JuliaandMax Brunsfeld b7120c3e83 Initial dedicated face pile element 
Rather than overload Flex with yet another special case, add a dedicated
element to handle this overlap instead

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia b9935a7208 Remove Flex::with_reversed_pain_order 2023-02-22 11:34:55 -05:00
Max Brunsfeld d860521e5a Start work on styling of follower avatars in facepiles 
* Make follower avatars smaller than top-level avatars
* Make avatars in facepiles overlap
* Render an opaque background behind avatars in facepiles.
 2023-02-22 11:34:55 -05:00
Max Brunsfeld 9032b8297a Retrieve room id from the project when following/unfollowing 
Previously, we were accidentally using the project id as the room id.
 2023-02-22 11:34:55 -05:00