Commit graph

5228 commits

Author SHA1 Message Date
Mikayla Maki
c9584a9d0c Continuing rebases on other work 2022-07-20 10:04:08 -07:00
Mikayla Maki
a4ca11ba17 Finished design touchups 2022-07-20 10:04:08 -07:00
Mikayla Maki
c19956373a Finished bel, moving on to title 2022-07-20 10:04:06 -07:00
Nate Butler
d76cdb01be
Merge pull request #1380 from zed-industries/theme-improvements
Theme improvements
2022-07-20 10:40:09 -04:00
Nate Butler
55dee53e80 Regenerate package-lock.json 2022-07-19 20:12:50 -04:00
Nate Butler
bcc554a3db Merge branch 'main' into theme-improvements 2022-07-19 20:12:02 -04:00
Nate Butler
df0023ad65 Update package-lock.json 2022-07-19 20:09:28 -04:00
Keith Simmons
c2868a39e8
Merge pull request #1388 from zed-industries/mouse-region-refactor
Mouse Region Refactor
2022-07-19 16:50:12 -07:00
Nate Butler
5bf9db2e21 Fix incorrectly named icons 2022-07-19 17:13:40 -04:00
Nate Butler
9beeef6385 Update some contact panel styling 2022-07-19 17:11:26 -04:00
Nate Butler
46384e71b7 Add icon sets for sizes 8, 12 and 16, remove old icons 2022-07-19 17:11:15 -04:00
Max Brunsfeld
e5602b0ad4 0.48.1 2022-07-18 19:11:12 -07:00
Max Brunsfeld
815ce22fb7 Revert "Merge pull request #1359 from zed-industries/plugin-json-enable"
This reverts commit 94b443a704, reversing
changes made to 285832e810.
2022-07-18 19:04:49 -07:00
Max Brunsfeld
142a019ada 0.48.0 2022-07-18 16:24:57 -07:00
Max Brunsfeld
1a1ec1b81a
Merge pull request #1391 from zed-industries/dismiss-project-panel-rename
Dismiss project panel's rename editor when it loses focus
2022-07-18 16:23:15 -07:00
Max Brunsfeld
c1dfb6294b Dismiss project panel's rename editor when it loses focus 2022-07-18 16:10:09 -07:00
Max Brunsfeld
2ab732efdb
Merge pull request #1390 from zed-industries/fix-fs-watch-leak
Ensure that FS watchers are dropped when dropping their event stream
2022-07-18 15:16:41 -07:00
Max Brunsfeld
b4392ec11c
Merge pull request #1389 from zed-industries/no-gpu
Avoid panic when unable to access a GPU
2022-07-18 15:08:58 -07:00
Max Brunsfeld
43613fe2ac Ensure that fs watches are dropped when dropping the event stream 2022-07-18 14:55:24 -07:00
Max Brunsfeld
7998771d9f Avoid panic when unable to access a GPU
This will remove noise from our panic logs.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-07-18 14:13:12 -07:00
K Simmons
deeefed7eb Change mouse_event_handler to use HandlerSet 2022-07-18 10:08:14 -07:00
K Simmons
ec25fa9260 Extract handler set from MouseRegion 2022-07-18 09:54:48 -07:00
Nate Butler
bb91492098 Fix missing red color in sandcastle theme 2022-07-18 12:33:09 -04:00
Nate Butler
aafaee7463 Fix missing red/incorrect hex colors in one-light 2022-07-18 12:05:27 -04:00
Antonio Scandurra
59366a5c44
Merge pull request #1386 from zed-industries/symlink-cycles
Detect cycles when scanning a directory
2022-07-18 17:58:18 +02:00
Antonio Scandurra
11ef6bfbae Avoid unnecessarily emitting fake fs events for dirs that exist 2022-07-18 17:36:40 +02:00
Antonio Scandurra
f9df5fe595 Detect cycles also when processing events 2022-07-18 17:31:09 +02:00
Antonio Scandurra
b3218641cd Create intermediate directories in FakeFs::create_dir 2022-07-18 16:38:26 +02:00
Antonio Scandurra
b48118830f Detect cycles when scanning a directory 2022-07-18 13:47:15 +02:00
Antonio Scandurra
df33556693 Introduce a new TreeSet struct in sum_tree
This is just a special case of `TreeMap<K, V>` where `V = ()`.
2022-07-18 13:40:30 +02:00
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
K Simmons
8add81350e Rework presenter and MouseRegion to use Handler hashmap rather than individual fields 2022-07-17 23:19:32 -07:00
Nate Butler
668af83cd6 Format styles directory with prettier. 2022-07-16 11:53:27 -04:00
Nate Butler
45ea412d2c Add the One Dark/ One Light themes 2022-07-16 11:52:40 -04:00
Nate Butler
ef2b42c3fb UI / Theme improvements 2022-07-16 11:52:30 -04:00
Nate Butler
145d59d47a Remove unneeded/state generated tokens
These will be located in a different repo going forwards since they are primarily for figma.
2022-07-16 11:51:59 -04:00
Nate Butler
4ca4449394 Update icons in rust
Updated icons
- Diagnostic states
- Sidebar icons (project, contacts)
- Navigation arrows
2022-07-16 11:51:10 -04:00
Nate Butler
d1361f7dfc Add new icons
We will need to do an assets clean up soon, we are currently shipping assets we are not using in the app.
2022-07-16 11:39:45 -04: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