Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7857 commits 1103 branches 1111 tags 398 MiB
Commit graph

5250 commits

Author SHA1 Message Date
Kay Simmons
cdc6566d87 fixup poor utility naming 2023-02-25 14:12:25 -08:00
Kay Simmons
36f3d3d738 Add test for new sorting behavior 2023-02-25 14:06:54 -08:00
Kay Simmons
0b48e238f2 Sort file finder matches by distance to the active item after match score 2023-02-24 18:13:26 -08:00
Mikayla Maki
0704d9dcdb
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
a57fcf5afc Update bromberg dependency to have alloc 2023-02-24 14:34:24 -08:00
Max Brunsfeld
e910fd8493 collab 0.6.1 2023-02-24 09:44:23 -08:00
Mikayla Maki
8656708de4
Revert "Remove borrow from reveal_path()" 2023-02-24 09:39:52 -08:00
Mikayla Maki
89ddf14b0e Remove borrow from reveal_path() 2023-02-23 21:36:17 -08:00
Julia
be86cb35ba
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
465d8cc2ff Differentiate between follow state on a per-project basis 2023-02-24 00:07:17 -05:00
Max Brunsfeld
93b9e762ec
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
fbc934b884 Adjust window's traffic light position when setting its title 2023-02-23 14:44:45 -08:00
Mikayla Maki
350b7b82f7
Merge pull request #2207 from zed-industries/project-panel-actions 
Fix project panel actions
 2023-02-23 14:31:29 -08:00
Mikayla Maki
b179fc2b99 Remove comment 2023-02-23 14:24:53 -08:00
Mikayla Maki
8860346324 Fix broken dock command 2023-02-23 14:15:29 -08:00
Mikayla Maki
9004640586 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
3f9405f8f1
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
2276d25bdf Fix enter in normal mode acting incorrectly 2023-02-23 13:40:31 -08:00
Mikayla Maki
ffe53bed87 Reverts keymap precedence order change 2023-02-23 13:32:45 -08:00
Julia
e1df85e86d Add same grayscale logic to followers which leaders have 2023-02-23 15:59:37 -05:00
Antonio Scandurra
bbeb33bc7e 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
74e0bed38f Fix compilation errors after restructuring room_transaction 2023-02-23 15:17:22 +01:00
Antonio Scandurra
832549f1a3 Merge branch 'main' into call-ui-follow-up 2023-02-23 15:15:46 +01:00
Antonio Scandurra
b965333325 Show avatar in user menu 2023-02-23 15:09:32 +01:00
Antonio Scandurra
59a66190e5 Avoid trying to reconnect to a room if client is signed out 2023-02-23 14:53:10 +01:00
Antonio Scandurra
9334267bd0 Tear down peer when signing out 2023-02-23 14:47:02 +01:00
Antonio Scandurra
a0daf47134 Don't panic when rendering collab titlebar item while signed out 2023-02-23 14:46:02 +01:00
Petros Amoiridis
9a729a2e64
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
1c636500de
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
65a9ac449f Remove leave button from the title bar 2023-02-22 23:30:32 -08:00
Max Brunsfeld
bf5c3d963a 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 Brunsfeld
40aee8d7bc 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
46ead28971 Bump RPC protocol version number 2023-02-22 13:40:14 -08:00
Max Brunsfeld
111aff29cc collab 0.6.0 2023-02-22 12:35:15 -08:00
Max Brunsfeld
e2a2e40599 v0.76.x dev 2023-02-22 12:34:29 -08:00
Max Brunsfeld
b73423daaa
Merge pull request #2114 from zed-industries/new-collaboration-ui 
New collaboration UI part 1/N
 2023-02-22 12:32:41 -08:00
Julia
0324ca3b08 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
Julia
36040cd0e1 Add top level leave call button 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 14:44:23 -05:00
Julia
a07867d628 Fiddle with titlebar item spacing 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 14:13:29 -05:00
Julia
812145f9ab 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
Julia
dbe5b0205c Add style leader selection container 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 13:36:06 -05:00
Petros Amoiridis
3d6c81584f
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 Amoiridis
81ece4fd44
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
7b559176f1
Merge pull request #2201 from zed-industries/save-shortcuts 
Add OS UI Keybindings
 2023-02-22 09:16:19 -08:00
Mikayla Maki
d7305077bf
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 Maki
4798b72cb8 Fixed keyboard shortcuts in mac os native panels 
co-authored-by: Antonio <antonio@zed.dev>
 2023-02-22 09:10:16 -08:00
Mikayla Maki
71d8ead318 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
Julia
9b92a8e3fe Add mockup accurate avatar background 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia
7f4da80386 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
6a731233c5 Remove Flex::with_reversed_pain_order 2023-02-22 11:34:55 -05:00