Kay Simmons
77a4f907a0
removed invalid focus assertion
2023-01-27 13:43:36 -08:00
Kay Simmons
d6acea525d
add test for is_child_focused
2023-01-27 13:00:26 -08:00
Kay Simmons
89a5506f43
Add function which checks if a child of a view is focused and use that to only focus item updates from the leader when that the active item was focused
2023-01-27 12:39:32 -08:00
Antonio Scandurra
5431488a9a
collab 0.5.4
2023-01-27 11:07:12 +01:00
Antonio Scandurra
ac7618da17
Merge pull request #2103 from zed-industries/connection-staleness
...
Fix connection staleness issues
2023-01-27 11:01:24 +01:00
Antonio Scandurra
647d9861b1
Abort collaboration process if any thread panics
2023-01-27 09:50:59 +01:00
Mikayla Maki
d7ac15fa71
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
3a1d533c01
Combine both license generations into one file
2023-01-26 18:25:28 -08:00
Mikayla Maki
c44acaefff
Added build-licenses command to style tree
2023-01-26 17:33:54 -08:00
Kay Simmons
1593b1e13d
window position restoration working
2023-01-26 16:35:00 -08:00
Max Brunsfeld
fabcdb909a
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
f99e4043c4
Run CI for version branches but not all branches starting with 'v'
2023-01-26 14:57:24 -08:00
Max Brunsfeld
1b45911857
Omit hidden worktrees when showing projects in collaboration UI
2023-01-26 14:47:37 -08:00
Max Brunsfeld
4918ad5789
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
9f86748aff
Avoid opening a definitions tab if there are no definitions found
2023-01-26 10:30:01 -08:00
Petros Amoiridis
489be5e77b
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
b396e153d1
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
1c572fd86e
Add 'view dependency licenses' item to Help appication menu
2023-01-26 09:53:46 -08:00
Petros Amoiridis
73af155dd6
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
eca6115e4b
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
74aeec360d
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
2f26fcd889
Merge branch 'main' into 2064-remove-contacts
2023-01-26 16:34:17 +02:00
Joseph T. Lyons
a4d9d6c750
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
a2a3ebc42f
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
ddf4e1a316
Load languages lazily in the background
2023-01-25 17:47:46 -08:00
Kay Simmons
a369fb8033
better but still broken
2023-01-25 17:05:57 -08:00
Joseph Lyons
9ff34bcb6a
Remove no-longer-needed method
2023-01-25 20:03:44 -05:00
Julia
10f130ee30
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
3819a67185
Add "Close Window" global action which does not need a focused workspace
2023-01-25 18:51:25 -05:00
Joseph Lyons
6e7101ca6b
Fix crash when opening feedback while in call
2023-01-25 17:48:01 -05:00
Julia
2df2d09e3c
Merge pull request #2091 from zed-industries/style
...
Style
2023-01-25 15:22:52 -05:00
Joseph Lyons
4c3244b982
v0.72.x dev
2023-01-25 15:20:41 -05:00
Julia
a79b4e312b
Style
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-01-25 15:09:57 -05:00
Kay Simmons
5eac797a93
mostly working now
2023-01-25 11:36:38 -08:00
Kay Simmons
a581d0c5b8
wip
2023-01-25 11:32:19 -08:00
Kay Simmons
15799f7af6
wip
2023-01-25 11:32:19 -08:00
Joseph T. Lyons
81ed961659
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
9db55b3029
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
328b779185
Clean up construction of FeedbackEditor
2023-01-25 14:20:58 -05:00
Joseph Lyons
7f3d937938
Count chars
2023-01-25 14:20:40 -05:00
Joseph Lyons
f68f9f37ab
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
c22d13286d
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
44c7f162b6
Merge branch 'main' into add-cursor-position-to-feedback-editor
2023-01-25 14:01:45 -05:00
Max Brunsfeld
7003a475a7
Assign the language registry to all buffers in the project
2023-01-25 10:44:15 -08:00
Julia
3d8dbee76a
Clean up some debug printing
2023-01-25 13:37:04 -05:00
Petros Amoiridis
160870c9de
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
ba6ffd8256
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
ecb7d1072f
Fixes a broken conditional that is only caught on darwin systems
2023-01-25 09:33:07 -08:00
Mikayla Maki
38b83a70aa
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
1fc6276eab
Remove debug wiring
2023-01-25 09:10:51 -08:00
