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
Kay Simmons
62967ade28
Merge pull request #1944 from zed-industries/vim-page-movement
...
Add scroll commands to vim mode
2022-12-08 14:58:19 -08:00
Kay Simmons
2a890bfbfb
remove printline
2022-12-08 14:45:22 -08:00
Kay Simmons
242f038bbd
fix final failing tests
2022-12-08 14:39:48 -08:00
Joseph Lyons
545be48e9f
collab 0.3.0
2022-12-08 16:35:13 -05:00
Joseph T. Lyons
fad9ffead0
Merge pull request #1941 from zed-industries/Allow-overwriting-signup-data
...
Allow overwriting signup data if a user signs up more than once with the same email address
2022-12-08 16:11:28 -05:00
Kay Simmons
30501f50df
Merge pull request #1946 from zed-industries/fix-zombie-tooltips
...
notify views when hover finishes in tooltip wrapper
2022-12-08 11:37:12 -08:00
Kay Simmons
0a29b85759
notify views when hover finishes in tooltip wrapper
2022-12-08 11:26:46 -08:00
Kay Simmons
712a83a759
Merge pull request #1945 from zed-industries/drag-and-drop-deadzones
...
Add deadzones to drag and drop
2022-12-08 11:15:42 -08:00
Kay Simmons
b715ae962f
Add deadzones to drag and drop
2022-12-07 17:46:00 -08:00
Kay Simmons
b39cac2c5c
fix failing tests from incorrect follow behavior
2022-12-07 17:25:48 -08:00
Kay Simmons
acac7d292d
Refactor editor scrolling and implement scroll commands from vim mode
2022-12-07 16:39:32 -08:00
Antonio Scandurra
076d3160e4
Merge pull request #1943 from zed-industries/fix-inviting-existing-users-via-different-mail
...
Fix inviting existing users via a different email address
2022-12-07 14:19:17 +01:00
Joseph Lyons
33bb73561d
Ensure that subsequent signup happens after initial
...
We can't rely on the fact that the test won't run fast enough such that both `created_at`s are the same time. This ensures the subsequent signup happens after the initial one and that the database doesn't overwrite the initial one.
2022-12-07 08:15:01 -05:00
Antonio Scandurra
4b8d249446
Fix inviting user that had already signed up via a different email
2022-12-07 14:07:01 +01:00
Antonio Scandurra
e1ac6969ad
Add failing test showcasing inviting existing user via different email
2022-12-07 14:06:59 +01:00
Joseph Lyons
567c5d35a6
Clean up test
2022-12-07 07:12:27 -05:00
Joseph Lyons
88be85b671
Remove comment
2022-12-06 17:18:54 -05:00
Joseph Lyons
7c16866b9d
Allow overwriting signup data if a user signs up more than once with the same email address
2022-12-06 17:12:12 -05:00
Antonio Scandurra
9e9a3ffc54
Merge pull request #1938 from zed-industries/fix-metrics
...
Query project count as `i64` instead of `i32` when gathering metrics
2022-12-06 15:04:27 +01:00
Antonio Scandurra
dd6e608acb
Query project count as i64 instead of i32 when gathering metrics
...
Using the latter will cause a type mismatch when performing the query.
2022-12-06 15:00:32 +01:00
Antonio Scandurra
bf8bf8f065
Merge pull request #1937 from zed-industries/fix-accepted-contact-busy-status
...
Fix busy status when accepting a contact request
2022-12-06 10:29:58 +01:00
Antonio Scandurra
65fbf7270d
Fix busy status when accepting a contact request
...
Previously, we would send an contact update when accepting a request
using the same `busy` status for both the requester and the responder.
This was obviously wrong and caused the requester to see their own
busy status as the newly-added responder contact's status.
2022-12-06 10:19:34 +01:00
Antonio Scandurra
ba0a0d6d1f
Merge pull request #1935 from zed-industries/reconnections-2
...
Move in-memory server state to the database
2022-12-06 09:22:59 +01:00
Antonio Scandurra
8a6347fb32
Remove unused UserId import from seed script
2022-12-06 09:07:25 +01:00
Max Brunsfeld
53d92b5253
Merge pull request #1936 from zed-industries/c-outline-pointers
...
Include outline items for c/c++ functions returning pointers
2022-12-05 14:03:49 -08:00
Max Brunsfeld and Julia Risley
84743a8161
Include outline items for c/c++ functions returning pointers-to-pointers, references
...
Co-authored-by: Julia Risley <julia@zed.dev >
2022-12-05 13:56:21 -08:00
Mikayla Maki
e8ed37c906
Merge pull request #1858 from zed-industries/add-lisp
...
Added tree sitter support for scheme and racket
2022-12-05 11:40:52 -08:00
Mikayla Maki
3e1250e04e
Got tree sitter integration to a shippable place
2022-12-05 11:31:52 -08:00
Mikayla Maki
b8372d8b08
Added experimental support for scheme, racket, and commonlisp
2022-12-05 11:31:49 -08:00
Antonio Scandurra
bda5b033a3
Fix warnings
2022-12-05 19:45:56 +01:00
Antonio Scandurra
b5ede1d2d9
Merge branch 'main' into reconnections-2
2022-12-05 19:18:40 +01:00
Antonio Scandurra
55447288ed
Send diagnostic summaries synchronously
2022-12-05 19:07:06 +01:00
Antonio Scandurra
3b695006dd
Return project collaborators and connection IDs in a RoomGuard
2022-12-05 18:37:01 +01:00
Antonio Scandurra and Nathan Sobo
10c5d40966
Update sea-orm to fix bug on failure to commit transactions
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-12-05 18:36:25 +01:00
Antonio Scandurra
b2ce835207
Remove project_id foreign key from room_participants
2022-12-05 15:16:06 +01:00
Antonio Scandurra
24eaca97a8
Upgrade sea-orm
2022-12-05 14:56:01 +01:00
Antonio Scandurra
6c0395255b
Remove random pauses to prevent the database from deadlocking
2022-12-05 12:03:45 +01:00
Antonio Scandurra
c9171a1e0a
Retry transactions if there's a serialization failure during commit
2022-12-05 10:49:53 +01:00
Antonio Scandurra
7baa5da995
Remove duplication between transaction and room_transaction
2022-12-05 09:46:03 +01:00
Julia
46b5e02961
Merge pull request #1924 from zed-industries/simon-says-dont-move
...
Do not reorder tab opened by follower to end of item list
2022-12-04 13:00:07 -05:00
Mikayla Maki
c6d3910167
Merge pull request #1798 from zed-industries/serializing-workspaces
...
Serializing workspaces
2022-12-03 16:56:02 -08:00
Mikayla Maki
ac9aea668b
Fixed and error message and properly initialized the DB
2022-12-03 16:46:35 -08:00
Mikayla Maki
00d65f3b8d
Removed old code
2022-12-03 16:27:45 -08:00
Mikayla Maki
363701e157
Found db parallelism problem :(
2022-12-03 16:26:37 -08:00
Mikayla Maki
ac539a2a36
And library change
2022-12-03 16:13:02 -08:00
Mikayla Maki
912be7491c
Fixed bad rebase
2022-12-03 16:12:07 -08:00
Mikayla Maki
fd12a32b34
Added user notifications
2022-12-03 16:06:02 -08:00
Mikayla Maki