Skip to content

Commit

Permalink
Merge branch 'ethereum:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
0x0OZ authored Apr 12, 2024
2 parents 61c52a9 + e7041d3 commit 386a677
Show file tree
Hide file tree
Showing 645 changed files with 19,091 additions and 6,686 deletions.
114 changes: 112 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -10750,7 +10750,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/30328618?v=4",
"profile": "https://www.darigovresearch.com/",
"contributions": [
"content"
"content",
"bug"
]
},
{
Expand Down Expand Up @@ -10984,7 +10985,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/9151261?v=4",
"profile": "https://github.com/aslikaya",
"contributions": [
"doc"
"doc",
"maintenance"
]
},
{
Expand Down Expand Up @@ -11644,6 +11646,114 @@
"contributions": [
"bug"
]
},
{
"login": "Hector-Chong",
"name": "Héctor Chong",
"avatar_url": "https://avatars.githubusercontent.com/u/12469549?v=4",
"profile": "http://hector.im",
"contributions": [
"content"
]
},
{
"login": "nakmr",
"name": "nace.kimura",
"avatar_url": "https://avatars.githubusercontent.com/u/145886319?v=4",
"profile": "https://github.com/nakmr",
"contributions": [
"content"
]
},
{
"login": "WuRuiLei2023",
"name": "WuRuiLei2023",
"avatar_url": "https://avatars.githubusercontent.com/u/149141323?v=4",
"profile": "https://github.com/WuRuiLei2023",
"contributions": [
"bug"
]
},
{
"login": "radeksvarz",
"name": "Radek",
"avatar_url": "https://avatars.githubusercontent.com/u/6020891?v=4",
"profile": "http://www.edukids.cz",
"contributions": [
"eventOrganizing"
]
},
{
"login": "bhargavkakadiya",
"name": "Bhargav kakadiya",
"avatar_url": "https://avatars.githubusercontent.com/u/26486494?v=4",
"profile": "https://github.com/bhargavkakadiya",
"contributions": [
"bug"
]
},
{
"login": "ArtificialPB",
"name": "ArtificialPB",
"avatar_url": "https://avatars.githubusercontent.com/u/4672155?v=4",
"profile": "https://github.com/ArtificialPB",
"contributions": [
"tool"
]
},
{
"login": "Pedrojok01",
"name": "Pedrojok01",
"avatar_url": "https://avatars.githubusercontent.com/u/77141890?v=4",
"profile": "https://github.com/Pedrojok01",
"contributions": [
"maintenance"
]
},
{
"login": "Vid201",
"name": "Vid Kersic",
"avatar_url": "https://avatars.githubusercontent.com/u/38610409?v=4",
"profile": "https://github.com/Vid201",
"contributions": [
"tool"
]
},
{
"login": "futantan",
"name": "Tantan Fu",
"avatar_url": "https://avatars.githubusercontent.com/u/6268441?v=4",
"profile": "http://www.futantan.com",
"contributions": [
"maintenance"
]
},
{
"login": "Dharmik79",
"name": "Dharmik Dholariya",
"avatar_url": "https://avatars.githubusercontent.com/u/61613931?v=4",
"profile": "https://dharmik79.github.io/portfolio.github.io/",
"contributions": [
"bug"
]
},
{
"login": "Destiner",
"name": "Timur Badretdinov",
"avatar_url": "https://avatars.githubusercontent.com/u/4247901?v=4",
"profile": "https://destiner.io",
"contributions": [
"tool"
]
},
{
"login": "finxter",
"name": "Finxter",
"avatar_url": "https://avatars.githubusercontent.com/u/57671493?v=4",
"profile": "https://blog.finxter.com/",
"contributions": [
"ideas"
]
}
],
"contributorsPerLine": 7,
Expand Down
16 changes: 8 additions & 8 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
"review needed :eyes:":
"needs review 👀":
- src/**/*
- public/*

"documentation :book:":
"documentation 📖":
- README.md

"tooling :wrench:":
"tooling 🔧":
- .github/**/*
- src/scripts/*
- src/lib/*
- src/hooks/*

"dependencies :package:":
"dependencies 📦":
- package.json
- yarn.lock

"internal :house:":
"internal 🏠":
- .all-contributorsrc
- i18n.config.json
- next.config.js
Expand All @@ -29,14 +29,14 @@
- .prettierrc
- netlify.toml

"translation :earth_africa:":
"translation 🌍":
- src/content/translations/**/*
- src/intl/**/*
- src/lib/utils/translations.ts

"content :fountain_pen:":
"content 🖋️":
- src/pages/*
- public/content/**/*

"event :date:":
"event 📅":
- src/data/community-events.json
1 change: 1 addition & 0 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:
- "src/pages/**/*"
- "src/layouts/**/*"
- "src/@chakra-ui/**/*"
- ".storybook/**/*"

# List of jobs
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/get-crowdin-contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ jobs:
- name: Create Pull Request
run: |
gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation contributors from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt
2 changes: 1 addition & 1 deletion .github/workflows/get-translation-progress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ jobs:
- name: Create Pull Request
run: |
gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation progress from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt
2 changes: 1 addition & 1 deletion .github/workflows/import-community-events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ jobs:
- name: Create Pull Request
run: |
gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update community events from external spreadsheet - ${{ env.READABLE_DATE }}" --body-file pr_body.txt
18 changes: 16 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1662,7 +1662,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://linkedin.com/in/muhammadaltabba"><img src="https://avatars.githubusercontent.com/u/24407834?v=4?s=100" width="100px;" alt="Muhammad Altabba"/><br /><sub><b>Muhammad Altabba</b></sub></a><br /><a href="#content-Muhammad-Altabba" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.darigovresearch.com/"><img src="https://avatars.githubusercontent.com/u/30328618?v=4?s=100" width="100px;" alt="Darigov Research"/><br /><sub><b>Darigov Research</b></sub></a><br /><a href="#content-darigovresearch" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.darigovresearch.com/"><img src="https://avatars.githubusercontent.com/u/30328618?v=4?s=100" width="100px;" alt="Darigov Research"/><br /><sub><b>Darigov Research</b></sub></a><br /><a href="#content-darigovresearch" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Adarigovresearch" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/shubhusion"><img src="https://avatars.githubusercontent.com/u/96301987?v=4?s=100" width="100px;" alt="SHUBHAM SHARMA "/><br /><sub><b>SHUBHAM SHARMA </b></sub></a><br /><a href="#ideas-shubhusion" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/paulallensuxs"><img src="https://avatars.githubusercontent.com/u/114240091?v=4?s=100" width="100px;" alt="paulallensuxs"/><br /><sub><b>paulallensuxs</b></sub></a><br /><a href="#content-paulallensuxs" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://pseudomata.com"><img src="https://avatars.githubusercontent.com/u/132238190?v=4?s=100" width="100px;" alt="Pseudomata"/><br /><sub><b>Pseudomata</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=pseudomata" title="Code">💻</a></td>
Expand Down Expand Up @@ -1694,7 +1694,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Crosstons"><img src="https://avatars.githubusercontent.com/u/110349596?v=4?s=100" width="100px;" alt="Shubh"/><br /><sub><b>Shubh</b></sub></a><br /><a href="#content-Crosstons" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/duckdegen"><img src="https://avatars.githubusercontent.com/u/98649644?v=4?s=100" width="100px;" alt="duckdegen"/><br /><sub><b>duckdegen</b></sub></a><br /><a href="#content-duckdegen" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sminempepe"><img src="https://avatars.githubusercontent.com/u/76882704?v=4?s=100" width="100px;" alt="sminempepe"/><br /><sub><b>sminempepe</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=sminempepe" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aslikaya"><img src="https://avatars.githubusercontent.com/u/9151261?v=4?s=100" width="100px;" alt="aslikaya"/><br /><sub><b>aslikaya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aslikaya" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aslikaya"><img src="https://avatars.githubusercontent.com/u/9151261?v=4?s=100" width="100px;" alt="aslikaya"/><br /><sub><b>aslikaya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aslikaya" title="Documentation">📖</a> <a href="#maintenance-aslikaya" title="Maintenance">🚧</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="http://lucasamberg.dev"><img src="https://avatars.githubusercontent.com/u/102396588?v=4?s=100" width="100px;" alt="Lucas Amberg"/><br /><sub><b>Lucas Amberg</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=lucas-amberg" title="Documentation">📖</a></td>
Expand Down Expand Up @@ -1789,6 +1789,20 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/shubhisaran"><img src="https://avatars.githubusercontent.com/u/113500663?v=4?s=100" width="100px;" alt="Shubhi Saran"/><br /><sub><b>Shubhi Saran</b></sub></a><br /><a href="#tool-shubhisaran" title="Tools">🔧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bh2smith"><img src="https://avatars.githubusercontent.com/u/11778116?v=4?s=100" width="100px;" alt="Benjamin Smith"/><br /><sub><b>Benjamin Smith</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Abh2smith" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://hector.im"><img src="https://avatars.githubusercontent.com/u/12469549?v=4?s=100" width="100px;" alt="Héctor Chong"/><br /><sub><b>Héctor Chong</b></sub></a><br /><a href="#content-Hector-Chong" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/nakmr"><img src="https://avatars.githubusercontent.com/u/145886319?v=4?s=100" width="100px;" alt="nace.kimura"/><br /><sub><b>nace.kimura</b></sub></a><br /><a href="#content-nakmr" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/WuRuiLei2023"><img src="https://avatars.githubusercontent.com/u/149141323?v=4?s=100" width="100px;" alt="WuRuiLei2023"/><br /><sub><b>WuRuiLei2023</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AWuRuiLei2023" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.edukids.cz"><img src="https://avatars.githubusercontent.com/u/6020891?v=4?s=100" width="100px;" alt="Radek"/><br /><sub><b>Radek</b></sub></a><br /><a href="#eventOrganizing-radeksvarz" title="Event Organizing">📋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bhargavkakadiya"><img src="https://avatars.githubusercontent.com/u/26486494?v=4?s=100" width="100px;" alt="Bhargav kakadiya"/><br /><sub><b>Bhargav kakadiya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Abhargavkakadiya" title="Bug reports">🐛</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ArtificialPB"><img src="https://avatars.githubusercontent.com/u/4672155?v=4?s=100" width="100px;" alt="ArtificialPB"/><br /><sub><b>ArtificialPB</b></sub></a><br /><a href="#tool-ArtificialPB" title="Tools">🔧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Pedrojok01"><img src="https://avatars.githubusercontent.com/u/77141890?v=4?s=100" width="100px;" alt="Pedrojok01"/><br /><sub><b>Pedrojok01</b></sub></a><br /><a href="#maintenance-Pedrojok01" title="Maintenance">🚧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Vid201"><img src="https://avatars.githubusercontent.com/u/38610409?v=4?s=100" width="100px;" alt="Vid Kersic"/><br /><sub><b>Vid Kersic</b></sub></a><br /><a href="#tool-Vid201" title="Tools">🔧</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.futantan.com"><img src="https://avatars.githubusercontent.com/u/6268441?v=4?s=100" width="100px;" alt="Tantan Fu"/><br /><sub><b>Tantan Fu</b></sub></a><br /><a href="#maintenance-futantan" title="Maintenance">🚧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://dharmik79.github.io/portfolio.github.io/"><img src="https://avatars.githubusercontent.com/u/61613931?v=4?s=100" width="100px;" alt="Dharmik Dholariya"/><br /><sub><b>Dharmik Dholariya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ADharmik79" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://destiner.io"><img src="https://avatars.githubusercontent.com/u/4247901?v=4?s=100" width="100px;" alt="Timur Badretdinov"/><br /><sub><b>Timur Badretdinov</b></sub></a><br /><a href="#tool-Destiner" title="Tools">🔧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://blog.finxter.com/"><img src="https://avatars.githubusercontent.com/u/57671493?v=4?s=100" width="100px;" alt="Finxter"/><br /><sub><b>Finxter</b></sub></a><br /><a href="#ideas-finxter" title="Ideas, Planning, & Feedback">🤔</a></td>
</tr>
</tbody>
</table>
Expand Down
Loading

0 comments on commit 386a677

Please sign in to comment.