Commit Graph
10389 Commits
Author SHA1 Message Date
Max BrunsfeldandJulia Risley 67e188a015 Add Buffer::language_at, update MultiBuffer to use it
Co-authored-by: Julia Risley <floc@unpromptedtirade.com>
2022-09-28 12:32:04 -07:00
Max Brunsfeld a2e57e8d71 Add basic syntax highlighting for CSS 2022-09-28 12:32:04 -07:00
Max Brunsfeld 21fb2b9bf1 Tweak HTML indents and highlights 2022-09-28 12:32:04 -07:00
Max Brunsfeld e4f5e85c3c Add JavaScript language injection in HTML 2022-09-28 12:32:04 -07:00
Isaac Clayton a48995c782 Basic html highlighting + lsp support 2022-09-28 12:32:04 -07:00
Antonio ScandurraandNathan Sobo 04d194924e WIP: Start on ActiveCall
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-09-28 19:50:13 +02:00
Antonio ScandurraandNathan Sobo 46b61feb9a Open popup window when receiving a call
We still need to style and allow people to accept the call but this
is a good starting point.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-09-28 19:35:24 +02:00
Antonio ScandurraandNathan Sobo aa3cb8e35e Rename collab_titlebar_item crate to collab_ui
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-09-28 19:14:31 +02:00
Max Brunsfeld 5d8fe33bd2 Merge pull request #1635 from zed-industries/new-signup-flow
Implement APIs for new signup flow
2022-09-28 10:08:12 -07:00
Nathan SoboandAntonio Scandurra 8ff4f044b7 Start a call when clicking on a contact in the contacts popover
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2022-09-28 11:02:26 -06:00
Nate Butler ab3a6f775e WIP Titlebar styling 2022-09-28 13:01:12 -04:00
Nathan SoboandAntonio Scandurra 815cf44647 Rename AddParticipantPopover to ContactsPopover
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2022-09-28 09:10:01 -06:00
Nathan SoboandAntonio Scandurra f5b2d56efd Remove contacts menu bar extra
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2022-09-28 09:06:28 -06:00
1d1bd3975a Remove current user from contacts
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-28 11:33:38 +02:00
Antonio Scandurra 4b73239972 WIP: Start moving contacts panel into "add participants" popover 2022-09-28 11:33:38 +02:00
Antonio Scandurra 0a29e13d4a Add active style when participant popover is open 2022-09-28 11:33:38 +02:00
Antonio Scandurra 0db6eb2fb8 Show add participant popover on click 2022-09-28 11:33:38 +02:00
Antonio Scandurra 782309f369 Rename contacts_titlebar_item to collab_titlebar_item 2022-09-28 11:33:38 +02:00
Antonio Scandurra 5a3a85b2c8 Introduce a + button in the titlebar 2022-09-28 11:33:38 +02:00
Antonio Scandurra c8a48e8990 Extract contacts titlebar item into a separate crate
This allows us to implement a new contacts popover that uses the
`editor` crate.
2022-09-28 11:33:38 +02:00
Antonio ScandurraandNathan Sobo 80ab144bf3 Ring users upon connection if somebody was calling them before connecting
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-09-28 11:33:38 +02:00
Antonio ScandurraandNathan Sobo 6aa0f0b200 Leave room automatically on disconnection
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-09-28 11:33:38 +02:00
Antonio Scandurra f0c45cbceb Remove projects from basic calls test for now 2022-09-28 11:33:38 +02:00
Antonio Scandurra e55e7e4844 Leave room when Room entity is dropped 2022-09-28 11:33:38 +02:00
Antonio Scandurra 573086eed2 Always rely on the server to cancel the incoming call 2022-09-28 11:33:38 +02:00
Antonio Scandurra df285def59 💄 2022-09-28 11:33:38 +02:00
Antonio Scandurra bb9ce86a29 Introduce the ability of declining calls 2022-09-28 11:33:38 +02:00
Antonio Scandurra f4697ff4d1 Prevent the same user from being called more than once 2022-09-28 11:33:38 +02:00
Antonio Scandurra 55b095cbd3 Implement joining a room and sending updates after people join/leave 2022-09-28 11:33:38 +02:00
Antonio ScandurraandNathan Sobo 4a9bf8f4fe Introduce call infrastructure
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-09-28 11:33:38 +02:00
Antonio Scandurra ebb5ffcedc Introduce the ability of creating rooms on the server 2022-09-28 11:33:38 +02:00
Antonio ScandurraandNathan Sobo 0b1e372d11 Start sketching out an integration test for calls
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-09-28 11:33:38 +02:00
Antonio Scandurra 8fec7da799 WIP 2022-09-28 11:33:38 +02:00
Antonio Scandurra 46019f8537 WIP 2022-09-28 11:33:38 +02:00
Antonio Scandurra 8fc12b0bf0 Merge pull request #1664 from zed-industries/slow-undo
Use a `SumTree` as the backing storage of `UndoMap`
2022-09-28 10:33:07 +01:00
Antonio Scandurra f54c1f05c5 💄 2022-09-28 11:27:07 +02:00
Antonio Scandurra e17627b07d Use a SumTree as the backing storage of UndoMap
This makes it cheap to clone and avoids slowdowns when there the undo
history is long.
2022-09-28 11:24:45 +02:00
Antonio Scandurra 5bfd03a180 Correctly report protocol changes in script/changes-since-last-release 2022-09-28 10:40:30 +02:00
Mikayla Maki 500ff131db Merge pull request #1663 from zed-industries/terminal-bugs
A few small bug fixes
2022-09-27 17:18:21 -07:00
Mikayla Maki 1905ba55d4 Fixed minor issue with pane defocusing Co-Authored-By: kay@zed.dev 2022-09-27 17:05:21 -07:00
Max Brunsfeld f2ebb094a2 Remove unnecessary index drop in down migration 2022-09-27 16:58:03 -07:00
Mikayla Maki 9b32678b05 Fixed terminal stealing focus 2022-09-27 16:43:32 -07:00
Max BrunsfeldandJoseph Lyons 1db75ca2cf Make device_id optional on signups table
This way, signup won't fail if for some reason, the
user's client-side JS doesn't provide an amplitude
device id.

Co-authored-by: Joseph Lyons <joseph@zed.dev>
2022-09-27 16:04:01 -07:00
Max Brunsfeld 5d0b6a3da7 Merge branch 'main' into new-signup-flow 2022-09-27 15:35:05 -07:00
Max BrunsfeldandJoseph Lyons ac0bcf3809 Limit the size of the buffer in the OpenTelemetryLog command
Co-authored-by: Joseph Lyons <joseph@zed.dev>
2022-09-27 15:09:16 -07:00
Max BrunsfeldandJoseph Lyons c1c5eaeaf9 Use the amplitude API key secret on CI
Co-authored-by: Joseph Lyons <joseph@zed.dev>
2022-09-27 14:25:28 -07:00
Max BrunsfeldandJoseph Lyons 3bd68128d7 Add command to view the telemetry log
Co-authored-by: Joseph Lyons <joseph@zed.dev>
2022-09-27 14:20:13 -07:00
Max Brunsfeld f2db3abdb2 Always allow overriding amplitude API key via a runtime env var 2022-09-27 12:42:27 -07:00
Nate Butler 0674ca14d9 Update the neutral ramp for Andromeda 2022-09-27 12:49:51 -04:00
Mikayla Maki 75594fc3e3 Merge pull request #1659 from zed-industries/terminal-selections
Terminal Touch ups
2022-09-26 20:58:36 -07:00