mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 18:25:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12
4415 commits 555 branches 839 tags 248 MiB
Commit graph

4415 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathan Sobo
6ed503fe6e Implement get_invite_code_for_user on test db 2022-05-23 18:07:23 -06:00
Nathan Sobo
5c2fdc01ff Update foreign key constraints to allow users to be deleted 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-23 17:46:06 -06:00
Nathan Sobo
51a61cc485 Don't assign invite code when updating count from 0 to 0 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-23 17:28:05 -06:00
Max Brunsfeld
7f92401bca Add key binding and menu item for Save All 2022-05-23 16:06:56 -07:00
Max Brunsfeld
0becbe482a Distinguish between singleton and non-singleton workspace items 
* Prompt to save singleton items before non-singleton ones
* Don't prompt to save multi-buffers if they contain excerpts to items that are open elsewhere and not being closed.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-23 16:03:00 -07:00
Nathan Sobo
4b8f24c84e Set INVITE_LINK_PREFIX in K8s 2022-05-23 15:49:51 -06:00
Nathan Sobo
d8dbbf1c05 Merge remote-tracking branch 'origin/main' into invite-codes-2 2022-05-23 15:46:39 -06:00
Keith Simmons
e05695c4a6 Add onMedia text color for use in disconnect overlay text 2022-05-23 14:34:34 -07:00
Antonio Scandurra
94e70bc1a6 WIP: log received updated_entries on remote worktree 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-23 19:39:24 +02:00
Antonio Scandurra
c65dae8095 Correctly assign ignored status in refresh_entry 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-23 19:19:13 +02:00
Antonio Scandurra
23ca9dce2e WIP: stream ignored entries 2022-05-23 16:38:16 +02:00
Antonio Scandurra
1a6cc6f964 Show ignored entries in project panel 2022-05-23 16:37:57 +02:00
Antonio Scandurra
fcc6deceb9
Merge pull request #1035 from zed-industries/notify-guests-on-project-close 
Broadcast `proto::UnregisterProject` when host closes a project
 2022-05-23 15:41:29 +02:00
Antonio Scandurra
fe1498dc1d Fix worktree::Snapshot::entries(true) always being empty 2022-05-23 15:38:20 +02:00
Antonio Scandurra
2af4bdef42 Broadcast proto::UnregisterProject when host closes a project 2022-05-23 15:38:01 +02:00
Antonio Scandurra
e4c73b24fd
Merge pull request #1033 from zed-industries/historical-events 
Restart FSEventStream at the last seen event when "dropped" is reported
 2022-05-23 11:10:22 +02:00
Antonio Scandurra
ce46efff2e 🎨 2022-05-23 09:48:00 +02:00
Antonio Scandurra
663173d2f5 Restart FSEventStream at the last seen event when "dropped" is reported 2022-05-23 09:33:10 +02:00
Antonio Scandurra
f3bc4feaf0 Pass a richer State pointer to fsevents trampoline 
This will be useful to re-instate a new stream when dropping events.
 2022-05-23 09:08:32 +02:00
Antonio Scandurra
e287425dee
Merge pull request #1032 from zed-industries/clear-redo-stack-on-edit 
Clear redo stack on edit
 2022-05-23 08:25:38 +02:00
Max Brunsfeld
fbd589b589 Start work on handling multibuffers properly when closing unsaved buffers 2022-05-22 16:48:33 -07:00
Antonio Scandurra
37ca06df53 Clear multi-buffer redo stack when pushing transaction onto undo stack 2022-05-22 10:44:32 +02:00
Antonio Scandurra
03dc7c8eb0 Clear redo stack when pushing remote transaction or ending a local one 2022-05-22 10:33:26 +02:00
Nate Butler
5f69996604
Merge pull request #1025 from zed-industries/add-new-themes 
Add multiple Zed themes
 2022-05-21 21:08:50 -04:00
Nathan Sobo
7a8ff5abd7 Accept an optional email address when creating new users 2022-05-20 20:25:21 -06:00
Max Brunsfeld
21206800bc Add "Close Window" command 2022-05-20 16:53:03 -07:00
Max Brunsfeld
b08cad9ef5 Add "Save As" command 2022-05-20 16:24:42 -07:00
Max Brunsfeld
8ed33cadeb Add "Add Folder to Project" command to application menu 2022-05-20 16:19:43 -07:00
Max Brunsfeld
e72f5cea22 Add "New Window" command 2022-05-20 11:01:20 -07:00
Max Brunsfeld
c4fc3d9c7f
Merge pull request #1023 from zed-industries/app-menu-improvements 
Correctly populate application menus' keystrokes and enabled status
 2022-05-20 10:22:20 -07:00
Max Brunsfeld
b72d97ce78 Disable menu item key equivalents while there are pending keystrokes 2022-05-20 10:04:43 -07:00
Nate Butler
b61153266b Add multiple Zed themes 
Add the following themes:
- Andromeda
- Brushtree Light & Dark
- Rose-pine
- Rose-pine-dawn
- Sandcastle dark
- Summercamp dark
- Summerfruit
 2022-05-20 11:51:59 -04:00
Antonio Scandurra
b751156cd7 Rename first_connection to connected_once 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-20 17:35:00 +02:00
Antonio Scandurra
0597c662e4 Show contacts panel the first time a new user connects to collab 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-20 17:33:09 +02:00
Antonio Scandurra
d8ee4378c9 Send a ShowContacts message the first time a user connects to collab 2022-05-20 15:47:14 +02:00
Antonio Scandurra
6f2c3f1e37 Update users and invite count after an invite gets redeemed 2022-05-20 12:02:31 +02:00
Max Brunsfeld
21862faa58 Convert function keys to the correct macOS codes for menu items 2022-05-19 17:37:46 -07:00
Nathan Sobo
eedb8ba59f Add affordance to copy user's invite link if they have a code 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-19 17:57:46 -06:00
Max Brunsfeld
df4cfa56cf Add application menu items 2022-05-19 16:50:40 -07:00
Max Brunsfeld
ea85473f4f Enable and disable application menu items based on the active view 2022-05-19 16:50:40 -07:00
Max Brunsfeld
c4554c1720 Replace build_workspace fn with an initialize function that takes a workspace 
This makes it clearer that the function is not providing necessary
dependencies to a workspace, but rather configuring it with all of
the panels and widgets which are defined in downstream crates.
 2022-05-19 16:50:22 -07:00
Max Brunsfeld
9e47e19f4e Pass UserStore to ContactsPanel instead of AppState 2022-05-19 14:43:36 -07:00
Max Brunsfeld
de99dcb0c3 Add cmd-n and cmd-o to the default keymap 2022-05-19 14:39:06 -07:00
Max Brunsfeld
ef0b584532 Remove AppState from workspace actions 
This allows those actions to be bound to keystrokes in the keymap.
Also, remove the WorkspaceParams struct, simplify how Workspaces are
constructed.
 2022-05-19 14:37:26 -07:00
Keith Simmons
1bf5f361d3
Merge pull request #1022 from zed-industries/editor-clone-selections 
Clone selections on editor split
 2022-05-19 12:49:43 -07:00
Nathan Sobo
a3bbabaaac Add ability to get the user for an invite code in collab API 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-19 12:35:07 -06:00
Keith Simmons
bacfed37b7 Clone selections on editor split 2022-05-19 11:22:53 -07:00
Nathan Sobo
3d7e912c6b Enable descriptive HTTP errors to be returned from DB layer 
For now, we only use this when redeeming an invite code.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-19 11:55:55 -06:00
Nathan Sobo
d1b7a249b4 WIP 2022-05-19 11:09:44 -06:00
Max Brunsfeld
7445197f4d Derive application menu key equivalents from the keymap 2022-05-19 10:04:01 -07:00