yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,546 Commits 5 Branches 0 Tags
a31b7ebb27ddd574c18bee82067aeea1fb22cd2e
Commit Graph
7546 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra a31b7ebb27 Merge pull request #2103 from zed-industries/connection-staleness 
Fix connection staleness issues
 2023-01-27 11:01:24 +01:00
Antonio Scandurra 43a364d0da Abort collaboration process if any thread panics 2023-01-27 09:50:59 +01:00
Mikayla Maki 4e87d0020f Merge pull request #2101 from zed-industries/theme-licenses 
Added build-licenses command to style tree
 2023-01-26 18:29:20 -08:00
Mikayla Maki 5d40022678 Combine both license generations into one file 2023-01-26 18:25:28 -08:00
Mikayla Maki 5f2c207cee Added build-licenses command to style tree 2023-01-26 17:33:54 -08:00
Max Brunsfeld 0ebf06a3ef Merge pull request #2100 from zed-industries/visible-worktrees-in-collab-ui 
Omit hidden worktrees when showing projects in collaboration UI
 2023-01-26 15:01:10 -08:00
Max Brunsfeld 7c3ed89758 Run CI for version branches but not all branches starting with 'v' 2023-01-26 14:57:24 -08:00
Max Brunsfeld e598324a5b Omit hidden worktrees when showing projects in collaboration UI 2023-01-26 14:47:37 -08:00
Max Brunsfeld 57f2972f28 Merge pull request #2099 from zed-industries/empty-go-to-def-multibuffer 
Avoid opening a definitions tab if there are no definitions found
 2023-01-26 10:35:35 -08:00
Max Brunsfeld 0d24428606 Avoid opening a definitions tab if there are no definitions found 2023-01-26 10:30:01 -08:00
Petros Amoiridis 0bbf98b9d9 Merge pull request #2077 from zed-industries/2064-remove-contacts 
Remove contact from contact list
 2023-01-26 20:04:15 +02:00
Max Brunsfeld 238047a141 Merge pull request #2098 from zed-industries/help-menu-licenses 
Add 'view dependency licenses' item to Help appication menu
 2023-01-26 09:56:44 -08:00
Max Brunsfeld 95ea790387 Add 'view dependency licenses' item to Help appication menu 2023-01-26 09:53:46 -08:00
Petros AmoiridisandAntonio Scandurra e790849cd2 Refactor Database::remove_contact 
Refactor it to avoid sending irrelevant messages to update the UI.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-26 19:01:51 +02:00
Antonio Scandurra e49debafd4 Ensure proto::UpdateWorktree::removed_entries doesn't exceed chunk size 
This was causing the database to panic because we were trying to remove too
many entries at once.
 2023-01-26 17:26:31 +01:00
Antonio Scandurra 5ce03d76e3 Cancel pending call when participant leaves room after a reconnection 
Previously, if a user temporarily disconnected while there was a pending
call, we would fail to cancel such pending call when the caller left the
room. This was due to the caller reconnecting and having a different connection
id than the one originally used to initiate the call.
 2023-01-26 16:44:55 +01:00
Petros Amoiridis a516e6ba70 Merge branch 'main' into 2064-remove-contacts 2023-01-26 16:34:17 +02:00
Joseph T. Lyons 817337bffa Merge pull request #2095 from zed-industries/fix-crash-when-opening-feedback-while-in-call 
Fix crash when opening feedback while in call
 2023-01-25 21:16:12 -05:00
Max Brunsfeld 0396e181f9 Merge pull request #2096 from zed-industries/lazy-load-languages 
Load languages lazily in the background
 2023-01-25 18:09:45 -08:00
Max Brunsfeld 278116bc25 Load languages lazily in the background 2023-01-25 17:47:46 -08:00
Joseph Lyons d3d9dd2a5d Remove no-longer-needed method 2023-01-25 20:03:44 -05:00
Julia c5df32fc0a Merge pull request #2094 from zed-industries/project-lost-window-close-action-shortcut-accessibility 
Add "Close Window" global action which does not need a focused workspace
 2023-01-25 18:58:22 -05:00
Julia f9f4a24805 Add "Close Window" global action which does not need a focused workspace 2023-01-25 18:51:25 -05:00
Joseph Lyons b02fb2199c Fix crash when opening feedback while in call 2023-01-25 17:48:01 -05:00
Julia 8444c06e74 Merge pull request #2091 from zed-industries/style 
Style
 2023-01-25 15:22:52 -05:00
Joseph Lyons d5a9cc9530 v0.72.x dev 2023-01-25 15:20:41 -05:00
JuliaandMax Brunsfeld 7ae2929d9d Style 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-01-25 15:09:57 -05:00
Joseph T. Lyons 20be40bbfd Merge pull request #2088 from zed-industries/add-cursor-position-to-feedback-editor 
Add cursor position to feedback editor
 2023-01-25 14:29:24 -05:00
Max Brunsfeld 1199f4e6dc Merge pull request #2087 from zed-industries/buffer-language-registry 
Assign the language registry to all buffers in the project
 2023-01-25 11:25:40 -08:00
Joseph Lyons a3adc461f0 Clean up construction of FeedbackEditor 2023-01-25 14:20:58 -05:00
Joseph Lyons 1a69f809ab Count chars 2023-01-25 14:20:40 -05:00
Joseph LyonsMikayla MakiMax Brunsfeld
 		c8d64a7056 Add cursor position to feedback editor 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-01-25 14:20:23 -05:00
Julia 251d956341 Merge pull request #2085 from zed-industries/cleanup-debug-printing 
Clean up some debug printing
 2023-01-25 14:18:43 -05:00
Joseph Lyons c5cb997b58 Merge branch 'main' into add-cursor-position-to-feedback-editor 2023-01-25 14:01:45 -05:00
Max Brunsfeld a27e6ff9da Assign the language registry to all buffers in the project 2023-01-25 10:44:15 -08:00
Julia 1d91d4bca9 Clean up some debug printing 2023-01-25 13:37:04 -05:00
Petros Amoiridis abc291b73a Improve user notification 
The message is not really true. When one declines, the other person can notice that the contact request  is not pending any more. They will know. Switching to not alerted is closer to what is really happening.
 2023-01-25 19:46:51 +02:00
Mikayla Maki da4ad4171c Merge pull request #2081 from zed-industries/fix-failing-ci 
Fixes a broken conditional that is only caught on darwin systems
 2023-01-25 09:45:30 -08:00
Mikayla Maki 93a46fe10a Fixes a broken conditional that is only caught on darwin systems 2023-01-25 09:33:07 -08:00
Mikayla Maki 76c41514bc Merge pull request #2078 from zed-industries/fix-cursor-style 
Fix cursor style thrashing on overlapping windows
 2023-01-25 09:15:55 -08:00
Mikayla Maki 918227f261 Remove debug wiring 2023-01-25 09:10:51 -08:00
Mikayla MakiandAntonio 6d6ade5caf Changed the presenter to only send 'set_cursor_style' on the topmost window 
co-authored-by: Antonio <antonio@zed.dev>
 2023-01-25 09:10:35 -08:00
Mikayla Maki 1e1a7c31c3 WIP 2023-01-25 09:10:35 -08:00
Mikayla Maki 28fd6c4ae4 WIP - adds platform APIs for checking the top most window 2023-01-25 09:10:35 -08:00
Petros AmoiridisandAntonio Scandurra 3c8c907b18 Add a confirmation prompt 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 18:55:08 +02:00
Petros AmoiridisandAntonio Scandurra 0989cd5d10 Test removing a contact 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 17:31:42 +02:00
Petros AmoiridisandAntonio Scandurra a9d8833ed3 Push responder and requester to remove_contacts 
When we ask the server to remove a contact we need to push the requester and responder ids to `remove_contacts` so that when the UI updates, the correct contacts will disappear from the list.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 13:10:29 +02:00
Petros AmoiridisandAntonio Scandurra 3aba81aa08 Add an x mark icon to the list of contacts 
We want to be able to remove contacts from our list. This was not possible. This change add an icon and dispatches the RemoveContact action.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 13:10:29 +02:00
Joseph Lyons 79aa352fad Remove gpui:: prefix from parameters 2023-01-24 19:46:04 -05:00
Joseph T. Lyons fdf46d2f08 Merge pull request #2075 from zed-industries/add-upper-character-count-limit 
Add upper character count limit
 2023-01-24 19:44:19 -05:00