oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,517 Commits 1 Branch 0 Tags
1bc052d76b2d93cde2dcbd4b0b8e93bb536e7c3e
Commit Graph
967 Commits
Author SHA1 Message Date
Mikaylaandmax a3623ec2b8 Add renames 
co-authored-by: max <max@zed.dev>
 2023-08-09 12:20:48 -07:00
Mikayla 707e41ce1f Merge branch 'collab-panel' of github.com:zed-industries/zed into collab-panel 2023-08-09 10:44:50 -07:00
Mikayla 99daa73325 Merge branch 'main' into collab-panel 2023-08-09 10:37:22 -07:00
Nate Butler beffe6f6a9 WIP BROKEN 2023-08-09 12:44:34 -04:00
Mikayla a5cb4c6d52 Fix selections and enter-to-create-file 2023-08-09 08:54:24 -07:00
Nathan Sobo db96fb1307 Merge remote-tracking branch 'origin/main' into paint-context 2023-08-08 18:27:16 -06:00
Mikayla bbe4a9b388 Position and style the channel editor correctly 
Fix a bug where some channel updates would be lost
Add channel name sanitization before storing in the database
 2023-08-08 14:06:29 -07:00
Mikayla b708824d37 Position and style the channel editor correctly 
Fix a bug where some channel updates would be lost
Add channel name sanitization before storing in the database
 2023-08-08 12:46:13 -07:00
Mikayla 6a7245b92b Fix positioning on face piles, fix panic on member invite removal 2023-08-08 10:44:44 -07:00
Nathan Sobo b2d9ccc0a2 Move more window methods off AsyncAppContext 2023-08-08 11:38:07 -06:00
Nathan Sobo d896d89842 Store an AnyWindowHandle in WindowContext 2023-08-08 11:08:37 -06:00
Nathan Sobo dba2facd23 Remove window via handles 2023-08-07 22:58:01 -06:00
Nathan Sobo 486f5bc6ca Get compiling 2023-08-07 19:08:58 -06:00
Max Brunsfeld 299906346e Change collab panel icon 2023-08-07 18:04:41 -07:00
Mikaylaandmax fa71de8842 Tune UX for context menus 
Co-authored-by: max <max@zed.dev>
 2023-08-07 17:14:14 -07:00
Mikaylaandmax bedf60b6b2 Improve local collaboration script to accept a zed impersonate 
Gate channels UI behind a flag

co-authored-by: max <max@zed.dev>
 2023-08-07 16:45:13 -07:00
Mikaylaandmax 8980a9f1c1 Add settings for removing the assistant and collaboration panel buttons 
Add a not-logged-in state to the collaboration panel

co-authored-by: max <max@zed.dev>
 2023-08-07 16:27:47 -07:00
MikaylaandMax e37e76fc0b Add context menu controls to the channel member management 
co-authored-by: Max <max@zed.dev>
 2023-08-07 15:29:30 -07:00
MikaylaandMax 9913067e51 Remove admin and member button 
Fix bug with invites in the member list
Fix bug when there are network errors in the member related RPC calls

co-authored-by: Max <max@zed.dev>
 2023-08-07 14:32:13 -07:00
Mikayla 90cdbe8bf3 Fix modal click throughs and adjust height for channel modal 2023-08-07 13:39:05 -07:00
Mikayla f1957b1737 Push focus and fix keybindings 2023-08-07 13:31:58 -07:00
Max Brunsfeld c537cf2a57 Merge branch 'main' into collab-panel 2023-08-07 11:50:40 -07:00
Nathan Sobo adc50469ff WIP 2023-08-06 12:45:31 -06:00
Max BrunsfeldandMikayla 2ccd153233 Fix joining descendant channels, style channel invites 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 16:21:43 -07:00
Max BrunsfeldandMikayla 87b2d599c1 Flesh out channel member management 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 14:12:08 -07:00
Max Brunsfeld a2486de045 Don't expose channel admin actions in UI if user isn't admin 2023-08-04 10:24:46 -07:00
Max Brunsfeld 95b1ab9574 Implement channel member removal, permission check for member retrieval 2023-08-03 18:03:40 -07:00
Max BrunsfeldandMikayla 4a6c73c6fd Lay-out channel modal with picker beneath channel name and mode buttons 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-03 16:15:29 -07:00
Nathan Sobo 485c0a482e Don't refcount window handles 2023-08-03 17:11:47 -06:00
Max BrunsfeldandMikayla a7e883d956 Implement basic channel member management UI 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-03 14:49:01 -07:00
Max Brunsfeld 9a1dd0c6bc Fetch channel members before constructing channel mgmt modal 2023-08-03 12:10:53 -07:00
Mikayla Maki 6c4964f071 WIP: continue channel management modal and rename panel to collab_panel 2023-08-03 11:40:55 -07:00
Mikayla Maki d450c4be9a WIP: add custom channel modal 2023-08-03 10:59:09 -07:00
Max Brunsfeld 0ae1f29be8 wip 2023-08-02 15:52:56 -07:00
Max Brunsfeldandmikayla fca8cdcb8e Start work on rendering channel participants in collab panel 
Co-authored-by: mikayla <mikayla@zed.dev>
 2023-08-02 15:09:37 -07:00
Nathan Sobo 884cee6dfd Get tests compiling returning WindowHandle<V: View> from add_window 2023-08-02 14:05:03 -06:00
Mikayla Maki 7145f47454 Fix a few bugs in how channels are moved around 2023-08-01 18:42:14 -07:00
Max BrunsfeldandMikayla 6a404dfe31 Start work on adding sub-channels in the UI 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-01 18:20:25 -07:00
Mikayla Makiandmax 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 MakiandMax 56d4d5d1a8 Add root channel UI 
co-authored-by: Max <max@zed.dev>
 2023-08-01 13:33:31 -07:00
Mikayla Maki 7434d66fdd WIP: Add channel creation to panel UI 2023-08-01 13:22:06 -07:00
Max Brunsfeld 7954b02819 Start work on displaying channels and invites in collab panel 2023-07-31 18:00:14 -07:00
Max Brunsfeld bb70901e71 WIP 2023-07-28 13:24:43 -07:00
Mikayla Maki 40c293e184 Add channel_modal file 2023-07-28 13:24:43 -07:00
Mikayla Maki 1549c2274f Create channel adding modal 2023-07-28 13:24:43 -07:00
Max Brunsfeld 4a088fc4ae Make major collab panel headers non-interactive 2023-07-28 13:24:43 -07:00
Max Brunsfeld fc49194535 Restructure collab panel, make contact finder into a normal modal 2023-07-28 13:24:43 -07:00
Max Brunsfeld 87dfce94ae Rename contact list theme to collab panel 2023-07-28 13:24:43 -07:00
Max Brunsfeld 969ecfcfa2 Reinstate all of the contacts popovers' functionality in the new collaboration panel 2023-07-28 13:24:43 -07:00
Mikayla Maki 7f9df6dd24 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