Commit Graph
9103 Commits
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
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
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
Mikayla Maki 0dce5ba7ae Fix bug with terminal button 2023-05-10 08:15:20 -07: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 5e8b7bd06d Replace todo with unimplemented to reduce distractions 2023-05-09 16:31:53 -06:00
Mikayla Maki 26d80eef0a Merge pull request #2456 from zed-industries/fix-dock-pane-focus
Make dock not eagerly steal focus from sub items
2023-05-09 15:59:06 -04:00
Mikayla Maki 0214228689 Fix format 2023-05-09 12:54:53 -07:00
Mikayla Maki 6dfb48dbd5 Fix center items not being activated when deserialized 2023-05-09 12:27:07 -07:00
Mikayla Maki 8d561d6408 Make dock not eagerly steal focus from sub items 2023-05-09 12:00:09 -07:00
Mikayla Maki 2d7cfb8c7c Merge pull request #2454 from zed-industries/fix-mismatching-panes-when-deserializing-empty-panes
Fully remove panes and update internal data structures
2023-05-08 20:37:06 -04:00
Mikayla Maki fa049bea6e Refactor and fix format 2023-05-08 17:32:40 -07:00
Mikayla Maki 49335d017a Add manual removal code to remove_panes 2023-05-08 17:25:28 -07:00
Mikayla Maki 9b2d3fcd48 Fully remove panes and update internal data structures 2023-05-08 17:09:29 -07:00
Max Brunsfeld 8fd0c9fb0e collab 0.12.0 2023-05-08 15:54:11 -07:00
Mikayla Maki 1d66f24f23 Merge pull request #2428 from zed-industries/add-branch-name
Add branch name and synchronize repository representations on the worktree.
2023-05-08 17:40:47 -04:00
Mikayla Maki 9366a0dbee Bump protocol version number 2023-05-08 14:34:14 -07:00
Mikayla Maki f28419cfd1 Fix styling of titlebar highlights 2023-05-08 14:33:59 -07:00
Mikayla Maki 712fb5ad7f Add postgres migration 2023-05-08 14:33:59 -07:00
Mikayla Maki 1a9afd186b Restore randomized integration tests 2023-05-08 14:33:59 -07:00
Mikayla Maki 15d2f19b4a fix format 2023-05-08 14:33:59 -07:00
Mikayla Maki d2279674a7 Fix panic in tests 2023-05-08 14:33:59 -07:00
Mikayla Maki 62e763d0d3 Removed test modifications, added special case to git initialization for when the repository is inside a .git folder 2023-05-08 14:33:59 -07:00
Mikayla Maki f9e4464658 Refresh titlebar on project notifications 2023-05-08 14:33:59 -07:00
Mikayla Maki 2c2076bd77 Adjust tests to not create repositories inside repositories 2023-05-08 14:33:59 -07:00
Mikayla MakiandMax ab952f1b31 Fixed randomized test failures
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandMax d8dac07408 Removed scan ID from repository interfaces
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 270147d20c Finished RepositoryEntry refactoring, smoke tests passing
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00