Skip to content

Commit 481f81d

Browse files
wackerowwackerow
committed
Merge branch 'dev' into menu-number-shortcut
2 parents 80d6667 + f9ee3b7 commit 481f81d

File tree

471 files changed

+31356
-13606
lines changed

Some content is hidden

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

471 files changed

+31356
-13606
lines changed

‎.all-contributorsrc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,7 @@
15211521
"login": "sassal",
15221522
"name": "sassal",
15231523
"avatar_url": "https://avatars0.githubusercontent.com/u/9276959?v=4",
1524-
"profile": "https//twitter.com/sassal0x",
1524+
"profile": "https://twitter.com/sassal0x",
15251525
"contributions": [
15261526
"content"
15271527
]
@@ -11101,6 +11101,15 @@
1110111101
"contributions": [
1110211102
"content"
1110311103
]
11104+
},
11105+
{
11106+
"login": "zarifpour",
11107+
"name": "Daniel Zarifpour",
11108+
"avatar_url": "https://avatars.githubusercontent.com/u/16494335?v=4",
11109+
"profile": "http://zarifpour.xyz",
11110+
"contributions": [
11111+
"content"
11112+
]
1110411113
}
1110511114
],
1110611115
"contributorsPerLine": 7,

‎.github/ISSUE_TEMPLATE/suggest_glossary_term.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ body:
3131
- type: textarea
3232
id: glossary_term_sources
3333
attributes:
34-
label: Sources, if any (please do not submit copywrited content without appropriate approval)
34+
label: Sources, if any (please do not submit copyrighted content without appropriate approval)
3535
description: Please list any sources utilized
3636
validations:
3737
required: false

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
402402
</tr>
403403
<tr>
404404
<td align="center" valign="top" width="14.28%"><a href="https://etherworld.co"><img src="https://avatars0.githubusercontent.com/u/29681685?v=4?s=100" width="100px;" alt="Pooja Ranjan"/><br /><sub><b>Pooja Ranjan</b></sub></a><br /><a href="#content-poojaranjan" title="Content">🖋</a></td>
405-
<td align="center" valign="top" width="14.28%"><a href="https//twitter.com/sassal0x"><img src="https://avatars0.githubusercontent.com/u/9276959?v=4?s=100" width="100px;" alt="sassal"/><br /><sub><b>sassal</b></sub></a><br /><a href="#content-sassal" title="Content">🖋</a></td>
405+
<td align="center" valign="top" width="14.28%"><a href="https://twitter.com/sassal0x"><img src="https://avatars0.githubusercontent.com/u/9276959?v=4?s=100" width="100px;" alt="sassal"/><br /><sub><b>sassal</b></sub></a><br /><a href="#content-sassal" title="Content">🖋</a></td>
406406
<td align="center" valign="top" width="14.28%"><a href="https://zaremba.ch"><img src="https://avatars0.githubusercontent.com/u/811701?v=4?s=100" width="100px;" alt="Robert Zaremba"/><br /><sub><b>Robert Zaremba</b></sub></a><br /><a href="#content-robert-zaremba" title="Content">🖋</a></td>
407407
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tasdienes"><img src="https://avatars1.githubusercontent.com/u/18563486?v=4?s=100" width="100px;" alt="Tas"/><br /><sub><b>Tas</b></sub></a><br /><a href="#ideas-tasdienes" title="Ideas, Planning, & Feedback">🤔</a> <a href="#content-tasdienes" title="Content">🖋</a></td>
408408
<td align="center" valign="top" width="14.28%"><a href="https://github.com/s-pace"><img src="https://avatars2.githubusercontent.com/u/32097720?v=4?s=100" width="100px;" alt="Sylvain Pace"/><br /><sub><b>Sylvain Pace</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=s-pace" title="Code">💻</a></td>
@@ -1730,6 +1730,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
17301730
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jennyg0"><img src="https://avatars.githubusercontent.com/u/60794961?v=4?s=100" width="100px;" alt="Jen "/><br /><sub><b>Jen </b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=jennyg0" title="Code">💻</a></td>
17311731
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Molotov-Eugene"><img src="https://avatars.githubusercontent.com/u/95471552?v=4?s=100" width="100px;" alt="Eugene"/><br /><sub><b>Eugene</b></sub></a><br /><a href="#content-Molotov-Eugene" title="Content">🖋</a></td>
17321732
<td align="center" valign="top" width="14.28%"><a href="https://github.com/rimtaex"><img src="https://avatars.githubusercontent.com/u/155366533?v=4?s=100" width="100px;" alt="RimTaeX"/><br /><sub><b>RimTaeX</b></sub></a><br /><a href="#content-rimtaex" title="Content">🖋</a></td>
1733+
<td align="center" valign="top" width="14.28%"><a href="http://zarifpour.xyz"><img src="https://avatars.githubusercontent.com/u/16494335?v=4?s=100" width="100px;" alt="Daniel Zarifpour"/><br /><sub><b>Daniel Zarifpour</b></sub></a><br /><a href="#content-zarifpour" title="Content">🖋</a></td>
17331734
</tr>
17341735
</tbody>
17351736
</table>

‎docs/deploy-process.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,9 @@ staging O - - - - - - - O
9494
9595
dev O - - O - - - - O
9696
```
97+
98+
## More about the Release Candidate QA process
99+
100+
The main idea behind the community QA process is to focus on the [current release changelog](https://github.com/ethereum/ethereum-org-website/releases) and check that new features or fixes applied are working as expected. During QA sessions, some notes could also be shared if we're looking for specific things to be tested.
101+
102+
If you find any bug, please report it on the [#website-bugs](https://discord.com/channels/714888181740339261/727898649006309377) Discord channel.

‎next-i18next.config.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ const locales = BUILD_LOCALES
99
/** @type {import('next-i18next').UserConfig} */
1010
module.exports = {
1111
i18n: {
12-
defaultLocale: "en",
12+
// "default" locale is a hack to always display the locale prefix in the
13+
// url. Ref: https://nextjs.org/docs/pages/building-your-application/routing/internationalization#prefixing-the-default-locale
14+
defaultLocale: "default",
1315
// supported locales defined in `i18n.config.json`
14-
locales,
16+
locales: ["default", ...locales],
17+
localeDetection: false,
1518
},
1619
// define custom location for intl files, otherwise default to public/locales (https://github.com/i18next/next-i18next#2-translation-content)
1720
localePath: "./src/intl",

‎next.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ module.exports = (phase, { defaultConfig }) => {
3434
return config
3535
},
3636
i18n,
37+
trailingSlash: true,
3738
images: {
3839
deviceSizes: [640, 750, 828, 1080, 1200, 1504, 1920],
3940
},

‎public/.well-known/security.txt

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,26 @@
22
Hash: SHA256
33

44
Contact: mailto:[email protected]
5-
Expires: 2023-12-31T23:59:00.000Z
5+
Expires: 2026-12-31T23:59:00.000Z
66
Encryption: https://ethereum.org/security_at_ethereum.org.asc
77
Acknowledgments: https://bounty.ethereum.org
88
Preferred-Languages: en
99
Canonical: https://ethereum.org/.well-known/security.txt
1010
Policy: https://bounty.ethereum.org
1111
Hiring: https://ethereum.org/en/community/get-involved/#ethereum-jobs
12-
1312
-----BEGIN PGP SIGNATURE-----
1413

15-
iQIzBAEBCAAdFiEErpbtlp5HmwCE8+F/6I0zNPpfagoFAmMV3bMACgkQ6I0zNPpf
16-
agrOjhAAgMDS9RJUbJzcAybRfp/STq4Kf50TFd3iqx/t8ECw5UGazefieHesOhZ5
17-
9B9l6VAIHEGqbm+ukkhT+eBofhkAGEupiH/rUTy3hpFo1Ggp9QGi464Y8RyB0hID
18-
BwjAsAVEdHyh8T6YrqxKRGvgELuEMZfuPfVhdIGU8CfEQozzuA9q3mChckXdTlSt
19-
TvOKTMdnNPMlEhp4dT93iQaXDBAncE48TkUi/c8U4qolkskuDhZ4qJkc7xcv5Uk4
20-
TfF83Xs87AF9ZmABWawlCx7VHhp0HGljtGUpobf2DXV0TG77/dZzMQ4xdyqvDq+v
21-
tm3djp3UHZVhOkDxMKpBzLnCkCvyvh/tvN4j/trdHHzXx6gEEkuiR5wPPoomCosi
22-
95AGNFf0vpe2HucL/bOrBySxME+hifAnmkiaXltLbyUUTBQPfkHMHMoq1dmPokm2
23-
4RZaZ1A/K7rirZLC4w/RmxONVqvxT0baFTcZGyKzYm6gEZ9kCwWw1tyEl472yK0H
24-
UR2cAhlo+Wa61cOTtwHVw0FMVyG0xZkR04y8WM3T8lE6imGLSmCDgPMZm8XnKdkY
25-
SMGD3+TzLxe6mymmw+1dGXCPjjkImdrhBGxlwEU74vkFQKiWv/GftiDYYcilcQbS
26-
OD1N7PTmpef+JEYXOpwxxUTSXu0SfVTSkx0wnHkqbib7Wwv5IwY=
27-
=g+49
14+
iQIzBAEBCAAdFiEErpbtlp5HmwCE8+F/6I0zNPpfagoFAmXYslMACgkQ6I0zNPpf
15+
agrlTA//Q1P+fzNaYtUUm7pg7Jz4VaEACaQZ5qNNmKl9VZ6yCS45pmqpPAAyDM2p
16+
ZyFOUF3Q3UmHdwmVEGrHSREhoqx5I78KH4dmx4G38RG+4SMhSCZG0Ztf9Z3Dg0o2
17+
ZeO7vS7mp/STyxiG1Nnkg5Ivhuhq8sdQXF7hM+9JUVri7upEH0QtdAS/jZaoLCvx
18+
GsWe8XnBru8aH9O2kCO4iigCphOpzaSORJH7rcuo/mo6jGvJER4J0RkjK2KMX7W/
19+
TFQmpR+8Sxaw+einVEQBDppcbBhOO7yAHq3TQOa01pxIQJ2togJ0Sl3pUiYeqPgf
20+
aITyRfzhyh+zEb7V49QOIohvazZA7gnBmgUW8xF9cfTrChsxKV8TxovGc/cHroy9
21+
JI8XkJaZbX1GlbIUqTKgc/MF01gXXVTyjbnQ6HtCNG4BAq3hsWDnoziodGFojn/+
22+
PiY9cLok8Jxy6nzV0ANLunfbNF2usjPEDFxRviCSS3NoBXhq0+Ra/MXljKB46lb5
23+
qkfBdsAF9IJ8Bx7knrLbpVMe8tciXcXqorCfEBZONNk9RL5OkuDQgPQXi/2sRXXN
24+
xxIpxkDf63104NIypjEjp5c8WkD+VF84BhNuhYsp50T2hfgtL39vOGaQ2593Rss1
25+
j8MNLO2xlwoHiJoTe3CFw/Yl7MtjJSxiaQ0v42JRxyjclLDX1Rc=
26+
=CMMm
2827
-----END PGP SIGNATURE-----

‎public/_redirects

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/en/ / 301!
2-
31
/discord https://discord.gg/ethereum-org 301!
42

53
/*/discord https://discord.gg/ethereum-org 301!
@@ -175,5 +173,3 @@
175173
/*/staking/withdraws /:splat/staking/withdrawals/ 301!
176174

177175
/*/guides/how-to-register-an-ethereum-account /:splat/guides/how-to-create-an-ethereum-account/ 301!
178-
179-
/en/stablecoins /stablecoins 301!

‎public/assets/manifest-homepage-screenshot-mobile.png

-1.88 MB
Binary file not shown.

‎public/assets/manifest-homepage-screenshot.png

-3.4 MB
Binary file not shown.

0 commit comments

Comments
 (0)