Commit Graph
2567 Commits
Author SHA1 Message Date
Mikayla Maki b72cdb7362 Refactored apart the forward and the backwards iterator for diff hunks 2023-05-19 18:09:47 -07:00
Antonio Scandurra b6997ef75b Toggle project panel when opening new workspace in a dock-agnostic way 2023-05-19 15:27:18 +02:00
Max Brunsfeld b2a5ea65d2 collab 0.12.4 2023-05-18 14:58:57 -07:00
Mikayla Maki dae8bdef76 fmt 2023-05-18 14:31:08 -07:00
Mikayla Maki fced05ea25 Fixed an imprecise join in rejoin room 2023-05-18 14:29:18 -07:00
Max Brunsfeld f19a84dfdf collab 0.12.3 2023-05-18 12:27:08 -07:00
Joseph Lyons 2edf8884d6 collab 0.12.2 2023-05-18 12:27:01 -07:00
Max Brunsfeld ca973b874e Log how long it takes to handle each RPC message 2023-05-18 12:24:07 -07:00
Max Brunsfeld c261a01c7f Define theme/ui text style settings in theme crate 2023-05-17 14:44:59 -07:00
Max Brunsfeld ca02b558c8 Merge branch 'main' into setting-store 2023-05-17 09:55:24 -07:00
Max Brunsfeld 2f05e3d502 Define project settings in project crate 2023-05-16 17:45:04 -07:00
Max Brunsfeld a802da9dae Define editor settings in editor crate 2023-05-16 17:30:29 -07:00
Max Brunsfeld 56f2ff64ed Define language settings in the language crate 2023-05-16 17:29:53 -07:00
Mikayla Maki ee2b629435 Update proto names to reflect new status info 2023-05-15 16:20:01 -07:00
Mikayla Maki 50a6410ae8 fmt 2023-05-11 12:02:25 -07:00
Mikayla Maki 4e408e7758 Added status trickle up 2023-05-11 12:01:42 -07:00
Mikayla Maki c0d0eefb54 Update is_deleted when sending new repositories 2023-05-11 10:21:25 -07:00
Mikayla Maki 26658419a3 Remove the CORRECT, overly agressive deletion codepath 2023-05-11 09:24:36 -07:00
Mikayla Maki fec0b1acb4 fmt 2023-05-10 20:09:37 -07:00
Mikayla Maki ae50a2f213 Fixed bug in status deletion marking 2023-05-10 19:54:02 -07:00
Mikayla Maki 0c34c073ec Add randomized test for git statuses 2023-05-10 19:21:27 -07:00
Mikayla Maki 732949181b Add postgres migration 2023-05-10 17:50:35 -07:00
Mikayla Maki d0c4ee38de Add integration test for git status 2023-05-10 17:37:36 -07:00
Mikayla Maki d2ce29f171 Got basic replication working :) 2023-05-10 17:37:36 -07:00
Mikayla Maki e487896125 Update protos 2023-05-10 17:37:36 -07:00
Mikayla Maki c2c9c36e95 Fix bug in status detection when removing a directory 2023-05-10 17:37:36 -07:00
Mikayla Maki e920ede88c 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
Mikayla Maki ea28af0c6a 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 c1839b2ba2 Fix compile errors 2023-05-10 17:37:36 -07:00
Mikayla Maki ac8f4d47f8 WIP: integrate status with collab 2023-05-10 17:37:36 -07:00
Max Brunsfeld 876d8b3e09 Ensure the SettingsStore global is added in tests 2023-05-10 16:39:59 -07:00
Joseph Lyons 9f1015be60 collab 0.12.1 2023-05-10 18:16:20 -04:00
Antonio Scandurra f1363f8f70 Merge branch 'main' into panels 2023-05-10 15:23:37 +02:00
Kirill Bulatov c95f4a81e2 Add initial include/exclude project search UI 2023-05-10 11:11:31 +03:00
Nathan Sobo e7d9fdc4b5 Remove dock from workspace 2023-05-09 10:18:10 +02:00
Max Brunsfeld 8afc8a01d5 collab 0.12.0 2023-05-08 15:54:11 -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 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 162e1ba814 Adjust tests to not create repositories inside repositories 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 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
Antonio Scandurra cbf84f3795 Merge pull request #2441 from zed-industries/implicit-ancestry
Determine view ancestry during layout
2023-05-05 10:58:00 +02:00
Julia cac502638d Fixup cases using buffer model handle id as buffer id 2023-05-04 12:32:31 -04:00
Antonio Scandurra 3c580153ed Merge branch 'main' into implicit-ancestry 2023-05-04 14:39:58 +02:00