oak-team/oak-gpui
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,806 Commits 1 Branch 0 Tags
e2a2e40599fec9fa772df8aa558d4d7b75678951
Commit Graph
7806 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
JuliaandMax Brunsfeld 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
JuliaandMax Brunsfeld 36040cd0e1 Add top level leave call button 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 14:44:23 -05:00
JuliaandMax Brunsfeld a07867d628 Fiddle with titlebar item spacing 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 14:13:29 -05:00
JuliaandMax Brunsfeld 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
JuliaandMax Brunsfeld dbe5b0205c Add style leader selection container 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 13:36:06 -05: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 MakiandAntonio 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 MakiandAntonio 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
JuliaandMax Brunsfeld 9b92a8e3fe Add mockup accurate avatar background 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:34:55 -05:00
JuliaandMax Brunsfeld 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
Max Brunsfeld b7cf426908 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 0dc92bec5c 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
JuliaandMax Brunsfeld c75aca25b6 Remove left side collaborator list 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:34:55 -05:00
JuliaandNathan Sobo ae87961a77 Close contacts popover when call ends 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia e9464815e0 Make tooltip lie less 2023-02-22 11:34:55 -05:00
JuliaandNathan Sobo 1ed47663ef Avoid moving contacts popover during call start & add button style state 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia dd02bc7748 Initial adding of contact menu to call-less share button 2023-02-22 11:22:37 -05:00
JuliaandAntonio Scandurra e403b868b7 Add followers table to sqlite scheme for tests 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-02-22 11:22:37 -05:00
Julia 3105ecd0bd Shuffle share/unshare button back to the right side 2023-02-22 11:22:37 -05:00
Julia 05e9615507 Highlight face pile which local user is following 2023-02-22 11:22:37 -05:00
Julia 1abb7794cb Handle case where follower is local user 2023-02-22 11:22:37 -05:00
Julia 50e681bbb1 Add username to right side 2023-02-22 11:22:37 -05:00
Julia 3fb8395085 Make things a bit more infallible 2023-02-22 11:22:37 -05:00
Julia 4513c40993 Following face piles finally take their first breath 2023-02-22 11:21:23 -05:00
JuliaandMax Brunsfeld 4ffc8cd9fd Fix deadlock in db get_room 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:21:23 -05:00
Julia 33c265d3cf Abuse a closure instead of abusing options/iterators quite so much 2023-02-22 11:21:23 -05:00
Julia 58c41778e7 Absolute pain of the iterator kind (start laying out a user's followers) 2023-02-22 11:21:23 -05:00
Julia 2592ec7265 Initial tracking of unfollows on collab server 2023-02-22 11:21:23 -05:00
JuliaandAntonio Scandurra d6462c611c Begin tracking follow states on collab server 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-02-22 11:21:23 -05:00
JuliaandPetros Amoiridis 28786a3c18 Add Flex with_reversed_paint_order & initially move face piles to left 
Co-Authored-By: Petros Amoiridis <petros@zed.dev>
 2023-02-22 11:21:23 -05:00
JuliaandPetros Amoiridis a5fd0250ab Start fleshing out layout of collaborator list entries 
Co-Authored-By: Petros Amoiridis <petros@zed.dev>
 2023-02-22 11:21:23 -05:00
JuliaandPetros Amoiridis f68eda97fb Tell project when it has been unshared 
Co-Authored-By: Petros Amoiridis <petros@zed.dev>
 2023-02-22 11:21:23 -05:00
Julia 99236f1875 Add collaborators to collaborator list, including self user 2023-02-22 11:21:23 -05:00
Julia bf8658067f Add collaborator count to collaborator list button 2023-02-22 11:21:23 -05:00
Julia c697c1a96a Switch collaborator list to using own style 2023-02-22 11:21:23 -05:00
JuliaandAntonio Scandurra 2b6aa3f5d1 Begin adding collaborator list popover 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-02-22 11:21:23 -05:00
Julia e96d52f35a Move share button and support unsharing 2023-02-22 11:21:23 -05:00
Julia ed2f1ddd2d Move workspace title into collaboration titlebar item render 2023-02-22 11:21:11 -05:00
Kay Simmons 24fcad3fa2 Merge pull request #2189 from zed-industries/labeled-tasks 
Labeled Tasks
 2023-02-21 21:31:47 -08:00
Kay Simmons 46af9a90ce fix test warning 2023-02-21 21:13:03 -08:00
Kay Simmons 1c69e289b7 Fix formatting 2023-02-21 21:07:45 -08:00
Mikayla Maki 9d782be4c8 Remove now-default stubs 2023-02-21 17:51:49 -08:00
Mikayla Maki cae9e733a1 Add more default impls to the item trait 
Change pane to not split if the underlying item cannot be cloned
 2023-02-21 17:29:39 -08:00
Mikayla Maki 77c396a0ab Merge pull request #2197 from zed-industries/label-text-cow 
Changed label and text to be generic over static and owned strings
 2023-02-21 17:05:57 -08:00
Mikayla Maki b500ed3171 Changed label and text to be generic over static strings and owned strings 2023-02-21 16:47:29 -08:00
Kay Simmons 6b6e4e3bfe Add basic test for labeled tasks 2023-02-21 16:14:22 -08:00