Commit Graph
39175 Commits
Author SHA1 Message Date
Antonio Scandurra 360b75f5f7 Move logic for joining project into a global action in collab_ui 2022-10-05 15:04:03 +02:00
Antonio Scandurra bca261ef76 Set room location when active workspace changes 2022-10-05 15:03:40 +02:00
Antonio Scandurra b8005ca30d Set room only after project has been shared to avoid flicker 2022-10-05 11:19:44 +02:00
Antonio Scandurra 06ab1095a1 Always open project when added to a call via the + button 2022-10-05 11:01:28 +02:00
Antonio Scandurra 4ae097e515 Use AppContext instead of MutableAppContext for ActiveCall::global 2022-10-05 10:51:51 +02:00
Max Brunsfeld 2a70aa2499 Start work on toggling block comments for HTML 2022-10-04 17:27:03 -07:00
Julia 0158d09e1b Merge pull request #1632 from zed-industries/git-gutter
Tracking PR: Git gutter
2022-10-04 15:12:28 -04:00
JuliaandJoseph Lyons fe44ccb7fb Use correct start row for hunk retrieval & correct paint offset
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
2022-10-04 15:04:42 -04:00
Nate Butlerandgibusu 5b3b9d7b93 Minor one dark improvements
Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com>
2022-10-04 14:53:06 -04:00
Nate Butlerandgibusu b0799befaa Remap theme ramp domains
Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com>
2022-10-04 14:49:57 -04:00
Max Brunsfeld 5cd57b40e5 0.58.0 2022-10-04 11:43:52 -07:00
Nate Butlerandgibusu b3ebaf5bfe Add bottom padding and spacing between items to pickers
Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com>
2022-10-04 13:55:01 -04:00
Antonio ScandurraandMax Brunsfeld d60225f118 Automatically share project when creating the room
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-04 19:25:48 +02:00
Nate Butler cc4fa7f385 Update palettes 2022-10-04 13:16:11 -04:00
Nate Butler ee605713ff Update offline indicator 2022-10-04 12:36:31 -04:00
Antonio ScandurraandMax Brunsfeld 12511d3e5e Don't show share button for remote projects
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-04 18:35:54 +02:00
Antonio Scandurra 7ac25fa0a9 Re-emit notifications and events from ActiveCall
This lets us only observe and subscribe to the active call without
needing to track the underlying `Room` if it changes, which implies
writing the same boilerplate over and over.
2022-10-04 18:15:56 +02:00
Antonio Scandurra 212a83ba85 Simplify Collaborator to stop including the user
It can be retrieved from the `Room` and we're guaranteed to have
a room in order to have collaborators in a project.
2022-10-04 18:00:54 +02:00
Antonio Scandurra cc8f7e188c Show notification when a new project is shared and allow joining it 2022-10-04 16:55:41 +02:00
Antonio Scandurra 1021f51bf8 Show Share button for unshared projects when inside of a room 2022-10-04 15:56:20 +02:00
Antonio Scandurra 66d211f378 Use a different style for inactive participants 2022-10-04 15:06:20 +02:00
Antonio Scandurra 396fc03fff Implement Room::set_location 2022-10-04 11:46:01 +02:00
Max Brunsfeld 9d35b3a73c Fix autoclose error when cursor was at column 0 2022-10-03 17:44:18 -07:00
Mikayla Maki bb80bd45bf Removed debugs, simplified settings 2022-10-03 17:43:05 -07:00
Mikayla Maki b49d0e782c Fixed a couple bugs in tests and worktree path handling 2022-10-03 17:18:38 -07:00
Max Brunsfeld b2af17d4e6 Add assertions to test for autoclose with embedded languages 2022-10-03 13:24:37 -07:00
Max Brunsfeld be8a57a454 Merge pull request #1680 from zed-industries/telemetry-tweaks
Telemetry tweaks
2022-10-03 13:08:05 -07:00
JuliaandMikayla Maki c680a6ebbc Once again respect user settings for git gutter
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 15:42:30 -04:00
Max Brunsfeld 013b9e5e49 Remove unnecessary min_id_length option from amplitude requests 2022-10-03 12:13:27 -07:00
JuliaandMikayla Maki 0615592f81 Rename head text to indicate that it's not always going to be from head
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 15:11:06 -04:00
JuliaandMikayla Maki fb3c69db37 Move git gutter settings out of editor settings
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 14:53:33 -04:00
Nate Butler 305666c74a WIP 2022-10-03 14:08:01 -04:00
Max BrunsfeldandJoseph Lyons 5d0a51773f Mark platform as "Zed" for telemetry events from the app
Co-authored-by: Joseph Lyons <joseph@zed.dev>
2022-10-03 11:05:45 -07:00
JuliaandMikayla Maki 20cff89bed Store repo content path as absolute
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 14:00:58 -04:00
Max BrunsfeldandJoseph Lyons 401558bd8b Set staff user property in telemetry
Co-authored-by: Joseph Lyons <joseph@zed.dev>
2022-10-03 10:52:57 -07:00
Julia aaa4984ffe Be clearer about using GitFilesIncluded setting 2022-10-03 11:58:48 -04:00
Antonio Scandurra 32dcfcb580 Emit event on Room when a user shares a new project 2022-10-03 17:12:07 +02:00
Antonio Scandurra a51b32b51f Automatically fetch remote participant users in Room 2022-10-03 16:09:49 +02:00
Antonio Scandurra 48129ae74f Prevent calls from users who aren't contacts 2022-10-03 15:54:20 +02:00
Antonio Scandurra 1387ab407e Fix randomized integration test failure 2022-10-03 15:50:47 +02:00
Antonio Scandurra bbe6bf0d96 Adapt integration tests to always pass a room id to Project::share
Randomized test is failing, so we'll look into that next.
2022-10-03 15:44:11 +02:00
Mikayla Maki 47bdc1803e Added clarification for git gutter settings 2022-10-02 18:42:03 -07:00
Mikayla Maki dac3ea36df Touched up settings text 2022-10-02 18:35:19 -07:00
Mikayla Maki 9c8d2c9ac5 Merge branch 'main' into git-gutter 2022-10-02 18:03:50 -07:00
Mikayla Maki 2bebd94b45 Fix stray merge failure 2022-10-02 18:02:25 -07:00
Antonio Scandurra bd6ded2a9a Cache CGEventSource and avoid leaking CGEvent when handling events 2022-10-02 18:01:49 -07:00
Max Brunsfeld eee7f90cf4 0.57.0 2022-10-02 18:01:49 -07:00
Max Brunsfeld 89d9f3cf72 Fix FakeServer to expect new GetPrivateUserInfo request 2022-10-02 18:01:49 -07:00
Mikayla Maki a64bc92bb5 add proto stuff 2022-10-02 18:01:37 -07:00
Mikayla Maki da143ae46a made git diff rendering respect line wrap 2022-10-02 18:00:13 -07:00