oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,101 Commits 1 Branch 0 Tags
d74fb97158e5e886c1aab3c2b8aa45df35641661
Commit Graph
7101 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra d74fb97158 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
Mikayla Maki 5879dcc4e9 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 34388a1d31 Updated is_child() to omit self 2022-12-09 12:07:49 -08:00
Mikayla Maki 3a4f8d267a Fix infinite loop in dock position when deserializing 2022-12-09 11:50:24 -08:00
Antonio Scandurra 0366d725ea collab 0.3.1 2022-12-09 08:19:41 +01:00
Antonio Scandurra 8bd7b28056 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 2697112a8a 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 9bd4bc8813 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 925c9e13bb Remove terminal container view, switch to notify errors 2022-12-08 20:21:00 -08:00
Mikayla Maki da100a09fb WIP 2022-12-08 20:21:00 -08:00
Mikayla Maki c42da5c9b9 WIP 2022-12-08 20:21:00 -08:00
Mikayla Maki 2733f91d8c Fix bugs resulting from refactoring the terminal into project and workspace halves 2022-12-08 20:21:00 -08:00
Mikayla Maki 83aefffa38 Rearrange the terminal code to not have a cyclic dependency with the project 2022-12-08 20:21:00 -08:00
Mikayla Maki 1b8763d0cf WIP - move terminal to project as pre-prep for collaboration 2022-12-08 20:21:00 -08:00
Max Brunsfeld 7dde54b052 v0.68.x dev 2022-12-08 15:33:02 -08:00
Kay Simmons b1e37378dc 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 e61a38b3a9 remove printline 2022-12-08 14:45:22 -08:00
Kay Simmons 2cf48c03f9 fix final failing tests 2022-12-08 14:39:48 -08:00
Joseph Lyons ab978ff1a3 collab 0.3.0 2022-12-08 16:35:13 -05:00
Joseph T. Lyons dcd4b8f7db 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 2eb335158b 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 10aecc310e notify views when hover finishes in tooltip wrapper 2022-12-08 11:26:46 -08:00
Kay Simmons 750e7eb833 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 36bc90b2b8 Add deadzones to drag and drop 2022-12-07 17:46:00 -08:00
Kay Simmons f6f41510d2 fix failing tests from incorrect follow behavior 2022-12-07 17:25:48 -08:00
Kay Simmons cffb064c16 Refactor editor scrolling and implement scroll commands from vim mode 2022-12-07 16:39:32 -08:00
Antonio Scandurra 3313387b28 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 d71d543337 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 665219fb00 Fix inviting user that had already signed up via a different email 2022-12-07 14:07:01 +01:00
Antonio Scandurra 1b8f23eeed Add failing test showcasing inviting existing user via different email 2022-12-07 14:06:59 +01:00
Joseph Lyons 5f31907127 Clean up test 2022-12-07 07:12:27 -05:00
Joseph Lyons 97989b04a0 Remove comment 2022-12-06 17:18:54 -05:00
Joseph Lyons 694840cdd6 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 1920de81d9 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 3b5b48c043 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 2080d3efff 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 fc7b01b74e 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 f1b35981c2 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 744714b478 Remove unused UserId import from seed script 2022-12-06 09:07:25 +01:00
Max Brunsfeld 35549ffabe 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 BrunsfeldandJulia Risley 855f17c378 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 f23f294b86 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 0921178b42 Got tree sitter integration to a shippable place 2022-12-05 11:31:52 -08:00
Mikayla Maki 30872d3992 Added experimental support for scheme, racket, and commonlisp 2022-12-05 11:31:49 -08:00
Antonio Scandurra cd08d289aa Fix warnings 2022-12-05 19:45:56 +01:00
Antonio Scandurra 9a62150dce Merge branch 'main' into reconnections-2 2022-12-05 19:18:40 +01:00
Antonio Scandurra 7bbd97cfb9 Send diagnostic summaries synchronously 2022-12-05 19:07:06 +01:00
Antonio Scandurra 5443d9cffe Return project collaborators and connection IDs in a RoomGuard 2022-12-05 18:37:01 +01:00
Antonio ScandurraandNathan Sobo be3fb1e985 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 b97c35a468 Remove project_id foreign key from room_participants 2022-12-05 15:16:06 +01:00