oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,048 Commits 1 Branch 0 Tags
6d9b8cc5950cec7bede4e287ec0ebdf3aeeb4e5d
Commit Graph
18048 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mikayla Maki 0082d68d4a Revert "Convert git status calculation to use Entry IDs as the key instead of repo relative paths" 
This reverts commit 728c6892c924ebeabb086e308ec4b5f56c4fd72a.
 2023-05-10 17:37:36 -07:00
Petros Amoiridis 21e1bdc8cd Fix yellow to be yellow 2023-05-10 17:37:36 -07:00
Petros Amoiridis 6b4242cded Use theme.editor.diff for the colors 2023-05-10 17:37:36 -07:00
Mikayla Maki f935047ff2 Convert git status calculation to use Entry IDs as the key instead of repo relative paths 2023-05-10 17:37:36 -07:00
Mikayla Maki 94a0de4c9f Fix compile errors 2023-05-10 17:37:36 -07:00
Mikayla Maki a58a33fc93 WIP: integrate status with collab 2023-05-10 17:37:36 -07:00
Mikayla Maki 18cec8d64f Format 2023-05-10 17:37:36 -07:00
Mikayla Maki e98507d8bf Added git status to the project panel, added worktree test 2023-05-10 17:37:36 -07:00
Mikayla Maki 93f57430da Track live entry status in repository 2023-05-10 17:37:36 -07:00
Mikayla Maki bd98f78101 Fix compile error 2023-05-10 17:37:36 -07:00
Mikayla Makiandpetros 67491632cb WIP: Track live entry status in repository 
co-authored-by: petros <petros@zed.dev>
 2023-05-10 17:37:36 -07:00
Mikayla Makiandpetros 7169f5c760 Add git status to the file system abstraction 
co-authored-by: petros <petros@zed.dev>
 2023-05-10 17:37:36 -07:00
Max Brunsfeld cee7edabf9 Ensure the SettingsStore global is added in tests 2023-05-10 16:39:59 -07:00
Joseph Lyons 6385e51957 collab 0.12.1 2023-05-10 18:16:20 -04:00
Joseph Lyons 9405b49957 v0.87.x dev 2023-05-10 16:47:09 -04:00
Max Brunsfeld 68867fe2e1 Define journal settings in journal crate 2023-05-10 12:59:24 -07:00
Max Brunsfeld aa6ea920e2 Define telemetry settings in the client crate 2023-05-10 12:59:24 -07:00
Max Brunsfeld 9b06be2aa2 Define vim_mode setting in vim crate 2023-05-10 12:59:24 -07:00
Max Brunsfeld 926d7b356d Define auto_update setting in the auto_update crate 2023-05-10 12:59:24 -07:00
Max Brunsfeld b6b2c5d1d1 Generalize settings JSON schema logic to work w/ arbitrary setting types 2023-05-10 12:59:24 -07:00
Max Brunsfeld 9a6a2d9d27 Start using the SettingsStore in the app 2023-05-10 12:59:24 -07:00
Max Brunsfeld 316f791a77 Add generic update method to SettingsStore 2023-05-10 12:59:24 -07:00
Max Brunsfeld 24e06334d0 Allow registering additional settings after loading global settings 2023-05-10 12:59:24 -07:00
Max Brunsfeld 5de9652a22 Create proof-of-concept SettingStore struct 2023-05-10 12:59:22 -07:00
Nathan SoboandJulia Risley 5549669316 Test moving panels 
Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-05-10 10:41:03 -06:00
Mikayla Maki c7fcc031eb Merge pull request #2460 from zed-industries/show-dock-on-activate 
Fix bug with terminal button
 2023-05-10 09:08:45 -07:00
Nathan Sobo cc21421ea8 Rename item to panel in various locations 2023-05-10 09:54:20 -06:00
Mikayla Maki 0dce5ba7ae Fix bug with terminal button 2023-05-10 08:15:20 -07:00
Antonio Scandurra 0ccb4a50e6 Create more specific dock position settings associated with each panel 2023-05-10 16:52:10 +02:00
Antonio Scandurra e507eadb4b Rely on root getting re-focused when panel isn't rendered 
This achieves two things:

- When a panel like `TerminalPanel` closes its last tab, the focus
is returned to the root view (the `Workspace`)
- When a panel is moved from a dock to another, it will get rendered
in another spot but the focus will be kept on the panel

This also ensures the focus is not lost when a panel is moved from
a dock to another because that view
 2023-05-10 15:43:44 +02:00
Antonio Scandurra 9b9d53fcf8 Focus the root view if the previously-focused view isn't rendered 2023-05-10 15:40:46 +02:00
Antonio Scandurra cdcb7c8084 Merge branch 'main' into panels 2023-05-10 15:23:37 +02:00
Antonio Scandurra f28eee88b6 Add context menu to change panel position 2023-05-10 14:05:48 +02:00
Antonio Scandurra 8fa379bbc5 Maintain panel visibility when changing its position 2023-05-10 11:06:37 +02:00
Antonio Scandurra 6e3ce6332a Fix panic when not specifying a project_panel setting 2023-05-10 10:43:42 +02:00
Kirill Bulatov eec60556ab Highlight include/exclude inputs when errors happen there 2023-05-10 11:11:31 +03:00
Kirill Bulatov dfdf7e4866 Test the search inclusions/exclusions 2023-05-10 11:11:31 +03:00
Kirill Bulatov 80fc1bc276 Use placeholder in include/exclude editors 2023-05-10 11:11:31 +03:00
Kirill BulatovandJulia 0e31d13a1e Rework tab and escape key handling in search panel 
Fixes
https://linear.app/zed-industries/issue/Z-1238/focus-the-results-multibuffer-in-project-search-on-esc

and adds a tab shortcut for project search inputs

co-authored-by: Julia <julia@zed.dev>
 2023-05-10 11:11:31 +03:00
Kirill Bulatov 3da55c14a6 Fix arrow layout 2023-05-10 11:11:31 +03:00
Kirill Bulatov 6fb8679184 Trim glob input 2023-05-10 11:11:31 +03:00
Kirill BulatovandMax 13296d502c Extra rows approach draft 
co-authored-by: Max <max@zed.dev>
 2023-05-10 11:11:31 +03:00
Kirill Bulatov b5abac6af6 Draft search include/exclude logic 2023-05-10 11:11:31 +03:00
Kirill Bulatov 915154b047 Add initial include/exclude project search UI 2023-05-10 11:11:31 +03:00
Antonio Scandurra 3115c8381d Merge pull request #2458 from zed-industries/fix-context-menu-click 
Always dismiss context menu on click
 2023-05-10 09:24:23 +02:00
Antonio Scandurra 1b5e79251c Always dismiss context menu on click 2023-05-10 09:18:13 +02:00
Nathan Sobo 9173916ab8 Remove unused terminal_button module 2023-05-09 20:24:37 -06:00
Nathan Sobo f554877ff4 Render the bottom dock buttons before the right dock buttons 2023-05-09 17:41:24 -06:00
Nathan SoboandJoseph Lyons ba248244ec Allow terminal to be docked left, bottom, or right 
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
 2023-05-09 17:36:49 -06:00
Nathan SoboandJoseph Lyons 6a7feb4c4c Allow the project panel to be docked right or left 
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
 2023-05-09 17:26:54 -06:00