mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 16:37:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
4487 commits 698 branches 747 tags 259 MiB
Commit graph

4487 commits

This branch
This branch
All branches
Author SHA1 Message Date
Max Brunsfeld
f54d74eda9 Merge branch 'main' into contact-panel-keyboard-nav 2022-05-11 17:45:44 -07:00
Max Brunsfeld
85d9ac5b95
Merge pull request #987 from zed-industries/notifications 
Notify when someone requests to add you as a contact or accepts your contact request
 2022-05-11 17:40:11 -07:00
Max Brunsfeld
72e7079005 Add the ability to expand and collapse sections of the contacts panel 
Also, allow joining projects using the keyboard.
 2022-05-11 17:28:35 -07:00
Max Brunsfeld
615319b2ab Rework the contact panel's styling to allow keyboard navigation 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-11 16:50:51 -07:00
Max Brunsfeld
4739c683af Fix bug where Contacts included projects for which the use was a guest 2022-05-11 16:49:56 -07:00
Max Brunsfeld
0ba656aa0e Improve layout and styling of contact notifications 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-11 14:20:05 -07:00
Max Brunsfeld
3bc9b8ec85 Add notifications for accepted contact requests 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-11 11:39:01 -07:00
Keith Simmons
61b4a4202f
Merge pull request #984 from zed-industries/deterministic-marked-text-ranges 
Order returned ranges from marked_text_ranges by start index
 2022-05-11 10:31:33 -07:00
Keith Simmons
a33ef65f57 Order returned ranges from marked_text_ranges by start index 2022-05-11 10:18:40 -07:00
Antonio Scandurra
a5fd664b00 Add the ability to notify when a user accepts a contact request 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-05-11 18:51:40 +02:00
Nate Butler
5247246e91
Merge pull request #983 from zed-industries/add-onMedia-border-token 
Add onMedia border token
 2022-05-11 12:48:11 -04:00
Nate Butler
50b44ebe85 Add onMedia border token 2022-05-11 12:35:00 -04:00
Antonio Scandurra
933a1f2cd6 Show badge when there are pending contact requests 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-11 17:39:03 +02:00
Antonio Scandurra
c71b264786 Allow accepting/rejecting incoming requests via notification 2022-05-11 15:25:33 +02:00
Antonio Scandurra
97d3616ed9 Show incoming request notification and implement dismissal 2022-05-11 15:13:37 +02:00
Max Brunsfeld
08a7543913 WIP - start work on keyboard navigation in contacts panel 2022-05-10 21:45:49 -07:00
Max Brunsfeld
297fa1af55 Avoid possible memory leak of FakeServer in tests 2022-05-10 21:45:12 -07:00
Max Brunsfeld
d0052ccfb5 Avoid panic when trying to fetch an invalid URL 2022-05-10 21:44:33 -07:00
Nathan Sobo
fe89de8b11 Dismiss contact request notification if request is cancelled 2022-05-10 18:50:18 -06:00
Nathan Sobo
3bca1c29e2 Present a blank notification upon receipt of a contact request 2022-05-10 18:33:39 -06:00
Nathan Sobo
bd2ae304fa Start on workspace notifications 2022-05-10 17:46:46 -06:00
Nathan Sobo
9c68c3e8a9 Put context parameter last in toggle_modal callback 
This is more consistent with our treatment of context params everywhere else.
 2022-05-10 16:46:53 -06:00
Max Brunsfeld
6b5cab5db1 Bump protocol version number 2022-05-10 15:38:49 -07:00
Max Brunsfeld
c5360172e4
Merge pull request #979 from zed-industries/contacts 
Manage users' contact relationships on the server
 2022-05-10 15:11:30 -07:00
Max Brunsfeld
b1a75805cc Consolidate logic for rendering contact requests 2022-05-10 14:52:13 -07:00
Max Brunsfeld
834c485300 Don't use pointing hand cursor for the user's own projects 2022-05-10 14:46:42 -07:00
Keith Simmons
93f8f47cc0
Merge pull request #980 from zed-industries/coerce-multibuffer-changes 
Filter overlapping multibuffer edits
 2022-05-10 14:45:35 -07:00
Keith Simmons
c4738d7316 Add test coverage for same cursor in multiple excerpts of the same buffer 2022-05-10 14:30:27 -07:00
Max Brunsfeld
334f246df3 Include every user in their own list of contacts 2022-05-10 14:05:07 -07:00
Keith Simmons
68de51ba8a Fix multiple cursors inserting repeated text in multibuffers 2022-05-10 13:32:27 -07:00
Keith Simmons
6c57fcf9be
Merge pull request #968 from zed-industries/vim-visual-mode 
Vim visual mode
 2022-05-10 12:51:58 -07:00
Max Brunsfeld
dc465839e1 Round sidebar panels' widths to whole numbers of pixels 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-10 11:25:51 -07:00
Max Brunsfeld
de9a7b1927 Give the contact panel's filter editor some placeholder text 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-10 11:25:12 -07:00
Max Brunsfeld
14ec3c86e5 Clear contact panel filter editor on escape 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-10 11:18:30 -07:00
Max Brunsfeld
b33cbccc31 Improve layout of contact panel rows 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-10 11:14:31 -07:00
Keith Simmons
3f1640a9a0 Fix up assertion errors in set_eq and visual tests 2022-05-10 11:12:34 -07:00
Keith Simmons
37c921f972 Initial visual mode 2022-05-10 11:12:28 -07:00
Max Brunsfeld
2cf9659f88 Style the buttons in the contact panel and contact finder 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2022-05-10 10:47:25 -07:00
Antonio Scandurra
a121576545 WIP 2022-05-10 18:25:47 +02:00
Antonio Scandurra
6c3e3c84ec Eliminate flicker when contact status is pending 
We do this by using a bullet. When we have animations, a spinner would be better.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-10 17:32:57 +02:00
Antonio Scandurra
b00338195e Make user fuzzy search case-insensitive 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-10 17:30:09 +02:00
Antonio Scandurra
93688cbe22 Fix bug when determining contact status 
Users are sorted by login but we were binary-searching them by id.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-10 17:26:53 +02:00
Antonio Scandurra
d4e6ab4975 Seed first users from GitHub when running script/seed-db --github-users 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-10 17:19:39 +02:00
Antonio Scandurra
f81edb88fe Pull out contact finder as a picker 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-10 16:43:51 +02:00
Nathan Sobo
b721f0064a Start on contact finder modal 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-10 07:24:14 -06:00
Nathan Sobo
eef99f059d Make flex elements fill available space when they contain a float 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-10 06:14:30 -06:00
Antonio Scandurra
12783a588c Prevent users from fuzzy searching and adding themselves as contacts 2022-05-10 12:22:50 +02:00
Antonio Scandurra
09580516a0 Start on adding icon for requesting contacts 2022-05-10 12:09:24 +02:00
Antonio Scandurra
52c36d3e3d Maintain online status in contacts panel 2022-05-10 10:33:57 +02:00
Nathan Sobo
4e9924c717 Filter out empty projects in contacts panel 2022-05-09 20:57:41 -06:00