yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,317 Commits 5 Branches 0 Tags
2ec00a2e36f41e288a9c7017a99c889288edd12f
Commit Graph
4317 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Sobo 09756b7036 Merge pull request #1049 from zed-industries/invite-codes-2 
Support inviting new Zed users
 2022-05-23 18:29:51 -06:00
Nathan Sobo 28a0b21c56 Bump protocol version 2022-05-23 18:18:15 -06:00
Nathan Sobo 26a674aba7 Implement get_invite_code_for_user on test db 2022-05-23 18:07:23 -06:00
Nathan SoboandMax Brunsfeld bdc8941026 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 SoboandMax Brunsfeld 8f440348a5 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 8d7f81474f Add key binding and menu item for Save All 2022-05-23 16:06:56 -07:00
Max BrunsfeldandNathan Sobo 65c8bea372 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 212c138608 Set INVITE_LINK_PREFIX in K8s 2022-05-23 15:49:51 -06:00
Nathan Sobo d1bcff6ea8 Merge remote-tracking branch 'origin/main' into invite-codes-2 2022-05-23 15:46:39 -06:00
Keith Simmons a446fd27c7 Add onMedia text color for use in disconnect overlay text 2022-05-23 14:34:34 -07:00
Antonio ScandurraandNathan Sobo 07961a9dcd 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 ScandurraandNathan Sobo a16c11af5b 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 3acad1f75c WIP: stream ignored entries 2022-05-23 16:38:16 +02:00
Antonio Scandurra 039dccc483 Show ignored entries in project panel 2022-05-23 16:37:57 +02:00
Antonio Scandurra fd95a42533 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 c96ff01fbb Fix worktree::Snapshot::entries(true) always being empty 2022-05-23 15:38:20 +02:00
Antonio Scandurra 2ec31aa0b6 Broadcast proto::UnregisterProject when host closes a project 2022-05-23 15:38:01 +02:00
Antonio Scandurra 4d72fbb181 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 2893b2c9a5 🎨 2022-05-23 09:48:00 +02:00
Antonio Scandurra fc8df3980f Restart FSEventStream at the last seen event when "dropped" is reported 2022-05-23 09:33:10 +02:00
Antonio Scandurra d3d8656a5f 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 56f9707f5a 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 259d76aa40 Start work on handling multibuffers properly when closing unsaved buffers 2022-05-22 16:48:33 -07:00
Antonio Scandurra 1fb594a0ac Clear multi-buffer redo stack when pushing transaction onto undo stack 2022-05-22 10:44:32 +02:00
Antonio Scandurra 71dfc5d915 Clear redo stack when pushing remote transaction or ending a local one 2022-05-22 10:33:26 +02:00
Nate Butler d7cbae7d92 Merge pull request #1025 from zed-industries/add-new-themes 
Add multiple Zed themes
 2022-05-21 21:08:50 -04:00
Nathan Sobo ed5f5dc722 Accept an optional email address when creating new users 2022-05-20 20:25:21 -06:00
Max Brunsfeld 3519a4ed45 Add "Close Window" command 2022-05-20 16:53:03 -07:00
Max Brunsfeld 4f8c867287 Add "Save As" command 2022-05-20 16:24:42 -07:00
Max Brunsfeld e15ed5e5d6 Add "Add Folder to Project" command to application menu 2022-05-20 16:19:43 -07:00
Max Brunsfeld 6082282925 Add "New Window" command 2022-05-20 11:01:20 -07:00
Max Brunsfeld 8b5b908985 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 d1dc5d73f9 Disable menu item key equivalents while there are pending keystrokes 2022-05-20 10:04:43 -07:00
Nate Butler 1200a0ef8c 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 ScandurraandNathan Sobo c34ead1401 Rename first_connection to connected_once 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-20 17:35:00 +02:00
Antonio ScandurraandNathan Sobo 5954c1b146 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 bb53ff8611 Send a ShowContacts message the first time a user connects to collab 2022-05-20 15:47:14 +02:00
Antonio Scandurra d3a80c0f7c Update users and invite count after an invite gets redeemed 2022-05-20 12:02:31 +02:00
Max Brunsfeld 09dde247f2 Convert function keys to the correct macOS codes for menu items 2022-05-19 17:37:46 -07:00
Nathan SoboandAntonio Scandurra 3b4085b654 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 281ca7d5fc Add application menu items 2022-05-19 16:50:40 -07:00
Max Brunsfeld 135cef12b6 Enable and disable application menu items based on the active view 2022-05-19 16:50:40 -07:00
Max Brunsfeld a500249333 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 a6cbf0e557 Pass UserStore to ContactsPanel instead of AppState 2022-05-19 14:43:36 -07:00
Max Brunsfeld 55952a4877 Add cmd-n and cmd-o to the default keymap 2022-05-19 14:39:06 -07:00
Max Brunsfeld e6011794ca 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 e7227afe72 Merge pull request #1022 from zed-industries/editor-clone-selections 
Clone selections on editor split
 2022-05-19 12:49:43 -07:00
Nathan SoboandAntonio Scandurra a10b9e8c4c 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 4ba404bc74 Clone selections on editor split 2022-05-19 11:22:53 -07:00
Nathan SoboandAntonio Scandurra 505e773544 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