Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from zed-industries:main #64

Merged
merged 24 commits into from
Feb 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
fc85ca0
ci: Fix issue response script (#24891)
maxdeviant Feb 14, 2025
294dea1
vim: Change into visual mode on select all matches (#24897)
dinocosta Feb 14, 2025
1d26a27
go: Fix tree-sitter query for outlines (#24861)
ashishbhate Feb 14, 2025
e37acde
migrator: Fix keymap task_name regression (#24898)
0xtimsb Feb 14, 2025
3040ef4
file_icons: Add icon key for Crystal and ECR files (#24903)
nobodywasishere Feb 14, 2025
c049df2
docs: Add section on file icons to `CONTRIBUTING.md` (#24905)
maxdeviant Feb 14, 2025
bd105a5
Continue improving font adjustment settings (#24908)
SomeoneToIgnore Feb 14, 2025
be83074
Git context menu (#24844)
ConradIrwin Feb 14, 2025
f943251
file_icons: Sort `file_types.json` (#24910)
maxdeviant Feb 14, 2025
216a5e2
file_icons: Associate `.R` files with R (#24907)
5brian Feb 14, 2025
58b0a6c
Remove legacy themes and licenses (#24589)
iamnbutler Feb 14, 2025
5f63111
Add SSH port forwards to settings (#24474)
Tebro Feb 14, 2025
e6749b5
Use shell script language for bats files (#24877)
bersace Feb 14, 2025
df02745
Update Rust crate uuid to v1.13.1 (#24780)
renovate[bot] Feb 14, 2025
2377f53
Update Rust crate ctor to 0.3.0 (#24774)
renovate[bot] Feb 14, 2025
082347c
Update Rust crate clap to v4.5.29 (#24754)
renovate[bot] Feb 14, 2025
1fd099b
Update aws-sdk-rust monorepo (#24773)
renovate[bot] Feb 14, 2025
86b8852
Update Rust crate tree-sitter-elixir to v0.3.4 (#24763)
renovate[bot] Feb 14, 2025
5825413
Update Rust crate jsonwebtoken to v9.3.1 (#24760)
renovate[bot] Feb 14, 2025
64b2a49
Update Rust crate filedescriptor to v0.8.3 (#24759)
renovate[bot] Feb 14, 2025
88fe54e
docs: Add link to Zeta's Hugging Face profile (#24915)
danilo-leal Feb 14, 2025
a01d2dd
file_icons: Add separate icon keys for .NET solution and project file…
RandaZraik Feb 14, 2025
f277609
Update Rust crate rustls to v0.23.23 (#24762)
renovate[bot] Feb 14, 2025
e60123b
Allow icon themes to provide their own file associations (#24926)
maxdeviant Feb 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/issue_response.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- run: pnpm install --dir script/issue_response

- name: Run Issue Response
run: pnpm exec ts-node script/issue_response/main.ts
run: pnpm run --dir script/issue_response start
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_ISSUE_RESPONSE_WEBHOOK_URL: ${{ secrets.SLACK_ISSUE_RESPONSE_WEBHOOK_URL }}
10 changes: 10 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@ We plan to set aside time each week to pair program with contributors on promisi
- Pair with us and watch us code to learn the codebase
- Low effort PRs, such as those that just re-arrange syntax, won't be merged without a compelling justification

## File icons

Zed's default icon theme consists of icons that are hand-designed to fit together in a cohesive manner.

We do not accept PRs for file icons that are just an off-the-shelf SVG taken from somewhere else.

### Adding new icons to the Zed icon theme

If you would like to add a new icon to the Zed icon theme, [open a Discussion](https://github.com/zed-industries/zed/discussions/new?category=ux-and-design) and we can work with you on getting an icon designed and added to Zed.

## Bird's-eye view of Zed

Zed is made up of several smaller crates - let's go over those you're most likely to interact with:
Expand Down
90 changes: 42 additions & 48 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ cocoa-foundation = "0.2.0"
convert_case = "0.7.0"
core-foundation = "0.9.3"
core-foundation-sys = "0.8.6"
ctor = "0.2.6"
ctor = "0.3.0"
dashmap = "6.0"
derive_more = "0.99.17"
dirs = "4.0"
Expand Down
Loading