Skip to content

Commit 4494936

Browse files
wackerowwackerow
authored
Merge branch 'dev' into all-contributors/add-Tri-stone
2 parents db98f9b + 495c92d commit 4494936

File tree

161 files changed

+4610
-679
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+4610
-679
lines changed

‎.all-contributorsrc

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12865,6 +12865,197 @@
1286512865
"contributions": [
1286612866
"maintenance"
1286712867
]
12868+
},
12869+
{
12870+
"login": "deca12x",
12871+
"name": "deca",
12872+
"avatar_url": "https://avatars.githubusercontent.com/u/74135582?v=4",
12873+
"profile": "https://github.com/deca12x",
12874+
"contributions": [
12875+
"eventOrganizing"
12876+
]
12877+
},
12878+
{
12879+
"login": "Anish-Gupta1",
12880+
"name": "Anish Gupta ",
12881+
"avatar_url": "https://avatars.githubusercontent.com/u/180473292?v=4",
12882+
"profile": "https://github.com/Anish-Gupta1",
12883+
"contributions": [
12884+
"code"
12885+
]
12886+
},
12887+
{
12888+
"login": "rohitt-gupta",
12889+
"name": "Rohit Gupta",
12890+
"avatar_url": "https://avatars.githubusercontent.com/u/81370462?v=4",
12891+
"profile": "https://rohitt.in",
12892+
"contributions": [
12893+
"code"
12894+
]
12895+
},
12896+
{
12897+
"login": "rvmz",
12898+
"name": "Roman Mazurenko",
12899+
"avatar_url": "https://avatars.githubusercontent.com/u/92804957?v=4",
12900+
"profile": "https://github.com/rvmz",
12901+
"contributions": [
12902+
"maintenance"
12903+
]
12904+
},
12905+
{
12906+
"login": "standstaff",
12907+
"name": "ZhengXingRu",
12908+
"avatar_url": "https://avatars.githubusercontent.com/u/163401255?v=4",
12909+
"profile": "https://github.com/standstaff",
12910+
"contributions": [
12911+
"maintenance"
12912+
]
12913+
},
12914+
{
12915+
"login": "imbarty",
12916+
"name": "barty",
12917+
"avatar_url": "https://avatars.githubusercontent.com/u/191963641?v=4",
12918+
"profile": "https://github.com/imbarty",
12919+
"contributions": [
12920+
"bug"
12921+
]
12922+
},
12923+
{
12924+
"login": "futreall",
12925+
"name": "futreall",
12926+
"avatar_url": "https://avatars.githubusercontent.com/u/86553580?v=4",
12927+
"profile": "https://github.com/futreall",
12928+
"contributions": [
12929+
"translation",
12930+
"bug"
12931+
]
12932+
},
12933+
{
12934+
"login": "0xshikhar",
12935+
"name": "Shikhar Singh",
12936+
"avatar_url": "https://avatars.githubusercontent.com/u/64684053?v=4",
12937+
"profile": "https://github.com/0xshikhar",
12938+
"contributions": [
12939+
"code",
12940+
"content"
12941+
]
12942+
},
12943+
{
12944+
"login": "clacladev",
12945+
"name": "clacla",
12946+
"avatar_url": "https://avatars.githubusercontent.com/u/161903?v=4",
12947+
"profile": "https://github.com/clacladev",
12948+
"contributions": [
12949+
"maintenance"
12950+
]
12951+
},
12952+
{
12953+
"login": "baumstern",
12954+
"name": "Daehyun Paik",
12955+
"avatar_url": "https://avatars.githubusercontent.com/u/1610146?v=4",
12956+
"profile": "https://a30a.dev/",
12957+
"contributions": [
12958+
"bug"
12959+
]
12960+
},
12961+
{
12962+
"login": "dbarabashh",
12963+
"name": "Dima Barabash",
12964+
"avatar_url": "https://avatars.githubusercontent.com/u/10253529?v=4",
12965+
"profile": "https://dbarabashh.com",
12966+
"contributions": [
12967+
"code"
12968+
]
12969+
},
12970+
{
12971+
"login": "YashIIT0909",
12972+
"name": "Yash Agarwal",
12973+
"avatar_url": "https://avatars.githubusercontent.com/u/182656811?v=4",
12974+
"profile": "https://github.com/YashIIT0909",
12975+
"contributions": [
12976+
"bug"
12977+
]
12978+
},
12979+
{
12980+
"login": "tomrpl",
12981+
"name": "Reppelin Tom",
12982+
"avatar_url": "https://avatars.githubusercontent.com/u/75627352?v=4",
12983+
"profile": "http://www.linkedin.com/in/tom-reppelin",
12984+
"contributions": [
12985+
"tool"
12986+
]
12987+
},
12988+
{
12989+
"login": "mdqst",
12990+
"name": "Dmitry",
12991+
"avatar_url": "https://avatars.githubusercontent.com/u/98899785?v=4",
12992+
"profile": "https://mdqst.com",
12993+
"contributions": [
12994+
"bug"
12995+
]
12996+
},
12997+
{
12998+
"login": "3eph1r0th",
12999+
"name": "Sephiroth",
13000+
"avatar_url": "https://avatars.githubusercontent.com/u/26237289?v=4",
13001+
"profile": "https://github.com/3eph1r0th",
13002+
"contributions": [
13003+
"tool"
13004+
]
13005+
},
13006+
{
13007+
"login": "IlyaSmiyukha",
13008+
"name": "Ilya Smiyukha",
13009+
"avatar_url": "https://avatars.githubusercontent.com/u/39830587?v=4",
13010+
"profile": "https://ilyasmiyukha.github.io/",
13011+
"contributions": [
13012+
"maintenance"
13013+
]
13014+
},
13015+
{
13016+
"login": "jorgesumle",
13017+
"name": "Jorge",
13018+
"avatar_url": "https://avatars.githubusercontent.com/u/14212780?v=4",
13019+
"profile": "https://github.com/jorgesumle",
13020+
"contributions": [
13021+
"bug"
13022+
]
13023+
},
13024+
{
13025+
"login": "CryptoDelirium",
13026+
"name": "Crypto Delirium",
13027+
"avatar_url": "https://avatars.githubusercontent.com/u/6353394?v=4",
13028+
"profile": "https://github.com/CryptoDelirium",
13029+
"contributions": [
13030+
"content"
13031+
]
13032+
},
13033+
{
13034+
"login": "alinobrasil",
13035+
"name": "AK",
13036+
"avatar_url": "https://avatars.githubusercontent.com/u/1214559?v=4",
13037+
"profile": "https://github.com/alinobrasil",
13038+
"contributions": [
13039+
"maintenance"
13040+
]
13041+
},
13042+
{
13043+
"login": "0xumarkhatab",
13044+
"name": "0xumarkhatab",
13045+
"avatar_url": "https://avatars.githubusercontent.com/u/71306738?v=4",
13046+
"profile": "https://github.com/0xumarkhatab",
13047+
"contributions": [
13048+
"maintenance"
13049+
]
13050+
},
13051+
{
13052+
"login": "alcueca",
13053+
"name": "Alberto Cuesta Cañada",
13054+
"avatar_url": "https://avatars.githubusercontent.com/u/38806121?v=4",
13055+
"profile": "https://www.linkedin.com/in/albertocuesta/",
13056+
"contributions": [
13057+
"maintenance"
13058+
]
1286813059
}
1286913060
],
1287013061
"contributorsPerLine": 7,

‎.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ ANALYZE=false
4747

4848
# Use mock data for development. Set to "false" to use live data but you must have the
4949
# environment variables set to make api requests
50-
USE_MOCK_DATA=true
50+
USE_MOCK_DATA=true

‎.storybook/main.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ const config: StorybookConfig = {
6161
if (imageRule) {
6262
imageRule["exclude"] = /\.svg$/
6363
}
64+
// Configure yaml files to be loaded with yaml-loader
65+
config.module.rules.push({
66+
test: /\.ya?ml$/,
67+
use: "yaml-loader",
68+
})
6469

6570
// Configure .svg files to be loaded with @svgr/webpack
6671
config.module.rules.push({

‎.storybook/next-intl.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export const ns = [
1717
"page-learn",
1818
"page-upgrades",
1919
"page-developers-index",
20+
"page-roadmap-vision",
2021
"page-what-is-ethereum",
2122
"page-upgrades-index",
2223
"page-wallets-find-wallet",

‎README.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2004,6 +2004,33 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
20042004
<tr>
20052005
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/gorbatiuk/"><img src="https://avatars.githubusercontent.com/u/35546483?v=4?s=100" width="100px;" alt="Oleg Gorbatiuk"/><br /><sub><b>Oleg Gorbatiuk</b></sub></a><br /><a href="#content-gorbatiukcom" title="Content">🖋</a></td>
20062006
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Tri-stone"><img src="https://avatars.githubusercontent.com/u/17921243?v=4?s=100" width="100px;" alt="Tri-stone"/><br /><sub><b>Tri-stone</b></sub></a><br /><a href="#maintenance-Tri-stone" title="Maintenance">🚧</a></td>
2007+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/deca12x"><img src="https://avatars.githubusercontent.com/u/74135582?v=4?s=100" width="100px;" alt="deca"/><br /><sub><b>deca</b></sub></a><br /><a href="#eventOrganizing-deca12x" title="Event Organizing">📋</a></td>
2008+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Anish-Gupta1"><img src="https://avatars.githubusercontent.com/u/180473292?v=4?s=100" width="100px;" alt="Anish Gupta "/><br /><sub><b>Anish Gupta </b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Anish-Gupta1" title="Code">💻</a></td>
2009+
<td align="center" valign="top" width="14.28%"><a href="https://rohitt.in"><img src="https://avatars.githubusercontent.com/u/81370462?v=4?s=100" width="100px;" alt="Rohit Gupta"/><br /><sub><b>Rohit Gupta</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=rohitt-gupta" title="Code">💻</a></td>
2010+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/rvmz"><img src="https://avatars.githubusercontent.com/u/92804957?v=4?s=100" width="100px;" alt="Roman Mazurenko"/><br /><sub><b>Roman Mazurenko</b></sub></a><br /><a href="#maintenance-rvmz" title="Maintenance">🚧</a></td>
2011+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/standstaff"><img src="https://avatars.githubusercontent.com/u/163401255?v=4?s=100" width="100px;" alt="ZhengXingRu"/><br /><sub><b>ZhengXingRu</b></sub></a><br /><a href="#maintenance-standstaff" title="Maintenance">🚧</a></td>
2012+
</tr>
2013+
<tr>
2014+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/imbarty"><img src="https://avatars.githubusercontent.com/u/191963641?v=4?s=100" width="100px;" alt="barty"/><br /><sub><b>barty</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aimbarty" title="Bug reports">🐛</a></td>
2015+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/futreall"><img src="https://avatars.githubusercontent.com/u/86553580?v=4?s=100" width="100px;" alt="futreall"/><br /><sub><b>futreall</b></sub></a><br /><a href="#translation-futreall" title="Translation">🌍</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Afutreall" title="Bug reports">🐛</a></td>
2016+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xshikhar"><img src="https://avatars.githubusercontent.com/u/64684053?v=4?s=100" width="100px;" alt="Shikhar Singh"/><br /><sub><b>Shikhar Singh</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=0xshikhar" title="Code">💻</a> <a href="#content-0xshikhar" title="Content">🖋</a></td>
2017+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/clacladev"><img src="https://avatars.githubusercontent.com/u/161903?v=4?s=100" width="100px;" alt="clacla"/><br /><sub><b>clacla</b></sub></a><br /><a href="#maintenance-clacladev" title="Maintenance">🚧</a></td>
2018+
<td align="center" valign="top" width="14.28%"><a href="https://a30a.dev/"><img src="https://avatars.githubusercontent.com/u/1610146?v=4?s=100" width="100px;" alt="Daehyun Paik"/><br /><sub><b>Daehyun Paik</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Abaumstern" title="Bug reports">🐛</a></td>
2019+
<td align="center" valign="top" width="14.28%"><a href="https://dbarabashh.com"><img src="https://avatars.githubusercontent.com/u/10253529?v=4?s=100" width="100px;" alt="Dima Barabash"/><br /><sub><b>Dima Barabash</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=dbarabashh" title="Code">💻</a></td>
2020+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/YashIIT0909"><img src="https://avatars.githubusercontent.com/u/182656811?v=4?s=100" width="100px;" alt="Yash Agarwal"/><br /><sub><b>Yash Agarwal</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AYashIIT0909" title="Bug reports">🐛</a></td>
2021+
</tr>
2022+
<tr>
2023+
<td align="center" valign="top" width="14.28%"><a href="http://www.linkedin.com/in/tom-reppelin"><img src="https://avatars.githubusercontent.com/u/75627352?v=4?s=100" width="100px;" alt="Reppelin Tom"/><br /><sub><b>Reppelin Tom</b></sub></a><br /><a href="#tool-tomrpl" title="Tools">🔧</a></td>
2024+
<td align="center" valign="top" width="14.28%"><a href="https://mdqst.com"><img src="https://avatars.githubusercontent.com/u/98899785?v=4?s=100" width="100px;" alt="Dmitry"/><br /><sub><b>Dmitry</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amdqst" title="Bug reports">🐛</a></td>
2025+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/3eph1r0th"><img src="https://avatars.githubusercontent.com/u/26237289?v=4?s=100" width="100px;" alt="Sephiroth"/><br /><sub><b>Sephiroth</b></sub></a><br /><a href="#tool-3eph1r0th" title="Tools">🔧</a></td>
2026+
<td align="center" valign="top" width="14.28%"><a href="https://ilyasmiyukha.github.io/"><img src="https://avatars.githubusercontent.com/u/39830587?v=4?s=100" width="100px;" alt="Ilya Smiyukha"/><br /><sub><b>Ilya Smiyukha</b></sub></a><br /><a href="#maintenance-IlyaSmiyukha" title="Maintenance">🚧</a></td>
2027+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jorgesumle"><img src="https://avatars.githubusercontent.com/u/14212780?v=4?s=100" width="100px;" alt="Jorge"/><br /><sub><b>Jorge</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Ajorgesumle" title="Bug reports">🐛</a></td>
2028+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/CryptoDelirium"><img src="https://avatars.githubusercontent.com/u/6353394?v=4?s=100" width="100px;" alt="Crypto Delirium"/><br /><sub><b>Crypto Delirium</b></sub></a><br /><a href="#content-CryptoDelirium" title="Content">🖋</a></td>
2029+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/alinobrasil"><img src="https://avatars.githubusercontent.com/u/1214559?v=4?s=100" width="100px;" alt="AK"/><br /><sub><b>AK</b></sub></a><br /><a href="#maintenance-alinobrasil" title="Maintenance">🚧</a></td>
2030+
</tr>
2031+
<tr>
2032+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xumarkhatab"><img src="https://avatars.githubusercontent.com/u/71306738?v=4?s=100" width="100px;" alt="0xumarkhatab"/><br /><sub><b>0xumarkhatab</b></sub></a><br /><a href="#maintenance-0xumarkhatab" title="Maintenance">🚧</a></td>
2033+
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/albertocuesta/"><img src="https://avatars.githubusercontent.com/u/38806121?v=4?s=100" width="100px;" alt="Alberto Cuesta Cañada"/><br /><sub><b>Alberto Cuesta Cañada</b></sub></a><br /><a href="#maintenance-alcueca" title="Maintenance">🚧</a></td>
20072034
</tr>
20082035
</tbody>
20092036
</table>

0 commit comments

Comments
 (0)