Commit Graph
602 Commits
Author SHA1 Message Date
Kay Simmons 978bb6cc53 Merge pull request #1791 from zed-industries/drag-tabs-more-places
Drag tabs more places
2022-10-25 00:34:50 -07:00
K Simmons 6c5af0b436 fix failing test 2022-10-25 00:11:59 -07:00
Max Brunsfeld 665718e8f0 collab 0.2.0 2022-10-24 17:06:54 -07:00
Antonio Scandurra 8325be5b10 Show shared screen as a pane item 2022-10-24 10:04:08 +02:00
Antonio Scandurra 231fc0f698 Merge branch 'main' into screen-sharing
# Conflicts:
#	crates/collab/src/integration_tests.rs
#	crates/collab/src/main.rs
#	styles/src/styleTree/workspace.ts
2022-10-21 14:29:45 +02:00
Nathan Sobo ede148827a Use fake LiveKit server to test we can send frames when screen sharing 2022-10-19 19:14:55 -06:00
K Simmons a5f1eff761 flattened layers and elevations 2022-10-19 13:02:51 -07:00
Mikayla Maki fa315f4d1c Restored chat_panel, just in case 2022-10-19 11:42:29 -07:00
Antonio ScandurraandNathan Sobo df546c2fc0 Use live_kit_client::TestServer in integration tests
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-19 16:35:34 +02:00
Antonio Scandurra afc1bee25f Start on implementing a fake live-kit server 2022-10-19 14:58:50 +02:00
Antonio Scandurra 5126184bfb Merge remote-tracking branch 'origin/main' into screen-sharing 2022-10-19 10:04:56 +02:00
K Simmons bf8b74f366 remove rocksdb 2022-10-18 17:21:15 -07:00
Kay Simmons a93578dca3 Merge pull request #1773 from zed-industries/rusqlite
Swap to sqlite for client persistence
2022-10-18 16:11:54 -07:00
Mikayla Makiand 3cf445cb27 Finished up initial sqlite implemention
Co-Authored-By: kay@zed.dev
2022-10-18 15:58:05 -07:00
Max Brunsfeld ed7c9109d4 0.61.0 2022-10-18 13:05:16 -07:00
K Simmons 061a82a267 Merge branch 'main' into elevations 2022-10-18 12:47:15 -07:00
K Simmons eabcaf8e8a Get rusqlite more shippable 2022-10-18 11:43:18 -07:00
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