mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-09 12:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
7089 commits 557 branches 843 tags 273 MiB
Commit graph

664 commits

Author SHA1 Message Date
Julia
847376a4f5 Start dragging project panel entries 
Co-Authored-By: Kay Simmons <kay@zed.dev>
 2022-11-07 17:00:01 -05:00
Max Brunsfeld
18ff459014 collab 0.2.2 2022-11-04 10:04:14 -07:00
Max Brunsfeld
be6ee3cbff Start work on ERB language support 2022-11-04 09:33:59 -07:00
Antonio Scandurra
0b231e58fd Show placeholder text for pickers 2022-11-04 10:18:47 +01:00
Max Brunsfeld
d222904471 Add basic support for ruby 
Co-authored-by: Kay Simmons <kay@zed.dev>
 2022-11-03 15:52:33 -07:00
Max Brunsfeld
601ec40ddc Bump tree-sitter-rust for let-else, let-chains 2022-11-03 12:35:12 -07:00
Max Brunsfeld
c411cb7eef collab 0.2.1 2022-11-02 10:27:26 -07:00
Joseph T Lyons
3caa7a4916 v0.64.x dev 2022-11-02 12:57:53 -04:00
Mikayla Maki
950626fe9e Upgraded migration library to remove panic 2022-10-28 11:36:41 -07:00
Max Brunsfeld
02cf7679a3 0.63.x dev 2022-10-26 23:04:36 -07:00
Max Brunsfeld
fcfc4a4298 Dev 0.62.0 2022-10-26 16:38:38 -07:00
Max Brunsfeld
a4a8596a29 Store current release channel name in a file in the zed crate 2022-10-26 16:19:19 -07:00
Kay Simmons
8bd9577318
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
2ac537393d fix failing test 2022-10-25 00:11:59 -07:00
Max Brunsfeld
c96c8fd782 collab 0.2.0 2022-10-24 17:06:54 -07:00
Antonio Scandurra
476020ae84 Show shared screen as a pane item 2022-10-24 10:04:08 +02:00
Antonio Scandurra
7e411ae098 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
723fa83909 Use fake LiveKit server to test we can send frames when screen sharing 2022-10-19 19:14:55 -06:00
K Simmons
e3809c267d flattened layers and elevations 2022-10-19 13:02:51 -07:00
Mikayla Maki
4c2f8406c7 Restored chat_panel, just in case 2022-10-19 11:42:29 -07:00
Antonio Scandurra
b6e5aa3bb0 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
288c039929 Start on implementing a fake live-kit server 2022-10-19 14:58:50 +02:00
Antonio Scandurra
219793afcc Merge remote-tracking branch 'origin/main' into screen-sharing 2022-10-19 10:04:56 +02:00
K Simmons
79cf5dbd4b remove rocksdb 2022-10-18 17:21:15 -07:00
Kay Simmons
da5203011c
Merge pull request #1773 from zed-industries/rusqlite 
Swap to sqlite for client persistence
 2022-10-18 16:11:54 -07:00
Mikayla Maki
84c7aa9cad Finished up initial sqlite implemention 
Co-Authored-By: kay@zed.dev
 2022-10-18 15:58:05 -07:00
Max Brunsfeld
50ba8bdc9b 0.61.0 2022-10-18 13:05:16 -07:00
K Simmons
b0ddbeb0ad Merge branch 'main' into elevations 2022-10-18 12:47:15 -07:00
K Simmons
b06366ebb7 Get rusqlite more shippable 2022-10-18 11:43:18 -07:00
K Simmons
9c8dd66b20 dont reference db items 2022-10-18 10:13:04 -07:00
Antonio Scandurra
48a1dd1588 Delete room when no participants are left 2022-10-18 14:59:12 +02:00
Nathan Sobo
8c1c98a0bf WIP 2022-10-17 23:25:04 -06:00
Mikayla Maki
4b09f77950 WIP 2022-10-17 17:04:30 -07:00
Mikayla Maki
dbea3cf20c Converted to using rusqlite 2022-10-17 17:04:30 -07:00
K Simmons
aa8fa4a6d5 more wip 2022-10-17 17:04:29 -07:00
K Simmons
dbc03e2668 wip 2022-10-17 17:04:19 -07:00
K Simmons
40c3e925ad Add cursor blink setting and replicate cursor shape to remote collaborators 2022-10-17 16:20:47 -07:00
Antonio Scandurra
499b8f5f55 WIP 2022-10-17 18:00:54 +02:00
Antonio Scandurra
81d83841ab WIP: Start integrating screen-sharing 2022-10-17 14:50:05 +02:00
Antonio Scandurra
c9225bb87c WIP: Start integrating with LiveKit when creating/joining rooms 2022-10-17 12:20:55 +02:00
Antonio Scandurra
75c339851f Add live_kit_server::api::Client::{create,delete}_room 2022-10-17 11:24:09 +02:00
Antonio Scandurra
5d433b1666 WIP: start on live_kit_server 2022-10-17 09:59:16 +02:00
Antonio Scandurra
caeae38e3a Move live_kit to live_kit_client and add live_kit_server 2022-10-17 09:59:16 +02:00
Joseph T Lyons
9a381c1803 Merge branch 'main' into settings-for-journal 2022-10-16 12:42:18 -04:00
Max Brunsfeld
8044beffc7 v0.60.4 2022-10-14 12:44:22 -07:00
Max Brunsfeld
ad6f9b2499 0.60.3 2022-10-14 09:35:57 -07:00
Nathan Sobo
eef086f60f 0.60.2 2022-10-13 16:26:26 -06:00
Max Brunsfeld
cf499abf31 v0.60.1 2022-10-13 10:00:07 -07:00
Kay Simmons
d42bf8eebe
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
6cdf4e98fc 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
2ff6ffff58 fix lock merge error 2022-10-12 15:39:04 -07:00
Kay Simmons
27a87c3d9e
Merge branch 'main' into fix-dock-focus-issues 2022-10-12 15:18:28 -07:00
K Simmons
1d8717f4de 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
490a608663 v0.60.0 2022-10-12 14:18:40 -07:00
Mikayla Maki
b1f64d9550 Updated new vim tests with new rope crate 2022-10-11 20:25:39 -07:00
Mikayla Maki
e7b6d1befe Added theme and dock anchor saving :D 2022-10-11 19:18:29 -07:00
Mikayla Maki
5487f99ac7 Moved settings_file.rs into settings crate. Should be ready to start now :D 2022-10-11 16:03:38 -07:00
Mikayla Maki
0beb97547e Finished refactoring out fs and rope 2022-10-11 15:25:54 -07:00
Mikayla Maki
0a8e2f6bb0 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
a833652077 Undid change to paths variables and cleaned up leftovers 2022-10-11 12:48:30 -07:00
Mikayla Maki
cc8ae45012 Added theme writing code, really bad race condition 2022-10-11 12:48:30 -07:00
Antonio Scandurra
afaacba41f Merge remote-tracking branch 'origin/main' into room 2022-10-10 15:43:38 +02:00
Max Brunsfeld
e96abf1429 0.59.0 2022-10-07 14:51:18 -07:00
Max Brunsfeld
51fa06cc8d
Merge pull request #1404 from zed-industries/html-support 
Basic html support
 2022-10-06 10:32:44 -07:00
Antonio Scandurra
40163da679 Move contacts panel features into collab_ui 2022-10-06 14:00:14 +02:00
Antonio Scandurra
55cc142319 Move incoming calls into ActiveCall 2022-10-06 09:50:26 +02:00
Max Brunsfeld
b7e115a6a1 Add a test for multi-language auto-indent 2022-10-05 17:59:31 -07:00
Antonio Scandurra
383c21046f Set room location when active workspace changes 2022-10-05 15:03:40 +02:00
Julia
836b536a90
Merge pull request #1632 from zed-industries/git-gutter 
Tracking PR: Git gutter
 2022-10-04 15:12:28 -04:00
Max Brunsfeld
b5d941b10c 0.58.0 2022-10-04 11:43:52 -07:00
Max Brunsfeld
34926abe83 0.57.0 2022-10-02 18:01:49 -07:00
Mikayla Maki
af0974264c 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
Julia
ce7f6dd082 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
a977593f3d 0.57.0 2022-09-29 16:47:20 -07:00
Joseph T Lyons
3c62de34f7 Change journal location setting name to "path" and default to ~ 2022-09-29 17:12:57 -04:00
Mikayla Maki
71b2126eca WIP, re-doing fs and fake git repos 2022-09-29 13:16:02 -04:00
Julia
d5fd531743 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
c8e63d76a4 Get the test to failing,,, correctly 2022-09-29 13:16:02 -04:00
Julia
bb8798a844 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
Julia
c4da8c46f7 Disable unnecessary libgit2 cargo features 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-29 13:16:02 -04:00
Julia
55ca02351c Start painting some sort of hunk info, it's wrong but it's close 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-09-29 13:16:01 -04:00
ForLoveOfCats
2a14af4cde Load a file's head text on file load just to get started 2022-09-29 13:16:01 -04:00
Antonio Scandurra
1898e813f5 Encapsulate Room interaction within ActiveCall 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-09-29 17:39:53 +02:00
Antonio Scandurra
e0db62173a Rename room crate to call 
Also, rename `client::Call` to `client::IncomingCall`.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-09-29 17:24:31 +02:00
Max Brunsfeld
64253e4441 0.56.0 2022-09-28 14:16:35 -07:00
Joseph T Lyons
773423fcf4 Initial work to add settings to journal feature 2022-09-28 16:25:37 -04:00
Max Brunsfeld
67e188a015 Add Buffer::language_at, update MultiBuffer to use it 
Co-authored-by: Julia Risley <floc@unpromptedtirade.com>
 2022-09-28 12:32:04 -07:00
Max Brunsfeld
a2e57e8d71 Add basic syntax highlighting for CSS 2022-09-28 12:32:04 -07:00
Isaac Clayton
a48995c782 Basic html highlighting + lsp support 2022-09-28 12:32:04 -07:00
Antonio Scandurra
aa3cb8e35e Rename collab_titlebar_item crate to collab_ui 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-09-28 19:14:31 +02:00
Nathan Sobo
8ff4f044b7 Start a call when clicking on a contact in the contacts popover 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-09-28 11:02:26 -06:00
Nathan Sobo
f5b2d56efd Remove contacts menu bar extra 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-09-28 09:06:28 -06:00
Antonio Scandurra
4b73239972 WIP: Start moving contacts panel into "add participants" popover 2022-09-28 11:33:38 +02:00
Antonio Scandurra
782309f369 Rename contacts_titlebar_item to collab_titlebar_item 2022-09-28 11:33:38 +02:00
Antonio Scandurra
c8a48e8990 Extract contacts titlebar item into a separate crate 
This allows us to implement a new contacts popover that uses the
`editor` crate.
 2022-09-28 11:33:38 +02:00
Antonio Scandurra
6aa0f0b200 Leave room automatically on disconnection 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-09-28 11:33:38 +02:00
Antonio Scandurra
ebb5ffcedc Introduce the ability of creating rooms on the server 2022-09-28 11:33:38 +02:00
Antonio Scandurra
0b1e372d11 Start sketching out an integration test for calls 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-09-28 11:33:38 +02:00
Antonio Scandurra
8fec7da799 WIP 2022-09-28 11:33:38 +02:00
Antonio Scandurra
46019f8537 WIP 2022-09-28 11:33:38 +02:00