Mikayla Maki
e86d51029b
removed dev file
2022-10-24 13:20:45 -07:00
Mikayla Maki
cf5330544c
Delete generate-db.rs
2022-10-24 13:19:30 -07:00
Mikayla Maki
93e41a9b77
Added notify call
2022-10-24 13:18:02 -07:00
Max Brunsfeld
ace5b792ce
Merge branch 'main' into auto-deploy-collab
2022-10-24 12:01:32 -07:00
Antonio Scandurra
1083b78372
Merge pull request #1793 from zed-industries/screen-sharing
...
Introduce screen-sharing
2022-10-24 16:53:05 +01:00
Nathan Sobo and Antonio Scandurra
07e02516f0
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 Scandurra and Nathan Sobo
019cc9959b
Bump protocol version
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-24 17:06:40 +02:00
Antonio Scandurra and Nathan Sobo
31139b7be7
Provide LiveKit environment variables on Kubernetes
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-24 17:03:18 +02:00
Antonio Scandurra and Nathan Sobo
ad8d284e3a
Replace Screen Sharing label with Screen
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-24 16:50:56 +02:00
Antonio Scandurra
d3d4e4b1de
Add test for screen-sharing
2022-10-24 15:17:25 +02:00
Antonio Scandurra
a63f6b99d8
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
70299e8135
Remove stray log statement
2022-10-24 11:02:41 +02:00
Antonio Scandurra
98160bd1ff
Focus shared screen item when clicking on it
2022-10-24 11:02:10 +02:00
Antonio Scandurra
493bc28cc6
Simplify room events
2022-10-24 10:53:44 +02:00
Antonio Scandurra
75a35cabc4
Allow opening shared screen via the contacts popover
2022-10-24 10:47:47 +02:00
Antonio Scandurra
8325be5b10
Show shared screen as a pane item
2022-10-24 10:04:08 +02:00
Max Brunsfeld
52670ff022
Improve deploy scripts
2022-10-21 15:50:14 -07:00
Nate Butler
5fed35f669
Merge pull request #1783 from zed-industries/add-new-internal-themes
...
Add new internal themes
2022-10-21 18:31:02 -04:00
Max Brunsfeld
459cf41b9c
Run migrations via a collab subcommand
2022-10-21 14:28:55 -07:00
Max Brunsfeld
2885c26b68
Publish collab docker images on CI, deploy pre-built images
2022-10-21 14:24:43 -07:00
Joseph T. Lyons
0e4abe475e
Merge pull request #1781 from zed-industries/switch-to-mixpanel
...
Switch to mixpanel
2022-10-21 15:26:08 -04:00
Nate Butler and Mikayla Maki
201899d76d
WIP Re-case internal and experiment theme folders
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2022-10-21 13:04:24 -04:00
Antonio Scandurra
231fc0f698
Merge branch 'main' into screen-sharing
...
# Conflicts:
# crates/collab/src/integration_tests.rs
# crates/collab/src/main.rs
# styles/src/styleTree/workspace.ts
2022-10-21 14:29:45 +02:00
Antonio Scandurra
03b5a26fd6
Leave Zed room when LiveKit room disconnects
2022-10-21 14:21:45 +02:00
Antonio Scandurra
17a5db3a44
Switch back to using the legacy screen capturing API
...
The new API is buggy and inconsistent, so I think we should move on
for now.
2022-10-21 11:54:52 +02:00
Antonio Scandurra
97bd7980ac
Re-build live_kit_client when MACOSX_DEPLOYMENT_TARGET changes
2022-10-21 10:18:03 +02:00
Antonio Scandurra
f42838534b
Remove unused LKDisplays API
2022-10-21 10:12:24 +02:00
Nathan Sobo
22770aa942
Apply a slight stylistic tweak
2022-10-20 18:38:27 -06:00
Kay Simmons
8e7aaa83a5
Merge pull request #1784 from zed-industries/fix-keymap-panic
...
Fix panic in keymap parsing
2022-10-20 16:39:38 -07:00
K Simmons
a03d4d9802
catch keymap string only modifiers and no key
2022-10-20 16:30:07 -07:00
Joseph T Lyons
359c56fef4
Temporarily restore integration with Amplitude
...
This will be reverted later, once we fully switch to Mixpanel
2022-10-20 19:27:55 -04:00
Nate Butler
5420ed2bd3
Merge branch 'main' into add-new-internal-themes
2022-10-20 18:19:21 -04:00
Nathan Sobo
56bec8d03b
Preserve symlinks in WebRTC.framework to avoid bundle signing failure
2022-10-20 14:37:04 -06:00
Nate Butler
b7bd53285d
Rename One theme and update Zed default theme
2022-10-20 15:31:17 -04:00
Nathan Sobo
b4bd448577
Fix crash loading Swift symbol (I think associated with concurrency)
...
I add /usr/lib/swift as an rpath, which seems to fix the issue even though
there doesn't seem to be a relevant library at that location on my machine.
Based on my research, wondering if `-Wl,-weak-lswiftCompatibilityConcurrency`
is also required for this to work on older OSes, but holding back for now.
2022-10-20 13:18:53 -06:00
Antonio Scandurra
4a1508d121
WIP
2022-10-20 20:17:54 +02:00
Joseph T Lyons
0e80083a5f
Merge branch 'main' into switch-to-mixpanel
2022-10-20 13:53:39 -04:00
Antonio Scandurra
add5b58c06
WIP: Try using the new ScreenCaptureKit API when possible
2022-10-20 19:28:21 +02:00
3700985491
Return an optional response when creating users via invites
...
If the user already exists, we return none. This will allow the web frontend
to avoid reporting a "join alpha" user event but also not error.
Co-Authored-By: Max Brunsfeld <max@zed.dev >
Co-Authored-By: Joseph Lyons <joseph@zed.dev >
2022-10-20 10:52:34 -06:00
Antonio Scandurra and Nathan Sobo
3c7e9017bd
Add 5s timeout to LiveKit API requests
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-20 18:01:47 +02:00
Antonio Scandurra and Nathan Sobo
4772d6da50
Bump minimum macOS version to 10.15.7
...
This solves an issue with loading Swift libraries when running the
x86_64 binary.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-20 18:01:41 +02:00
Antonio Scandurra
9f72b7a711
Copy WebRTC into Zed.app/Contents/Frameworks when bundling the app
2022-10-20 15:38:54 +02:00
Antonio Scandurra
aece1d4b9a
Delete all live-kit rooms when server is shut down
2022-10-20 14:34:05 +02:00
Antonio Scandurra
5556dc0075
Update live-kit to the latest version
2022-10-20 14:03:26 +02:00
Antonio Scandurra
3c54e91bec
Simplify renderer interface for live-kit-client
2022-10-20 09:51:55 +02:00
Nathan Sobo
6589a1c448
Ensure we can send a second frame
2022-10-19 19:21:09 -06:00
Nathan Sobo
ede148827a
Use fake LiveKit server to test we can send frames when screen sharing
2022-10-19 19:14:55 -06:00
Joseph T Lyons
5d2a5ebcff
Remove debug prints
2022-10-19 17:30:00 -04:00
Kay Simmons
10fe3e1a3b
Merge pull request #1665 from zed-industries/elevations
...
Tracking PR: Elevations
2022-10-19 13:59:34 -07:00
Max Brunsfeld
c364f52803
Merge pull request #1777 from zed-industries/impersonate-via-secret-token
...
Impersonate via secret token
2022-10-19 13:32:40 -07:00
Mikayla Maki