Antonio Scandurra
7e411ae098
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
1bbb7dd126
Leave Zed room when LiveKit room disconnects
2022-10-21 14:21:45 +02:00
Antonio Scandurra
78969d0938
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
bac3dc1ccd
Re-build live_kit_client when MACOSX_DEPLOYMENT_TARGET changes
2022-10-21 10:18:03 +02:00
Antonio Scandurra
ae44a38285
Remove unused LKDisplays API
2022-10-21 10:12:24 +02:00
Nathan Sobo
77b13b1356
Merge pull request #1788 from zed-industries/style
...
Apply a slight stylistic tweak
2022-10-20 18:43:50 -06:00
Nathan Sobo
2e97e2dbfd
Apply a slight stylistic tweak
2022-10-20 18:38:27 -06:00
Kay Simmons
75ec5c3b1b
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
3a456b09cb
catch keymap string only modifiers and no key
2022-10-20 16:30:07 -07:00
Nathan Sobo
0ef62fc334
Preserve symlinks in WebRTC.framework to avoid bundle signing failure
2022-10-20 14:37:04 -06:00
Nathan Sobo
6bdb08ab9c
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
db8b8ef66b
WIP
2022-10-20 20:17:54 +02:00
Max Brunsfeld
fad6cfef05
Merge pull request #1782 from zed-industries/idempotent-redemption
...
Return an optional response when creating users via invites
2022-10-20 10:46:50 -07:00
Antonio Scandurra
9b8e6cce02
WIP: Try using the new ScreenCaptureKit API when possible
2022-10-20 19:28:21 +02:00
9858906463
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
be1dc01d9e
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
de24b4b4e8
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
629d3d473c
Copy WebRTC into Zed.app/Contents/Frameworks when bundling the app
2022-10-20 15:38:54 +02:00
Antonio Scandurra
5dc82d3df8
Delete all live-kit rooms when server is shut down
2022-10-20 14:34:05 +02:00
Antonio Scandurra
76a1b81e45
Update live-kit to the latest version
2022-10-20 14:03:26 +02:00
Antonio Scandurra
99aa1219d2
Simplify renderer interface for live-kit-client
2022-10-20 09:51:55 +02:00
Nathan Sobo
69472f7823
Ensure we can send a second frame
2022-10-19 19:21:09 -06:00
Nathan Sobo
723fa83909
Use fake LiveKit server to test we can send frames when screen sharing
2022-10-19 19:14:55 -06:00
Kay Simmons
c2b9b08944
Merge pull request #1665 from zed-industries/elevations
...
Tracking PR: Elevations
2022-10-19 13:59:34 -07:00
K Simmons
2aa2e5af7a
fix issue with text component and adjust layer selections some more
2022-10-19 13:45:00 -07:00
K Simmons
b7c439f4c4
Fixup some theme inconsistencies and incorrect layer selections
2022-10-19 13:39:46 -07:00
Max Brunsfeld
e6b29086a9
Merge pull request #1777 from zed-industries/impersonate-via-secret-token
...
Impersonate via secret token
2022-10-19 13:32:40 -07:00
Max Brunsfeld
83e4e26989
Allow setting ZED_SERVER_URL to URL of a collab server
2022-10-19 13:27:14 -07:00
K Simmons
caec9c1f45
fixed issue in testbench
2022-10-19 13:13:50 -07:00
K Simmons
e3809c267d
flattened layers and elevations
2022-10-19 13:02:51 -07:00
Nate Butler
0d9eecd2ed
WIP command palette changes
2022-10-19 14:55:22 -04:00
Mikayla Maki
8098697847
Re-removed chat panel
2022-10-19 11:45:20 -07:00
Mikayla Maki
4c2f8406c7
Restored chat_panel, just in case
2022-10-19 11:42:29 -07:00
Nate Butler
e0a477265d
Use lab color interpolation to improve the dark end of accent ramps
2022-10-19 14:35:09 -04:00
Nate Butler
364c3f2f00
Contrast rebalances
2022-10-19 13:03:58 -04:00
Nate Butler
75c79d60fe
Improve contrast/scanability of constants
2022-10-19 13:03:34 -04:00
Nate Butler
5b2dd8e4d0
build-themes -> build to fix building themes on save
2022-10-19 13:03:09 -04:00
Nate Butler
9e8e227b46
Rebalance rose-pine-dawn
2022-10-19 13:02:34 -04:00
Julia
adf7578007
Merge pull request #1778 from zed-industries/trackpad-scroll-snap-lock
...
Lock trackpad scrolling in buffers to axis until broken free
2022-10-19 12:02:59 -04:00
Antonio Scandurra and Nathan Sobo
b6e5aa3bb0
Use live_kit_client::TestServer in integration tests
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-19 16:35:34 +02:00
Antonio Scandurra
288c039929
Start on implementing a fake live-kit server
2022-10-19 14:58:50 +02:00
Antonio Scandurra
fb5c6493cf
WIP: Start on a fake implementation of live-kit
2022-10-19 13:53:40 +02:00
Antonio Scandurra
3160d07b9c
Model pending screen share in Room
2022-10-19 11:38:24 +02:00
Antonio Scandurra
e49fc9f4b1
Prevent Room from screen-sharing twice
2022-10-19 10:45:51 +02:00
Antonio Scandurra
ed6f482e68
Exercise unpublish_track in live_kit_client
2022-10-19 10:39:48 +02:00
Antonio Scandurra
773f569385
Add control to toggle screen-sharing
2022-10-19 10:19:20 +02:00
Antonio Scandurra
219793afcc
Merge remote-tracking branch 'origin/main' into screen-sharing
2022-10-19 10:04:56 +02:00
Mikayla Maki
571636c526
Fixed cursor color being black
2022-10-18 22:26:14 -07:00
Julia
cbc15b6b58
Lock trackpad scrolling in buffers to axis until broken free
2022-10-19 01:00:13 -04:00
Max Brunsfeld
c410935c9c
Allow impersonating users via the api token, bypassing oauth
2022-10-18 17:36:54 -07:00
Antonio Scandurra
Nathan Sobo
Kay Simmons
Max Brunsfeld
Nate Butler
Mikayla Maki
Julia
Julia