Commit Graph

5191 Commits

Author SHA1 Message Date
Max Brunsfeld
f9a5ed3a85 Start work on a test for a worktree with symlink cycles 2022-07-18 12:23:07 +02:00
Max Brunsfeld
f6c1393dfd Restructure FakeFs to let it model symlinks
Instead of storing paths, model the FS more directly
as nodes
2022-07-18 12:23:07 +02:00
Antonio Scandurra
0aafc78eb7
Merge pull request #1385 from zed-industries/fix-lifetime-error
Fix spurious borrow checker error
2022-07-18 12:22:54 +02:00
Antonio Scandurra
51c40f4136
Merge pull request #1384 from zed-industries/expose-collaboration-metrics
Expose collaboration metrics
2022-07-18 10:44:29 +02:00
Antonio Scandurra
316a534a16 Allow querying active user counts for people that have collaborated 2022-07-18 10:29:10 +02:00
Isaac Clayton
c326a20193
Merge pull request #1367 from zed-industries/plugin-opaque
Guide to Opaque Types and Callbacks in Plugins
2022-07-18 09:20:10 +02:00
Antonio Scandurra
4664683069 Remove Redis 2022-07-18 08:59:35 +02:00
Antonio Scandurra
2cbb0ae843 Expose max number of project collaborators in Db::get_top_user_activity 2022-07-18 08:58:09 +02:00
Antonio Scandurra
ff1185062d
Merge pull request #1379 from zed-industries/fix-tab-panic
Handle inserting multiple tabs on the same row
2022-07-16 08:51:33 +02:00
Antonio Scandurra
af917de684 Handle inserting multiple tabs on the same row
This also fixes a panic when tabbing on a row that contained multi-byte
characters.
2022-07-16 08:40:44 +02:00
Mikayla Maki
92bc1a6eef
Merge pull request #1377 from zed-industries/bracketed-paste
Add bracketed paste support
2022-07-15 19:10:48 -07:00
Mikayla Maki
8349ead6b2 Add bracketed paste support 2022-07-15 19:01:08 -07:00
Mikayla Maki
cfc956d78f
Merge pull request #1376 from zed-industries/terminal-settings
Added settings for common terminal configurations
2022-07-15 18:50:40 -07:00
Mikayla Maki
6675c96c8a Removed some old dbgs and comments 2022-07-15 18:42:07 -07:00
Mikayla Maki
523e565b9b bad patch for panic on mis configured shell 2022-07-15 18:38:17 -07:00
Mikayla Maki
dc120c1e05 Added settings for common terminal configurations 2022-07-15 18:27:10 -07:00
Max Brunsfeld
eb23f13ac2 Update rust in collab Dockerfiles 2022-07-15 17:15:32 -07:00
Max Brunsfeld
af57871dae
Merge pull request #1375 from zed-industries/active-user-counts
Add an admin API for counting users with given amounts of activity
2022-07-15 17:08:31 -07:00
Max Brunsfeld
69146fb318 Allow the web client to specify activity bucket durations 2022-07-15 16:46:44 -07:00
Max Brunsfeld
1363d2c502 Add admin API for counting users with a given amount of activity 2022-07-15 16:46:44 -07:00
Mikayla Maki
024011a571
Merge pull request #1373 from zed-industries/copy-test-update
Update terminal testing to match new connection model.
2022-07-15 14:16:20 -07:00
Mikayla Maki
1b3fb257b2
Merge branch 'main' into copy-test-update 2022-07-15 13:24:11 -07:00
Mikayla Maki
dbec03376f
Merge pull request #1371 from zed-industries/keybindings-grind
Correctly report all keyboard events to the terminal
2022-07-15 12:30:31 -07:00
Mikayla Maki
e156675640 Revamped testing in terminals 2022-07-15 12:15:55 -07:00
Mikayla Maki
8282858941 Updated copy integration test to match retries on terminal integration test 2022-07-15 11:30:14 -07:00
Mikayla Maki
f38206f819
Merge branch 'main' into keybindings-grind 2022-07-15 11:24:16 -07:00
Mikayla Maki
3e86411627 Finished new keybindings system for now 2022-07-15 11:20:54 -07:00
Mikayla Maki
90428255d9 Added some simple tests for the new keybindings 2022-07-15 10:36:37 -07:00
Antonio Scandurra
c442612b10
Merge pull request #1368 from zed-industries/redis
Document using Redis and launch it in `Procfile`
2022-07-15 15:27:09 +02:00
Isaac Clayton
85cf703282 Fix typos, minor revisions 2022-07-15 13:16:01 +02:00
Isaac Clayton
d121226cd6 Write initial plan 2022-07-15 12:58:20 +02:00
Antonio Scandurra
660289e0a4 Ignore dump.rdb files 2022-07-15 12:09:37 +02:00
Antonio Scandurra
42d68af073 Add instructions to install redis and include it in Procfile 2022-07-15 10:41:07 +02:00
Mikayla Maki
f9995e1fcd Starting on tests 2022-07-15 00:26:04 -07:00
Antonio Scandurra
e5c55f9a54
Merge pull request #1365 from zed-industries/illustrate-buffer-path
Illustrate `format_on_save` external command using prettier
2022-07-15 09:13:13 +02:00
Antonio Scandurra
b5765bc8cd Illustrate format_on_save external command using prettier
This gives us a chance to highlight a real-world scenario that a lot
of our users will want to use, as well as showcasing the special
`{buffer_path}` argument.
2022-07-15 09:00:10 +02:00
Antonio Scandurra
d89465c451
Merge pull request #1356 from zed-industries/differentiate-same-tab-titles
Differentiate among tabs with the same name
2022-07-15 08:30:22 +02:00
Mikayla Maki
8220b37c4f Method rename 2022-07-14 17:25:17 -07:00
Mikayla Maki
1935208de6 Clean up prints 2022-07-14 17:23:43 -07:00
Mikayla Maki
98651c4b86 New key mapping system in place and working 2022-07-14 17:21:30 -07:00
Mikayla Maki
2e749631fe Checkpoint, have caret notation implemented 2022-07-14 16:27:02 -07:00
Mikayla Maki
a0d0de510d
Merge pull request #1364 from zed-industries/terminal-test
Terminal test
2022-07-14 13:35:16 -07:00
Mikayla Maki
6ad5bd4505
Merge pull request #1363 from zed-industries/color-issues
Tidied up the terminal theme
2022-07-14 13:31:09 -07:00
Mikayla Maki
cf5c20c3a5 Remembered how to use a terminal 2022-07-14 13:15:42 -07:00
Mikayla Maki
0e257b4009 Increased test duration 2022-07-14 13:15:02 -07:00
Mikayla Maki
ee61671f92 Tidied up the terminal theme 2022-07-14 13:10:01 -07:00
Keith Simmons
17f52fb587
Merge pull request #1355 from zed-industries/better-tab-ordering
More intuitive tab ordering
2022-07-14 12:26:46 -07:00
Antonio Scandurra
d4ee372eab 🎨 2022-07-14 16:46:45 +02:00
Antonio Scandurra
49ef33090c Add test for tab disambiguation 2022-07-14 16:42:30 +02:00
Isaac Clayton
94b443a704
Merge pull request #1359 from zed-industries/plugin-json-enable
Plugin json enable
2022-07-14 16:37:53 +02:00