Commit Graph
4885 Commits
Author SHA1 Message Date
K Simmons 04df459a03 dont reference db items 2022-10-18 10:13:04 -07:00
Antonio Scandurra e7b474d9b4 Delete room when no participants are left 2022-10-18 14:59:12 +02:00
Nathan Sobo 821e2f0689 WIP 2022-10-17 23:25:04 -06:00
Mikayla Maki 438f9d831f WIP 2022-10-17 17:04:30 -07:00
Mikayla Maki c66887ae3f Converted to using rusqlite 2022-10-17 17:04:30 -07:00
K Simmons 783ae7d125 more wip 2022-10-17 17:04:29 -07:00
K Simmons 5644001981 wip 2022-10-17 17:04:19 -07:00
K Simmons 55b9eff3df Add cursor blink setting and replicate cursor shape to remote collaborators 2022-10-17 16:20:47 -07:00
Antonio Scandurra 186219322f WIP 2022-10-17 18:00:54 +02:00
Antonio Scandurra d8a5dae23b WIP: Start integrating screen-sharing 2022-10-17 14:50:05 +02:00
Antonio Scandurra f665daba66 WIP: Start integrating with LiveKit when creating/joining rooms 2022-10-17 12:20:55 +02:00
Antonio Scandurra 561483fc6d Add live_kit_server::api::Client::{create,delete}_room 2022-10-17 11:24:09 +02:00
Antonio Scandurra 1f201e9778 WIP: start on live_kit_server 2022-10-17 09:59:16 +02:00
Antonio Scandurra c6985e9d30 Move live_kit to live_kit_client and add live_kit_server 2022-10-17 09:59:16 +02:00
Joseph T Lyons 34bc185fcb Merge branch 'main' into settings-for-journal 2022-10-16 12:42:18 -04:00
Max Brunsfeld 669898eef8 v0.60.4 2022-10-14 12:44:22 -07:00
Max Brunsfeld 93419ef049 0.60.3 2022-10-14 09:35:57 -07:00
Nathan Sobo 069acfbcfb 0.60.2 2022-10-13 16:26:26 -06:00
Max Brunsfeld eb66efff1e v0.60.1 2022-10-13 10:00:07 -07:00
Kay Simmons f2eeab02cd Merge pull request #1740 from zed-industries/fix-dock-focus-issues
Fix Dock infinite loop
2022-10-12 16:19:09 -07:00
Max Brunsfeld a2c9a67558 Re-export basic text types from text and language crates
Also avoid production dependencies on fs and rope in collab
2022-10-12 15:48:19 -07:00
K Simmons 4535c88e85 fix lock merge error 2022-10-12 15:39:04 -07:00
Kay Simmons 2039df032f Merge branch 'main' into fix-dock-focus-issues 2022-10-12 15:18:28 -07:00
K SimmonsandMikayla Maki 0dce131b26 Remove focus filtering from gpui so all focus events result in focus-in and focus-out calls
Remove pane focused event in favor of focus_in at the workspace level
Added is_child to ViewContext to determine if a given view is a child of the current view
Fix issue where dock would get in a infinite loop when activated after dragging an item out of it
Fix issue where the last focused view in an item was not correctly refocused when a pane is focused after switching active tabs

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-12 15:10:00 -07:00
Max Brunsfeld 5e75674f90 v0.60.0 2022-10-12 14:18:40 -07:00
Mikayla Maki 7a600eabfc Updated new vim tests with new rope crate 2022-10-11 20:25:39 -07:00
Mikayla Maki ddb1066075 Added theme and dock anchor saving :D 2022-10-11 19:18:29 -07:00
Mikayla Maki a2a958ccdc Moved settings_file.rs into settings crate. Should be ready to start now :D 2022-10-11 16:03:38 -07:00
Mikayla Maki a9ce687031 Finished refactoring out fs and rope 2022-10-11 15:25:54 -07:00
Mikayla Maki 9bdb8d31c0 Moved fs to it's own crate, build failing due to cyclic dependency on rope 2022-10-11 13:03:36 -07:00
Mikayla Maki 5b7fb3f6e8 Undid change to paths variables and cleaned up leftovers 2022-10-11 12:48:30 -07:00
Mikayla Maki ffba611591 Added theme writing code, really bad race condition 2022-10-11 12:48:30 -07:00
Antonio Scandurra 794bea8dbd Merge remote-tracking branch 'origin/main' into room 2022-10-10 15:43:38 +02:00
Max Brunsfeld b5febeb3d9 0.59.0 2022-10-07 14:51:18 -07:00
Max Brunsfeld 428e05a5fa Merge pull request #1404 from zed-industries/html-support
Basic html support
2022-10-06 10:32:44 -07:00
Antonio Scandurra f3b459ede5 Move contacts panel features into collab_ui 2022-10-06 14:00:14 +02:00
Antonio Scandurra 6597a5183a Move incoming calls into ActiveCall 2022-10-06 09:50:26 +02:00
Max Brunsfeld 62b9331c6f Add a test for multi-language auto-indent 2022-10-05 17:59:31 -07:00
Antonio Scandurra bca261ef76 Set room location when active workspace changes 2022-10-05 15:03:40 +02:00
Julia 0158d09e1b Merge pull request #1632 from zed-industries/git-gutter
Tracking PR: Git gutter
2022-10-04 15:12:28 -04:00
Max Brunsfeld 5cd57b40e5 0.58.0 2022-10-04 11:43:52 -07:00
Max Brunsfeld eee7f90cf4 0.57.0 2022-10-02 18:01:49 -07:00
d2ac8018bb Refactored git repository code to seperate out repository entry tracking data and git2 mocking code.
Co-authored-by: Max <max@zed.dev>
Co-authored-by: Julia <julia@zed.dev>
2022-09-30 17:33:34 -07:00
484bdb0fc0 Start a test for remote git data updating
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-09-30 15:51:32 -04:00
Max Brunsfeld 3eec42aa41 0.57.0 2022-09-29 16:47:20 -07:00
Joseph T Lyons a750ebe868 Change journal location setting name to "path" and default to ~ 2022-09-29 17:12:57 -04:00
Mikayla Maki ab3f820edc WIP, re-doing fs and fake git repos 2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 1da2b63b97 Move git related things into specialized git crate
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Mikayla Maki 0199141606 Get the test to failing,,, correctly 2022-09-29 13:16:02 -04:00
7a52a2dde5 WIP pls amend me
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00