Commit Graph
9095 Commits
Author SHA1 Message Date
Mikayla Maki f4e09c47c6 Track live entry status in repository 2023-05-10 17:37:36 -07:00
Mikayla Maki 1bbcc63d01 Fix compile error 2023-05-10 17:37:36 -07:00
Mikayla Makiandpetros 5ab87cd95c WIP: Track live entry status in repository
co-authored-by: petros <petros@zed.dev>
2023-05-10 17:37:36 -07:00
Mikayla Makiandpetros 94ec496577 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 9f1015be60 collab 0.12.1 2023-05-10 18:16:20 -04:00
Joseph Lyons d6e43c6160 v0.87.x dev 2023-05-10 16:47:09 -04:00
Mikayla Maki ef74b4ca07 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 e22271d773 Fix bug with terminal button 2023-05-10 08:15:20 -07:00
Kirill Bulatov 9f9526be5d Highlight include/exclude inputs when errors happen there 2023-05-10 11:11:31 +03:00
Kirill Bulatov 5291e79ecb Test the search inclusions/exclusions 2023-05-10 11:11:31 +03:00
Kirill Bulatov bbe2bd57c0 Use placeholder in include/exclude editors 2023-05-10 11:11:31 +03:00
Kirill BulatovandJulia 75ff55bad5 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 2476868858 Fix arrow layout 2023-05-10 11:11:31 +03:00
Kirill Bulatov 95f94548db Trim glob input 2023-05-10 11:11:31 +03:00
Kirill BulatovandMax 330ca21885 Extra rows approach draft
co-authored-by: Max <max@zed.dev>
2023-05-10 11:11:31 +03:00
Kirill Bulatov 44df6b5afd Draft search include/exclude logic 2023-05-10 11:11:31 +03:00
Kirill Bulatov c95f4a81e2 Add initial include/exclude project search UI 2023-05-10 11:11:31 +03:00
Antonio Scandurra ecfb2fa600 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 b18c01425f Always dismiss context menu on click 2023-05-10 09:18:13 +02:00
Nathan Sobo d3f1ecf67b Replace todo with unimplemented to reduce distractions 2023-05-09 16:31:53 -06:00
Mikayla Maki 2ab7020207 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 fcfe78b086 Fix format 2023-05-09 12:54:53 -07:00
Mikayla Maki 70dfc8448c Fix center items not being activated when deserialized 2023-05-09 12:27:07 -07:00
Mikayla Maki dd9ddcc71a Make dock not eagerly steal focus from sub items 2023-05-09 12:00:09 -07:00
Mikayla Maki 4e433a3bf5 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 6c599f4b82 Refactor and fix format 2023-05-08 17:32:40 -07:00
Mikayla Maki 2de2e8a94c Add manual removal code to remove_panes 2023-05-08 17:25:28 -07:00
Mikayla Maki ed1f4f8d77 Fully remove panes and update internal data structures 2023-05-08 17:09:29 -07:00
Max Brunsfeld 8afc8a01d5 collab 0.12.0 2023-05-08 15:54:11 -07:00
Mikayla Maki dc32c72e77 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 1f544cf486 Bump protocol version number 2023-05-08 14:34:14 -07:00
Mikayla Maki 858efd1f63 Fix styling of titlebar highlights 2023-05-08 14:33:59 -07:00
Mikayla Maki 53bccf44fd Add postgres migration 2023-05-08 14:33:59 -07:00
Mikayla Maki cb5ca6c54c Restore randomized integration tests 2023-05-08 14:33:59 -07:00
Mikayla Maki 1ea9ec550c fix format 2023-05-08 14:33:59 -07:00
Mikayla Maki 7fce8a259e Fix panic in tests 2023-05-08 14:33:59 -07:00
Mikayla Maki 7a40544d05 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 b241677bf8 Refresh titlebar on project notifications 2023-05-08 14:33:59 -07:00
Mikayla Maki 162e1ba814 Adjust tests to not create repositories inside repositories 2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 09b0ea9e7b Fixed randomized test failures
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 134e12a79d Removed scan ID from repository interfaces
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 1d5c06465c Finished RepositoryEntry refactoring, smoke tests passing
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla Maki c5f4722a4a WIP: Change RepositoryEntry representation to be keyed off of the work directory
Removes branches button scaffolding
2023-05-08 14:33:59 -07:00
950b5873a6 WIP: re-arranging the RepositoryEntry representation
Added branches to the randomized test to check the git branch
Added the remaining database integrations in collab

Co-authored-by: Max <max@zed.dev>
Co-authored-by: Petros <petros@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandPetros 585e612b3a Add branch name in title UI
co-authored-by: Petros <petros@zed.dev>
2023-05-08 14:33:59 -07:00
Petros Amoiridis e2df701b38 Rebase main and fix error 2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 46db4cbb79 WIP: Add repository entries to collab and synchronize when rejoining the room
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla Maki 8f3c07b943 Add proto fields for repository entry maintenance 2023-05-08 14:33:59 -07:00
Mikayla Maki adf07dc837 Add smoke test for collaboration 2023-05-08 14:33:59 -07:00
Petros Amoiridis 1902d69e19 Remove unused functions 2023-05-08 14:33:59 -07:00