oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,928 Commits 1 Branch 0 Tags
a8a045e8bfe639788a27599cabbbe00575dc8c03
Commit Graph
5266 Commits
Author SHA1 Message Date
Nate Butler a8a045e8bf Merge branch 'main' into nate/extend-syntax 2023-02-28 11:07:35 -05:00
Joseph T. Lyons 3fb426e8b2 Merge pull request #2209 from zed-industries/add-link-to-community-repo-in-feedback-editor 
Add link to community repo in feedback editor text
 2023-02-28 09:03:21 -05:00
Kay Simmons f0a31f86c7 remove commented line 2023-02-27 12:06:10 -08:00
Kay Simmons b3dffeaf2a fix infinite loop in path distance for fuzzy finder 2023-02-27 11:57:21 -08:00
Joseph Lyons 4f9a07cffc Merge branch 'main' into add-link-to-community-repo-in-feedback-editor 2023-02-27 13:56:01 -05:00
Nate Butler f84046b74f use @boolean in all flavors of js 2023-02-27 10:40:01 -05:00
Nate Butler 8c51a62a8d Unify regex highlight style under @string.regex 2023-02-27 10:08:24 -05:00
Joseph Lyons 36ada13966 Update app-icon@2x.png 2023-02-26 11:03:43 -05:00
Joseph Lyons 2c61eeb56d Update app-icon.png 2023-02-26 11:03:31 -05:00
Joseph Lyons ccae9448d4 Update app-icon-preview@2x.png 2023-02-26 11:03:22 -05:00
Joseph Lyons bb46b26494 Update app-icon-preview.png 2023-02-26 11:03:03 -05:00
Kay Simmons 0b1334b8c5 Merge pull request #2218 from zed-industries/file-finder-distance-sorting 
Sort matches in file finder by distance to active item after score
 2023-02-25 14:26:05 -08:00
Kay Simmons cdc6566d87 fixup poor utility naming 2023-02-25 14:12:25 -08:00
Kay Simmons 36f3d3d738 Add test for new sorting behavior 2023-02-25 14:06:54 -08:00
Kay Simmons 0b48e238f2 Sort file finder matches by distance to the active item after match score 2023-02-24 18:13:26 -08:00
Max BrunsfeldandMikayla Maki 5fea49e639 Pass the 'Save' format trigger when formatting on save 
In an earlier refactor, I accidentally caused the 'Manual'
trigger to *always* be passed.

Co-authored-by: Mikayla Maki <mikayla@zed.dev>
 2023-02-24 17:11:35 -08:00
Mikayla Maki 0704d9dcdb Merge pull request #2216 from zed-industries/update-bromberg 
Update bromberg dependency to have alloc
 2023-02-24 14:41:32 -08:00
Mikayla Maki a57fcf5afc Update bromberg dependency to have alloc 2023-02-24 14:34:24 -08:00
Max Brunsfeld e910fd8493 collab 0.6.1 2023-02-24 09:44:23 -08:00
Mikayla Maki 8656708de4 Revert "Remove borrow from reveal_path()" 2023-02-24 09:39:52 -08:00
Joseph Lyons 72197802a2 Tweak code to remove duplication 2023-02-24 08:53:58 -05:00
Joseph Lyons f8f1a3f86e Unify text style names 2023-02-24 08:46:28 -05:00
Mikayla Maki 89ddf14b0e Remove borrow from reveal_path() 2023-02-23 21:36:17 -08:00
Julia be86cb35ba Merge pull request #2213 from zed-industries/per-project-follow-status 
Differentiate between follow state on a per-project basis
 2023-02-24 00:26:41 -05:00
Julia 465d8cc2ff Differentiate between follow state on a per-project basis 2023-02-24 00:07:17 -05:00
Max Brunsfeld 93b9e762ec Merge pull request #2212 from zed-industries/initial-traffic-light-position 
Adjust window's traffic light position when setting its title
 2023-02-23 15:02:05 -08:00
Max Brunsfeld fbc934b884 Adjust window's traffic light position when setting its title 2023-02-23 14:44:45 -08:00
Mikayla Maki 350b7b82f7 Merge pull request #2207 from zed-industries/project-panel-actions 
Fix project panel actions
 2023-02-23 14:31:29 -08:00
Mikayla Maki b179fc2b99 Remove comment 2023-02-23 14:24:53 -08:00
Mikayla Maki 8860346324 Fix broken dock command 2023-02-23 14:15:29 -08:00
Mikayla Maki 9004640586 Convert keymap context to use generics and Cow<'static> so we don't have to add .to_string() and .into() for each usage 2023-02-23 14:10:55 -08:00
Kay Simmons 3f9405f8f1 Merge pull request #2210 from zed-industries/fix-enter-vim-normal-mode 
Fix enter in normal mode acting incorrectly
 2023-02-23 13:46:15 -08:00
Kay Simmons 2276d25bdf Fix enter in normal mode acting incorrectly 2023-02-23 13:40:31 -08:00
Mikayla Maki ffe53bed87 Reverts keymap precedence order change 2023-02-23 13:32:45 -08:00
Joseph Lyons 37f910949d Add link to community repo in feedback editor 2023-02-23 16:30:00 -05:00
Julia e1df85e86d Add same grayscale logic to followers which leaders have 2023-02-23 15:59:37 -05:00
Antonio Scandurra bbeb33bc7e Fix error when deleting rooms containing projects on refresh 
A foreign key violation was causing the server to never delete stale
rooms during `Database::refresh_room` due to having one or more project
records referencing the room.
 2023-02-23 15:54:35 +01:00
Antonio Scandurra 74e0bed38f Fix compilation errors after restructuring room_transaction 2023-02-23 15:17:22 +01:00
Antonio Scandurra 832549f1a3 Merge branch 'main' into call-ui-follow-up 2023-02-23 15:15:46 +01:00
Antonio Scandurra b965333325 Show avatar in user menu 2023-02-23 15:09:32 +01:00
Antonio Scandurra 59a66190e5 Avoid trying to reconnect to a room if client is signed out 2023-02-23 14:53:10 +01:00
Antonio Scandurra 9334267bd0 Tear down peer when signing out 2023-02-23 14:47:02 +01:00
Antonio Scandurra a0daf47134 Don't panic when rendering collab titlebar item while signed out 2023-02-23 14:46:02 +01:00
Petros Amoiridis 9a729a2e64 Merge pull request #2202 from zed-industries/petros/z-86-replace-terminal-tab-title-with-an-icon 
Replace terminal tab title with an icon
 2023-02-23 11:04:43 +02:00
Antonio Scandurra 1c636500de Merge pull request #2200 from zed-industries/fix-slow-project-join 
Hold room lock through the entirety of a `room_transaction`
 2023-02-23 09:11:58 +01:00
Max Brunsfeld 65a9ac449f Remove leave button from the title bar 2023-02-22 23:30:32 -08:00
Max Brunsfeld bf5c3d963a Rearrange collab titlebar items to avoid movement of the toggle contacts button 
* Replace username in titelbar with a `...` user menu that shows
  the current user name and contains a sign-in/sign-out button.
* Move the '+' (toggle contacts) button back to the right side.
* Move the collaborators back to the right side.
* Move the share/unshare button to the left side, beside the project title
* Only show the share/unshare button when in a call.
 2023-02-22 22:56:11 -08:00
Max BrunsfeldandJoseph Lyons 40aee8d7bc Add missing tooltip for contacts menu button 
Co-authored-by: Joseph Lyons <joseph@zed.dev>
 2023-02-22 14:18:17 -08:00
Max Brunsfeld 46ead28971 Bump RPC protocol version number 2023-02-22 13:40:14 -08:00
Max Brunsfeld 111aff29cc collab 0.6.0 2023-02-22 12:35:15 -08:00