Commit Graph
8165 Commits
Author SHA1 Message Date
Max Brunsfeld df4555afda v0.78.x dev 2023-03-13 12:00:56 -07:00
Max Brunsfeld d6a3bedd5c Merge pull request #2244 from zed-industries/less-surprising-defaults
Clean up some default settings
2023-03-13 11:54:46 -07:00
Julia ab8e22b6ba Clean up some default settings 2023-03-13 14:54:28 -04:00
Max Brunsfeld c7b4775e83 Merge pull request #2278 from zed-industries/screenshares-from-before-joining
Fix failure to see screenshare tracks that were started prior to join…
2023-03-13 11:22:40 -07:00
Max BrunsfeldandAntonio Scandurra 9342332495 Fix failure to see screenshare tracks that were started prior to joining a call
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
2023-03-13 11:15:22 -07:00
Mikayla Maki f4e649224e Merge pull request #2277 from zed-industries/switch-invite-person-icon
Update Collab + icon
2023-03-13 10:54:33 -07:00
Nate Butler f75022511b Format 2023-03-13 13:49:00 -04:00
Nate Butler 9b23214405 Merge pull request #2276 from zed-industries/improve-picker-state-contrast
Improve picker state contrast
2023-03-13 13:48:04 -04:00
Nate Butler 77239ca1d3 Update icon 2023-03-13 13:47:58 -04:00
Max Brunsfeld a72352e0c8 collab 0.7.2 2023-03-13 10:11:44 -07:00
Nate Butler 39a79d0197 Improve contrast of project panel active state in light themes 2023-03-13 13:10:46 -04:00
Antonio Scandurra 3ee1950d9d Merge pull request #2274 from zed-industries/leave-on-quit
Leave room on quit
2023-03-13 18:08:01 +01:00
Max Brunsfeld 01b50d78bd Merge pull request #2273 from zed-industries/fix-dock-opening-in-collaboration
Fix dock opening on collaboration
2023-03-13 10:04:43 -07:00
Nate Butler 6b7f2f7a85 Format 2023-03-13 12:59:23 -04:00
Nate ButlerandJulia 9962fe7f84 Update picker active and hover styles
Thanks for pointing this out @ForLoveOfCats

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-03-13 12:59:17 -04:00
Antonio ScandurraandMax Brunsfeld 3c81933fbc Leave room on quit
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-03-13 17:52:10 +01:00
Mikayla Maki aaa94ccf08 Remove panic in recent projects picker 2023-03-13 09:44:42 -07:00
Mikayla Maki 0d2e73bb61 Fix dock opening on collaboration 2023-03-13 09:36:45 -07:00
Petros Amoiridis e91e82edf2 Merge pull request #2271 from zed-industries/petros/z-278-lock-pop-up-to-the-terminal-button
A new approach for positioning pop-up menus tied to an icon/button
2023-03-13 08:46:44 -07:00
Antonio Scandurra 77da03c698 Merge pull request #2268 from zed-industries/mention-username-of-user-in-prompt-when-removing-a-contact
Mention username of user in prompt when removing a contact
2023-03-13 14:28:11 +01:00
Antonio Scandurra bb4ee21481 Merge pull request #2272 from zed-industries/add-textmate-keymap
Add TextMate keymap
2023-03-13 14:26:32 +01:00
Antonio Scandurra 93a96137d8 Merge pull request #2270 from zed-industries/add-default-keybindings-for-reveal-in-finder
Add default keybindings for reveal in finder
2023-03-13 14:25:26 +01:00
Antonio Scandurra abcc754d86 Merge pull request #2269 from zed-industries/unify-action-names-with-keybinding-names
Unify action names with keybinding name
2023-03-13 14:24:42 +01:00
Joseph Lyons 77a483c2a7 Add TextMate keymap 2023-03-13 08:27:04 -04:00
Petros AmoiridisandAntonio Scandurra 3741bd8640 Use local overlay position mode and alignment
When we show the context menu, we don't specify an explicit position other than the default one which is equal to the origin in the context of a local overlay position mode. We then rely on `AnchorCorner` and aligning the context menu child view in the stack with `top().right()` for pop-ups that need to appear at the top of the icon/button.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-03-13 12:50:12 +02:00
Petros Amoiridis ab619eb069 Merge pull request #2253 from zed-industries/joseph/z-226-add-terminal-popup-menu
Add terminal pop up menu
2023-03-13 02:47:44 -07:00
Petros AmoiridisandAntonio Scandurra 95a36d8c32 Use type_id to determine what has the focus
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-03-13 11:42:40 +02:00
Joseph Lyons c86d63f3e7 Update method names to match action names 2023-03-12 06:08:12 -04:00
Joseph Lyons 5fcd6c222c Switch github_login to String
One of our macros, `impl_actions!`, didn't like that `RemoveContact` had a lifetime.
2023-03-12 05:03:31 -04:00
Joseph Lyons fd337e4139 Add default keybindings for reveal in finder 2023-03-12 04:58:17 -04:00
Joseph Lyons 841be8edf2 Unify action names with keybinding name 2023-03-12 04:37:39 -04:00
Joseph Lyons 993f258b09 Mention username of user in prompt when removing a contact 2023-03-11 19:28:35 -05:00
Joseph Lyons 1266fee80c Remove hardcoding of "Terminal" string 2023-03-11 16:27:00 -05:00
Petros Amoiridis a1241fb767 Show tooltip for Give Feedback icon 2023-03-11 17:40:47 +02:00
Petros Amoiridis 78cd8dd51a Remove comment
I know @JosephTLyons you had added that, but I am not entirely sure this is how the view should be called. Let's discuss this further if you fill strong about it.
2023-03-11 17:22:21 +02:00
Petros AmoiridisandMikayla Maki 41b5cdd5db Activate terminal button when a terminal is focus
This is code I brought over from https://github.com/zed-industries/zed/pull/2267 by @mikayla-maki after fixing the conflicts.

Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-03-11 16:45:28 +02:00
Petros Amoiridis 1315dc7079 Merge branch 'main' into joseph/z-226-add-terminal-popup-menu 2023-03-11 16:42:42 +02:00
Max Brunsfeld c4b0eaf626 Encode db-max-connections env var as a string in k8s manifest 2023-03-10 17:19:16 -08:00
Max Brunsfeld 5ef6c610c8 collab 0.7.1 2023-03-10 16:36:03 -08:00
Mikayla Maki 57082433dc Merge pull request #2263 from zed-industries/language-status-bar
Language status bar
2023-03-10 16:26:42 -08:00
Mikayla Maki cf5114b193 Align feedback button styles with other sidebar buttons
Make feedback button reflect whether you're in a feedback buffer
2023-03-10 16:19:33 -08:00
Mikayla Maki 49c5ff8df1 Merge pull request #2265 from zed-industries/fix-menu-bar-greying-out
Fix too-agressive menu bar greying
2023-03-10 16:05:07 -08:00
Mikayla Maki 67205336fb Merge pull request #2267 from zed-industries/fix-terminal-icon-active-state
Activate and deactivate the terminal icon based on focused view
2023-03-10 16:02:34 -08:00
Mikayla Maki f5a78c7a3f Fix the terminal icon button to only be active when a terminal is focused 2023-03-10 15:54:42 -08:00
Mikayla Maki deece2f147 Merge pull request #2257 from zed-industries/check-all-contexts
Fix keyboard shortcuts not showing
2023-03-10 15:52:56 -08:00
Mikayla Makiandmax dcefe10e28 Fix a corner case in available action resolution
Add tests for new keybinding resolution behavior

co-authored-by: max <max@zed.dev>
2023-03-10 15:36:20 -08:00
Mikayla MakiandMax 39f5fab0be Switch from using the key window to the main window mac platform API
When the help menu is open, the help menu's search field is the key window, and this was causing menu item action resolution to fail

co-authored-by: Max <max@zed.dev>
2023-03-10 14:43:28 -08:00
Julia 43c0ec17e1 Merge pull request #2266 from zed-industries/avoid-panic
Avoid panic scanning recursive symlink before gitignore is encountered
2023-03-10 17:19:55 -05:00
Julia 0c89beb696 Avoid panic scanning recursive symlink before gitignore is encountered 2023-03-10 16:54:57 -05:00
Mikayla Maki 66aa6a7930 Add feedback for telemetry item when there's no data 2023-03-10 13:15:36 -08:00