Julia
d100acd3b1
Initial hacky displaying of git gutter in multi-buffers
2022-12-13 12:35:58 -05:00
Max Brunsfeld
267c632c8b
Merge branch 'main' into multibuffer-following
2022-12-13 09:25:18 -08:00
Antonio Scandurra
25d67d7356
collab 0.3.2
2022-12-13 15:16:41 +01:00
Antonio Scandurra
cab76ed705
Merge pull request #1965 from zed-industries/preserve-calls-during-server-restarts
...
Automatically re-join call when server is restarted
2022-12-13 14:12:32 +01:00
Antonio Scandurra
929faa1772
Move creation of room_id index into its own migration
2022-12-13 13:57:41 +01:00
Antonio Scandurra
b7a0330fe0
Run until parked before asserting about participants in restart test
2022-12-13 13:53:51 +01:00
Antonio Scandurra
5ee6f231a1
Reset connection pool when tearing down the server in tests
2022-12-13 13:51:25 +01:00
Antonio Scandurra
335120c8d2
Use a synchronous mutex for ConnectionPool
2022-12-13 13:50:51 +01:00
Antonio Scandurra
bd7fd58be1
Simulate server restarts in randomized test
2022-12-13 12:18:38 +01:00
Antonio Scandurra
7f9c82f759
Allow server to see client disconnection before giving up on reconnecting
2022-12-13 12:17:21 +01:00
Antonio Scandurra
de7e1cca78
Fix typo in index name
2022-12-13 11:44:48 +01:00
Antonio Scandurra
eb27691bc1
Include room_id in CallCanceled message
...
This ensures we don't accidentally cancel old calls.
2022-12-13 11:43:09 +01:00
Antonio Scandurra
c78ee63d14
💄
2022-12-13 11:37:39 +01:00
Antonio Scandurra
a8cf47ea2a
Delete stray debug statement
2022-12-13 11:36:40 +01:00
Antonio Scandurra
d96ef3d256
Delete stale rooms/participants after RECONNECT_TIMEOUT
2022-12-13 11:32:37 +01:00
Mikayla Maki
eb47856219
Merge pull request #1963 from zed-industries/fix-workspace-corner-cases
...
Fix small workspace deserialization corner cases
2022-12-12 17:56:43 -08:00
Mikayla Maki and Max
1088cf54b4
Allow an empty center group to successfully deserialize into an empty pane.
...
Fix error when deserializing pane axis which caused it's members.len() > 1 invariant to be violated
Fix failure to gain center pane focus when failing to deserialize a center pane entirely
Co-authored-by: Max <max@zed.dev >
2022-12-12 17:51:16 -08:00
Max Brunsfeld
aabe7f51ce
Merge pull request #1962 from zed-industries/scrolling-breaks-follow
...
Avoid breaking follow when syncing leader's scroll position
2022-12-12 16:37:58 -08:00
Mikayla Maki
b215286f35
Merge pull request #1961 from zed-industries/fix-next-screen-bug
...
Fixed issue where the NextScreen action would never have an effect
2022-12-12 15:47:16 -08:00
Mikayla Maki
5062938a1a
Fixed issue where the NextScreen action would never have an effect
2022-12-12 15:36:51 -08:00
c30daa21c6
Avoid breaking follow when syncing leader's scroll position
...
Co-authored-by: Mikayla Maki <mikayla@zed.dev >
Co-authored-by: Kay Simmons <kay@zed.dev >
2022-12-12 15:36:30 -08:00
Mikayla Maki
93235f43a2
Merge pull request #1959 from zed-industries/serializing-bug-fixes
...
Add check for if the user wants a blanks workspace when deserializing
2022-12-12 13:37:43 -08:00
Mikayla Maki and Max
18db08aefb
Fetch last workspace explicitly when starting Zed
...
co-authored-by: Max <max@zed.dev >
2022-12-12 13:29:18 -08:00
Mikayla Maki
6c9e2f3cf8
Add check for if the user wants a blanks workspace when deserializing
2022-12-12 12:25:52 -08:00
Max Brunsfeld
3eb2f901b0
Merge branch 'main' into multibuffer-following
2022-12-12 11:47:39 -08:00
Antonio Scandurra
21aacbb216
Allow re-joining room after server restarts
2022-12-12 16:03:21 +01:00
Antonio Scandurra
00ea997010
Merge pull request #1950 from zed-industries/reconnect-to-room
...
Automatically re-join call when client connection drops
2022-12-12 13:40:21 +01:00
Antonio Scandurra
ed8737d08d
Always cast connection ids to i32
...
Postgres doesn't support unsigned types. This also adds indices to
support querying `project_collaborators` and `room_participants`
by connection id.
2022-12-12 11:43:08 +01:00
Antonio Scandurra
8071e4abab
Rename connection_lost to answering_connection_lost
2022-12-12 11:43:08 +01:00
Antonio Scandurra
0d3bcec64b
Delete hosted projects from database when connection is lost
2022-12-12 11:43:08 +01:00
Antonio Scandurra
bfec91b3ba
Introduce random reconnections in the randomized test
2022-12-12 11:43:08 +01:00
Antonio Scandurra
504f4fa2e8
Fix test_calls_on_multiple_connections after adding room reconnection
2022-12-12 11:43:08 +01:00
Antonio Scandurra
7b91966883
Re-join room when client temporarily loses connection
2022-12-12 11:43:08 +01:00
Antonio Scandurra
e567b2338c
Remove Executor trait from collab and use an enum instead
...
This will let us save off the executor and avoid using generics.
2022-12-12 11:43:08 +01:00
Joseph Lyons
91533ba484
Remove extraneous newline
2022-12-10 09:56:42 -05:00
Joseph Lyons
5801188db8
Add symlink to applications directory in dmg
2022-12-10 09:48:40 -05:00
Mikayla Maki
634d217350
Merge pull request #1951 from zed-industries/dock-bugfix
...
Fix infinite loop in dock position when deserializing
2022-12-09 13:19:44 -08:00
Mikayla Maki
3f5f89e89d
Updated is_child() to omit self
2022-12-09 12:07:49 -08:00
Mikayla Maki
8048428390
Fix infinite loop in dock position when deserializing
2022-12-09 11:50:24 -08:00
Antonio Scandurra
3e67fbb560
collab 0.3.1
2022-12-09 08:19:41 +01:00
Antonio Scandurra
390fa79f89
Merge pull request #1949 from zed-industries/do-not-drop-unregistered
...
Don't drop `unregistered` column in reconnection support migration
2022-12-09 08:15:53 +01:00
Antonio Scandurra
1dde768596
Don't drop unregistered column in reconnection support migration
...
We don't use this column anymore because, when a project is unshared, we
simply remove it from the `projects` table. However, this column is expected
in the stable version of the server and the database is shared between stable
and preview. If we dropped it, stable would start throwing errors.
2022-12-09 08:11:18 +01:00
Mikayla Maki
9635044dd2
Merge pull request #1940 from zed-industries/terminal-collab-kickoff
...
WIP - move terminal to project as pre-prep for collaboration
2022-12-08 20:30:32 -08:00
Mikayla Maki
76196726d0
Remove terminal container view, switch to notify errors
2022-12-08 20:21:00 -08:00
Mikayla Maki
5ace676783
WIP
2022-12-08 20:21:00 -08:00
Mikayla Maki
ee2013b8ec
WIP
2022-12-08 20:21:00 -08:00
Mikayla Maki
aa6ff9bdb3
Fix bugs resulting from refactoring the terminal into project and workspace halves
2022-12-08 20:21:00 -08:00
Mikayla Maki
33fca2f334
Rearrange the terminal code to not have a cyclic dependency with the project
2022-12-08 20:21:00 -08:00
Mikayla Maki
14efea9aa8
WIP - move terminal to project as pre-prep for collaboration
2022-12-08 20:21:00 -08:00
Max Brunsfeld
da93213aee
v0.68.x dev
2022-12-08 15:33:02 -08:00
Julia