Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• fa32adecd5 Fixup more, tests finally pass Julia 2023-05-14 12:05:50 -04:00
• ba50b35de6 wip Nathan Sobo 2023-05-13 14:34:09 -06:00
• db87e83bad Merge pull request #2469 from zed-industries/fix-git-init-bug Mikayla Maki 2023-05-13 10:47:55 -07:00
• a6a4b846bc fmt Mikayla Maki 2023-05-13 10:43:16 -07:00
• 5e2aaf45a0 Fix repository initialization bug Mikayla Maki 2023-05-13 10:38:24 -07:00
• 3534665e2b Merge pull request #2468 from zed-industries/touch-up-status Mikayla Maki 2023-05-13 09:38:02 -07:00
• 04041af78b Fixed bug with failing to clear git file status Mikayla Maki 2023-05-13 02:40:22 -07:00
• 62c445da57 Match priority of folder highlights to vscode Mikayla Maki 2023-05-13 02:30:59 -07:00
• 41bef2e444 Refactor out git status into FileName component Integrate file name component into the editor's tab content Mikayla Maki 2023-05-13 02:26:45 -07:00
• 6c60853842 Don't close panel on event unless active; add tests Nathan Sobo 2023-05-12 15:44:09 -06:00
• bd795d7607 Preserve panel size when re-docking between left and right Nathan Sobo 2023-05-12 15:15:11 -06:00
• e1c1100c7b Merge pull request #2466 from zed-industries/update-release-links Joseph T. Lyons 2023-05-12 14:08:10 -04:00
• b70c874a0e Update release links Joseph Lyons 2023-05-12 14:04:36 -04:00
• ad7ed56e6b Delete pull_request_template.md Mikayla Maki 2023-05-12 10:15:13 -07:00
• 4663ac8abf Create pull_request_template.md Mikayla Maki 2023-05-12 10:14:54 -07:00
• e71846c653 Create pull_request_template.md Mikayla Maki 2023-05-12 10:12:47 -07:00
• deac8a6ff9 Merge pull request #2465 from zed-industries/stream-branch-first Mikayla Maki 2023-05-12 09:45:40 -07:00
• 60320c6b09 Send the root branch along with it's entry Mikayla Maki 2023-05-12 09:37:02 -07:00
• 54e9e7c35b Merge pull request #2464 from zed-industries/remove-between Mikayla Maki 2023-05-12 08:59:56 -07:00
• 214354b4da Make panels independently resizable Nathan Sobo 2023-05-11 23:25:05 -06:00
• 6ef0f70528 Made the map seek target a publicly implementable interface Integrated remove_range with the existing git code Mikayla MakiandNathan 2023-05-12 08:37:07 -07:00
• ee3637216e Add TreeMap::remove_between that can take abstract start and end points Nathan Sobo 2023-05-11 23:20:20 -06:00
• 89352a2bdc Merge pull request #2463 from zed-industries/kb/reapply-modal-accessibility Kirill Bulatov 2023-05-12 06:11:04 +03:00
• 9ae10a5dd9 Add a better API for updating settings in the SettingsStore in tests Max Brunsfeld 2023-05-11 14:39:43 -07:00
• defc9c8591 Merge pull request #2455 from zed-industries/git-status-viewer Mikayla Maki 2023-05-11 16:13:34 -07:00
• 5fe8b73f04 compile error 😅 Mikayla Maki 2023-05-11 16:07:41 -07:00
• d526fa6f1f fmt Mikayla Maki 2023-05-11 16:06:56 -07:00
• d538994c7f Use more efficient sum tree traversals for removal and improve ergonomics with iter_from Mikayla MakiandNathan 2023-05-11 16:06:25 -07:00
• 72655fc41d fmt Mikayla Maki 2023-05-11 13:25:57 -07:00
• 6f87f9c51f Don't scan for statuses in files that are ignored Mikayla Maki 2023-05-11 13:25:07 -07:00
• 1bb34e08bb Fix test Mikayla Maki 2023-05-11 12:03:39 -07:00
• dfb6a2f7fc fmt Mikayla Maki 2023-05-11 12:02:25 -07:00
• 5b2ee63f80 Added status trickle up Mikayla Maki 2023-05-11 12:01:42 -07:00
• f12dffa60c Reintroduce more accesible modal keybindings Kirill Bulatov 2023-05-11 20:59:10 +03:00
• 5accf7cf4e Update is_deleted when sending new repositories Mikayla Maki 2023-05-11 10:21:25 -07:00
• bebb5456c7 Merge pull request #2461 from zed-industries/ci-target-dir-size Max Brunsfeld 2023-05-11 09:57:36 -07:00
• 3550110e57 ci: clear the target dir if it gets too big Max Brunsfeld 2023-05-11 09:43:13 -07:00
• 191ac86f09 Remove the CORRECT, overly agressive deletion codepath Mikayla Maki 2023-05-11 09:24:36 -07:00
• 0ab94551f4 Revert "More keybindings in macOs modals with buttons" Joseph Lyons 2023-05-11 11:37:34 -04:00
• 0f34af50a8 Use path list generated during entry reload of a refresh request Julia 2023-05-10 23:37:02 -04:00
• adfbbf21b2 fmt Mikayla Maki 2023-05-10 20:09:37 -07:00
• f5c633e80c Fixed bug in status deletion marking Mikayla Maki 2023-05-10 19:54:02 -07:00
• fca3bb3b93 Add randomized test for git statuses Mikayla Maki 2023-05-10 19:21:27 -07:00
• 9800a149a6 Remove some external context from git status test Mikayla Maki 2023-05-10 17:59:33 -07:00
• f55ca7ae3c Fix incorrect import Mikayla Maki 2023-05-10 17:52:23 -07:00
• 18becabfa5 Add postgres migration Mikayla Maki 2023-05-10 17:50:30 -07:00
• bc5b78198a Define terminal settings in terminal crate Max Brunsfeld 2023-05-10 17:43:10 -07:00
• c7166fde3b Bump protocol version Mikayla Maki 2023-05-10 17:38:29 -07:00
• 65d4c4f6ed Add integration test for git status Mikayla Maki 2023-05-10 17:36:16 -07:00
• e20eaca595 Got basic replication working :) Mikayla Maki 2023-05-10 16:07:41 -07:00
• 2b80dfa81d Update protos Mikayla Maki 2023-05-10 11:59:04 -07:00
• 00b345fdfe Use sum tree traversal to remove paths Mikayla Maki 2023-05-10 11:28:39 -07:00
• 23a19d85b8 Fix bug in status detection when removing a directory Mikayla Maki 2023-05-10 09:55:10 -07:00
• 0082d68d4a Revert "Convert git status calculation to use Entry IDs as the key instead of repo relative paths" Mikayla Maki 2023-05-10 08:49:30 -07:00
• 21e1bdc8cd Fix yellow to be yellow Petros Amoiridis 2023-05-10 17:05:53 +03:00
• 6b4242cded Use theme.editor.diff for the colors Petros Amoiridis 2023-05-10 16:21:24 +03:00
• f935047ff2 Convert git status calculation to use Entry IDs as the key instead of repo relative paths Mikayla Maki 2023-05-09 21:06:23 -07:00
• 94a0de4c9f Fix compile errors Mikayla Maki 2023-05-09 19:35:15 -07:00
• a58a33fc93 WIP: integrate status with collab Mikayla Maki 2023-05-09 19:29:45 -07:00
• 18cec8d64f Format Mikayla Maki 2023-05-09 14:49:35 -07:00
• e98507d8bf Added git status to the project panel, added worktree test Mikayla Maki 2023-05-09 14:42:51 -07:00
• 93f57430da Track live entry status in repository Mikayla Maki 2023-05-09 10:13:22 -07:00
• bd98f78101 Fix compile error Mikayla Maki 2023-05-09 10:04:44 -07:00
• 67491632cb WIP: Track live entry status in repository Mikayla Makiandpetros 2023-05-09 10:02:58 -07:00
• 7169f5c760 Add git status to the file system abstraction Mikayla Makiandpetros 2023-05-09 08:36:43 -07:00
• cee7edabf9 Ensure the SettingsStore global is added in tests Max Brunsfeld 2023-05-10 16:39:59 -07:00
• 6385e51957 collab 0.12.1 Joseph Lyons 2023-05-10 18:16:20 -04:00
• 9405b49957 v0.87.x dev Joseph Lyons 2023-05-10 16:47:09 -04:00
• 68867fe2e1 Define journal settings in journal crate Max Brunsfeld 2023-05-10 12:48:09 -07:00
• aa6ea920e2 Define telemetry settings in the client crate Max Brunsfeld 2023-05-10 12:17:52 -07:00
• 9b06be2aa2 Define vim_mode setting in vim crate Max Brunsfeld 2023-05-10 11:06:55 -07:00
• 926d7b356d Define auto_update setting in the auto_update crate Max Brunsfeld 2023-05-10 10:25:49 -07:00
• b6b2c5d1d1 Generalize settings JSON schema logic to work w/ arbitrary setting types Max Brunsfeld 2023-05-10 09:56:58 -07:00
• 9a6a2d9d27 Start using the SettingsStore in the app Max Brunsfeld 2023-05-09 18:14:42 -07:00
• 316f791a77 Add generic update method to SettingsStore Max Brunsfeld 2023-05-08 17:52:52 -07:00
• 24e06334d0 Allow registering additional settings after loading global settings Max Brunsfeld 2023-05-08 14:05:38 -07:00
• 5de9652a22 Create proof-of-concept SettingStore struct Max Brunsfeld 2023-05-03 16:59:44 -07:00
• 5549669316 Test moving panels Nathan SoboandJulia Risley 2023-05-10 10:41:03 -06:00
• c7fcc031eb Merge pull request #2460 from zed-industries/show-dock-on-activate Mikayla Maki 2023-05-10 09:08:45 -07:00
• cc21421ea8 Rename item to panel in various locations Nathan Sobo 2023-05-10 09:54:20 -06:00
• 0dce5ba7ae Fix bug with terminal button Mikayla Maki 2023-05-10 08:15:20 -07:00
• 0ccb4a50e6 Create more specific dock position settings associated with each panel Antonio Scandurra 2023-05-10 16:52:10 +02:00
• e507eadb4b Rely on root getting re-focused when panel isn't rendered Antonio Scandurra 2023-05-10 15:43:44 +02:00
• 9b9d53fcf8 Focus the root view if the previously-focused view isn't rendered Antonio Scandurra 2023-05-10 15:40:46 +02:00
• cdcb7c8084 Merge branch 'main' into panels Antonio Scandurra 2023-05-10 15:23:37 +02:00
• f28eee88b6 Add context menu to change panel position Antonio Scandurra 2023-05-10 14:05:48 +02:00
• 8fa379bbc5 Maintain panel visibility when changing its position Antonio Scandurra 2023-05-10 11:06:37 +02:00
• 6e3ce6332a Fix panic when not specifying a project_panel setting Antonio Scandurra 2023-05-10 10:43:42 +02:00
• eec60556ab Highlight include/exclude inputs when errors happen there Kirill Bulatov 2023-05-10 00:06:44 +03:00
• dfdf7e4866 Test the search inclusions/exclusions Kirill Bulatov 2023-05-09 23:33:55 +03:00
• 80fc1bc276 Use placeholder in include/exclude editors Kirill Bulatov 2023-05-09 22:31:38 +03:00
• 0e31d13a1e Rework tab and escape key handling in search panel Kirill BulatovandJulia 2023-05-09 20:09:15 +03:00
• 3da55c14a6 Fix arrow layout Kirill Bulatov 2023-05-09 16:59:58 +03:00
• 6fb8679184 Trim glob input Kirill Bulatov 2023-05-09 15:20:19 +03:00
• 13296d502c Extra rows approach draft Kirill BulatovandMax 2023-05-09 13:55:18 +03:00
• b5abac6af6 Draft search include/exclude logic Kirill Bulatov 2023-05-07 22:50:54 +03:00
• 915154b047 Add initial include/exclude project search UI Kirill Bulatov 2023-05-07 22:17:26 +03:00
• 3115c8381d Merge pull request #2458 from zed-industries/fix-context-menu-click Antonio Scandurra 2023-05-10 09:24:23 +02:00
• 1b5e79251c Always dismiss context menu on click Antonio Scandurra 2023-05-10 09:18:13 +02:00
• 9173916ab8 Remove unused terminal_button module Nathan Sobo 2023-05-09 20:24:37 -06:00