oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,769 Commits 1 Branch 0 Tags
f68eda97fba2bef9c280c6fe098a636f6dffbef8
Commit Graph
109 Commits
Author SHA1 Message Date
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
Mikayla Maki b500ed3171 Changed label and text to be generic over static strings and owned strings 2023-02-21 16:47:29 -08:00
Mikayla Maki 4ea7a24b93 Made the 'update zed to collaborate' button clickable 2023-02-16 14:53:50 -08:00
Kay Simmons 3e92e4d110 fix unsaved change 2023-02-03 12:47:20 -08:00
Kay Simmons 303216291b Move sharing status indicator out of the call crate and into collab_ui in order so that the model doesn't depend on the view 2023-02-03 11:17:50 -08:00
Kay Simmons 460dc62888 start adding setting for the screen sharing status indicator 2023-01-31 15:17:16 -08:00
Kay Simmons e35db69dbd Add call status indicator to the status bar 2023-01-31 15:00:49 -08:00
Kay Simmons ea0dd8972f Merge pull request #2090 from zed-industries/workspace-window-position-persistence 
Workspace window position persistence
 2023-01-27 15:24:01 -08:00
Kay Simmons a369fb8033 better but still broken 2023-01-25 17:05:57 -08:00
Kay Simmons 5eac797a93 mostly working now 2023-01-25 11:36:38 -08:00
Kay Simmons 15799f7af6 wip 2023-01-25 11:32:19 -08:00
Petros Amoiridis 160870c9de Improve user notification 
The message is not really true. When one declines, the other person can notice that the contact request  is not pending any more. They will know. Switching to not alerted is closer to what is really happening.
 2023-01-25 19:46:51 +02:00
Petros AmoiridisandAntonio Scandurra 35524db136 Add a confirmation prompt 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 18:55:08 +02:00
Petros AmoiridisandAntonio Scandurra db978fcb6c Add an x mark icon to the list of contacts 
We want to be able to remove contacts from our list. This was not possible. This change add an icon and dispatches the RemoveContact action.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 13:10:29 +02:00
Mikayla Maki d060114f00 Added complete scripts for generating third party license files 2023-01-23 12:47:12 -08:00
Mikayla Maki 97203e1e02 Fix broken merge 2023-01-20 09:19:58 -08:00
Mikayla Maki 88170df7f0 Switched from active hover to NSViews acceptsFirstMouse API 2023-01-19 15:21:26 -08:00
Mikayla Maki 4eeb1aec50 Adds UI for showing the followed-by status to collaboration 2023-01-19 14:22:12 -08:00
Mikayla Maki 4a46227909 Change incoming call notification to only require one click 2023-01-19 11:43:46 -08:00
Nathan Sobo 3cffee4065 Merge pull request #2011 from zed-industries/project-reconnection 
Retain connection to remote projects when temporarily disconnected
 2023-01-06 18:01:08 -07:00
Kay Simmons 73e7967a12 working f and t bindings 2023-01-06 14:24:20 -08:00
Max BrunsfeldandAntonio Scandurra 55ebfe8321 Handle unshared projects when rejoining a room 
Also, construct remote projects via the room, to guarantee
that the room can manage the projects' sharing lifecycle.

Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2022-12-20 11:10:46 -08:00
Max BrunsfeldandNathan Sobo 70dd586be9 Start work on rejoining rooms, supplying all project info at once 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-12-19 17:50:43 -08:00
Max Brunsfeld ad37034960 Identify LiveKit room participants by user id, not peer id 
This way, their participant id can remain the same when they reconnect.
 2022-12-15 17:19:32 -08:00
Antonio Scandurra 05e99eb67e Introduce an epoch to ConnectionId and PeerId 2022-12-14 15:55:56 +01:00
Mikayla Maki 925c9e13bb Remove terminal container view, switch to notify errors 2022-12-08 20:21:00 -08:00
Antonio Scandurra 9a62150dce Merge branch 'main' into reconnections-2 2022-12-05 19:18:40 +01:00
Mikayla Maki a1f273278b Added user notifications 2022-12-03 16:06:02 -08:00
Kay Simmons 1cc3e4820a working serialized writes with panics on failure. Everything seems to be working 2022-12-03 16:06:01 -08:00
Mikayla Makiand 3451a3c7fe Rebase - Got Zed compiling and fixed a build error due to conflicting dependencies that cargo didn't catch :( 
Co-Authored-By: kay@zed.dev
 2022-12-03 16:04:10 -08:00
Antonio Scandurra 40073f6100 Wait for acknowledgment before sending the next project update 2022-11-14 15:32:49 +01:00
Antonio Scandurra 6871bbbc71 Start moving Store state into the database 2022-11-11 12:06:43 +01:00
Antonio Scandurra 0b231e58fd Show placeholder text for pickers 2022-11-04 10:18:47 +01:00
Nate Butler 6a07f59d34 Merge pull request #1831 from zed-industries/theme-tweaks 
Theme tweaks
 2022-11-02 10:04:55 -04:00
Antonio Scandurra d275474b23 Don't focus incoming call and project shared notification windows 2022-11-02 14:17:16 +01:00
Mikayla Maki 1820be4990 Adds a little spacing between the share button and the screenshare icon 2022-10-31 10:19:06 -07:00
Nate Butler 9148e1d30a Update icons 
- `x_mark_thin` combined into `x_mark`
- updated many icons
- remove unused icons
 2022-10-28 12:59:05 -04:00
Antonio Scandurra 5984be3d84 Display call notifications on all screens 2022-10-26 12:05:56 +02:00
Antonio ScandurraandMax Brunsfeld ddc71653ad Maintain scroll position in contacts list 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-10-25 18:36:33 +02:00
Antonio Scandurra f364a15d89 Prevent expanded dock from hiding contacts popover 2022-10-25 13:47:37 +02:00
Antonio Scandurra 2a3773240d Show a Calling indicator right away when initiating a call 2022-10-25 11:05:57 +02:00
Nathan SoboandAntonio Scandurra 8c2ff69515 Render a tooltip on toggle screen sharing button 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-10-24 09:44:05 -06:00
Antonio ScandurraandNathan Sobo 7e4d582d1e Replace Screen Sharing label with Screen 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-24 16:50:56 +02:00
Antonio Scandurra 9860dbbbea Set location on ActiveCall even before there's a room 
We will automatically call `Room::set_location` once a room has been
assigned.
 2022-10-24 15:07:25 +02:00
Antonio Scandurra f99d70500c Allow opening shared screen via the contacts popover 2022-10-24 10:47:47 +02:00