Commit Graph
7217 Commits
Author SHA1 Message Date
Julia 56a2ce7916 Format problematic DB macros 2022-12-19 11:11:10 -05:00
Julia 6fb3bad2e8 Merge pull request #1983 from zed-industries/multi-buffer-git-gutter
Multi buffer git gutter
2022-12-19 10:53:42 -05:00
Antonio Scandurra 65009f0de3 Merge pull request #1982 from zed-industries/fix-rust-analyzer
Update rust-analyzer's `disk_based_diagnostics_progress_token`
2022-12-19 16:33:01 +01:00
Antonio Scandurra a67e6c5fa0 Update rust-analyzer's disk_based_diagnostics_progress_token 2022-12-19 16:27:25 +01:00
Max Brunsfeld a5157c29b9 Add ZED_STATELESS env var, for suppressing persistence
Use this env var in the start-local-collaboration script to make
the behavior more predictable.
2022-12-17 12:03:51 -08:00
Kay Simmons 01965a898d Merge pull request #1972 from zed-industries/recent-workspace
Recent Project Picker
2022-12-16 15:51:57 -08:00
Kay Simmons 84cc21c659 Clear stale projects if they no longer exist 2022-12-16 15:45:17 -08:00
Antonio Scandurra e183b2682c collab 0.4.1 2022-12-16 12:02:03 +01:00
Antonio Scandurra b71434f91e Merge pull request #1975 from zed-industries/screen-share-after-reconnect
Prevent screen-sharing from being lost after a reconnection
2022-12-16 12:00:02 +01:00
Antonio Scandurra e113a04990 Bump protocol version 2022-12-16 11:48:14 +01:00
Antonio Scandurra d9bedda67f Remove unnecessary PeerId parsing code 2022-12-16 11:45:42 +01:00
Antonio Scandurra 1c7d888e94 Fix test ensuring room is left when disconnected from LiveKit 2022-12-16 10:52:32 +01:00
Max Brunsfeld e5718bced7 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
JuliaandNathan Sobo da9a238d26 Handle reversed=true for multi-buffer git-hunks-in-range iteration
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-12-15 18:17:32 -05:00
JuliaandMax Brunsfeld 48c0db49da Rewrite multi-buffer aware git hunks in range to be more correct
Less ad-hoc state tracking, rely more on values provided by the
underlying data

Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-12-15 17:09:09 -05:00
Antonio Scandurra 86c8818915 collab 0.4.0 2022-12-15 19:37:53 +01:00
Antonio Scandurra b0c4e7e74a Merge pull request #1971 from zed-industries/update-app-icons
Update Zed & Zed Preview icons
2022-12-15 19:37:04 +01:00
Antonio Scandurra f5b481efea Merge pull request #1973 from zed-industries/fix-reconnects-after-deploy
Improve reconnections to server after it is redeployed
2022-12-15 19:35:42 +01:00
Antonio Scandurra 15b96a0531 Minor stylistic change 2022-12-15 16:40:16 +01:00
Antonio Scandurra e65429a22b 💄 2022-12-15 16:34:59 +01:00
Antonio Scandurra 7c312a10d9 Merge branch 'main' into fix-reconnects-after-deploy 2022-12-15 15:32:05 +01:00
Joseph T. Lyons 0d786c95f6 Merge pull request #1954 from zed-industries/add-symlink-to-applications-directory-in-dmg 2022-12-15 08:06:17 -05:00
Antonio Scandurra 656a8b3217 collab 0.3.14 2022-12-15 11:31:51 +01:00
Antonio Scandurra 7ad68a05d7 Allow nulls in projects.host_connection_{id,server_id}
The server version on stable won't be able to fill values for those
columns when we deploy the migration to preview.

With this commit we're also dropping the unused `worktree_extensions`
and `project_activity_periods` tables. The last version of the server
on stable (0.2.6) doesn't contain any code that accesses those tables.
2022-12-15 11:30:51 +01:00
Antonio Scandurra 6d307e42c2 collab 0.3.13 2022-12-15 10:53:17 +01:00
Antonio Scandurra 62c95778b1 Avoid logging an error when user who hasn't joined any room disconnects 2022-12-15 10:45:03 +01:00
Antonio Scandurra b4a4b40623 Use "id" nomenclature more consistently 2022-12-15 10:15:59 +01:00
Antonio Scandurra 21a1f1881d Re-add server_id indices for room_participants/project_collaborators 2022-12-15 09:58:25 +01:00
Julia c0c47139aa Get tests building again 2022-12-15 00:17:28 -05:00
Max Brunsfeld c50083fff9 Fix stale server queries, use foreign keys from connectionsn to servers 2022-12-14 17:34:24 -08:00
Kay Simmons 399c32157d Add keybinding 2022-12-14 16:14:16 -08:00
Kay Simmons e127b2ed66 Add open recent project to file menu 2022-12-14 16:02:48 -08:00
Kay Simmons 9e5b4dce01 Add recent project picker 2022-12-14 15:59:50 -08:00
Max Brunsfeld ea8b0afaa4 Bump RPC version due to multibuffer following PR 2022-12-14 15:34:22 -08:00
Max Brunsfeld a02df9136d Merge pull request #1921 from zed-industries/multibuffer-following
Allow following collaborators into editors with multi-excerpt buffers (refactors + find-all-refs)
2022-12-14 15:33:11 -08:00
Max Brunsfeld 7ae981d252 Add integration test coverage for following into multibuffers 2022-12-14 15:28:58 -08:00
Max Brunsfeld fefe89ace0 Use run_until_parked instead of 'condition' in all integration tests 2022-12-14 15:05:35 -08:00
Nate Butler 69641aa7c8 Update Zed & Zed Preview icons 2022-12-14 17:41:18 -05:00
Max Brunsfeld c5c2520d43 Introduce a ViewId message, identifying views across calls 2022-12-14 14:40:07 -08:00
Max Brunsfeld 56d1279c14 Handle retina screens in start-local-collaboration script 2022-12-14 11:50:15 -08:00
Max Brunsfeld e14f9ef153 Clean up state matching in from_state_proto using let/else statements 2022-12-14 11:09:33 -08:00
Max Brunsfeld a5ca25c78a In editor following test, apply excerpt removals to both followers 2022-12-14 11:08:08 -08:00
Antonio Scandurra b04de1ceca WIP 2022-12-14 19:25:07 +01:00
Antonio Scandurra d661abda72 WIP 2022-12-14 18:02:39 +01:00
Antonio Scandurra f7070792a9 Introduce an epoch to ConnectionId and PeerId 2022-12-14 15:55:56 +01:00
Antonio Scandurra 0f76cdc93c collab 0.3.12 2022-12-14 11:43:33 +01:00
Antonio Scandurra 58a552dd2f Add more logging to Room 2022-12-14 11:43:12 +01:00
Antonio Scandurra 8ae2b7e343 Instrument rpc::Server::start and reduce cleanup timeout again 2022-12-14 11:42:12 +01:00
Antonio Scandurra 5191772ece collab 0.3.11 2022-12-14 11:25:04 +01:00
Antonio Scandurra be5c610880 Try using a longer timeout for cleaning up stale rooms 2022-12-14 11:24:36 +01:00