Skip to content

Commit ca5da4c

Browse files
committed
Merge branch 'dev' into shad-feedback-widget
2 parents 3ca4ea7 + af516e8 commit ca5da4c

File tree

162 files changed

+2874
-987
lines changed

Some content is hidden

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

162 files changed

+2874
-987
lines changed

.all-contributorsrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12325,6 +12325,24 @@
1232512325
"contributions": [
1232612326
"content"
1232712327
]
12328+
},
12329+
{
12330+
"login": "bibo7086",
12331+
"name": "Saidu Sokoto",
12332+
"avatar_url": "https://avatars.githubusercontent.com/u/24389200?v=4",
12333+
"profile": "https://github.com/bibo7086",
12334+
"contributions": [
12335+
"content"
12336+
]
12337+
},
12338+
{
12339+
"login": "krishchvn",
12340+
"name": "Krishnakumar Chavan",
12341+
"avatar_url": "https://avatars.githubusercontent.com/u/58606754?v=4",
12342+
"profile": "https://github.com/krishchvn",
12343+
"contributions": [
12344+
"content"
12345+
]
1232812346
}
1232912347
],
1233012348
"contributorsPerLine": 7,

.github/ISSUE_TEMPLATE/suggest_wallet.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ body:
264264
- type: input
265265
id: wallet_l2_support
266266
attributes:
267-
label: Does the wallet support Ethereum layer 2 networks?
267+
label: Which Ethereum Layer 2 networks does the wallet support?
268268
description: Please provide documentation on Ethereum layer 2 networks this wallet supports.
269269
validations:
270270
required: true

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1883,6 +1883,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18831883
<td align="center" valign="top" width="14.28%"><a href="https://ekam-bitt.github.io"><img src="https://avatars.githubusercontent.com/u/74407205?v=4?s=100" width="100px;" alt="Ekam Bitt"/><br /><sub><b>Ekam Bitt</b></sub></a><br /><a href="#maintenance-Ekam-Bitt" title="Maintenance">🚧</a></td>
18841884
<td align="center" valign="top" width="14.28%"><a href="http://iankguimaraes.com"><img src="https://avatars.githubusercontent.com/u/29215044?v=4?s=100" width="100px;" alt="Ian K. Guimarães"/><br /><sub><b>Ian K. Guimarães</b></sub></a><br /><a href="#maintenance-iankressin" title="Maintenance">🚧</a></td>
18851885
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jncrabb"><img src="https://avatars.githubusercontent.com/u/27811684?v=4?s=100" width="100px;" alt="jncrabb"/><br /><sub><b>jncrabb</b></sub></a><br /><a href="#content-jncrabb" title="Content">🖋</a></td>
1886+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bibo7086"><img src="https://avatars.githubusercontent.com/u/24389200?v=4?s=100" width="100px;" alt="Saidu Sokoto"/><br /><sub><b>Saidu Sokoto</b></sub></a><br /><a href="#content-bibo7086" title="Content">🖋</a></td>
1887+
</tr>
1888+
<tr>
1889+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/krishchvn"><img src="https://avatars.githubusercontent.com/u/58606754?v=4?s=100" width="100px;" alt="Krishnakumar Chavan"/><br /><sub><b>Krishnakumar Chavan</b></sub></a><br /><a href="#content-krishchvn" title="Content">🖋</a></td>
18861890
</tr>
18871891
</tbody>
18881892
</table>

docs/review-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This documentation outlines our current processes for how we prioritize items in
66

77
### General review process
88

9-
We use a first-in, first-out system for reviewing pull requests. The longer a pull request has been open, the higher the priority it is for our team to review. In some cases—for example, fixing a high-priority issue or merging low-hanging fruit for a deploy—we will stray from this process and use our best judgement to get higher-impact changes deployed more quickly.
9+
We use a first-in, first-out system for reviewing pull requests. The longer a pull request has been open, the higher the priority it is for our team to review. In some cases—for example, fixing a high-priority issue or merging low-hanging fruit for a deploy—we will stray from this process and use our best judgment to get higher-impact changes deployed more quickly.
1010

1111
We aim to have every new PR reviewed with change requests, merged, or closed within 30 days of opening. As outlined in the following sections, different types of pull requests do have different levels of priority, and this may influence how promptly a pull request is acted on.
1212

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "8.7.1",
3+
"version": "8.8.0",
44
"license": "MIT",
55
"private": true,
66
"scripts": {
@@ -78,7 +78,7 @@
7878
"devDependencies": {
7979
"@chakra-ui/cli": "^2.4.1",
8080
"@chromatic-com/storybook": "1.5.0",
81-
"@netlify/plugin-nextjs": "^5.0.0",
81+
"@netlify/plugin-nextjs": "^5.5.1",
8282
"@storybook/addon-essentials": "8.1.10",
8383
"@storybook/addon-interactions": "8.1.10",
8484
"@storybook/addon-links": "8.1.10",

public/content/community/language-resources/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ If you are bilingual and want to help us reach more people, you can also get inv
9797
- [Omer Greismen (OpenZeppelin) - How We Prevented a 15 Billion Dollars Smart Contract Hack](https://www.cryptojungle.co.il/omer-greisman-openzeppelin/)
9898
- [Shy Datika (INX) - Tokenization and the future of securities, including is Ethereum a security](https://www.cryptojungle.co.il/shy-datika-tokenization/)
9999
- [Roy Confino (Lemonade) - Insurance @ Ethereum](https://www.cryptojungle.co.il/roy-confino-insurance/)
100-
- [Idan Ofrat (Fireblocks) - Instutional Adoption](https://www.cryptojungle.co.il/idan-ofrat-fireblocks/)
100+
- [Idan Ofrat (Fireblocks) - Institutional Adoption](https://www.cryptojungle.co.il/idan-ofrat-fireblocks/)
101101
- [Gal Weizman (MetaMask) - What is MetaMask](https://www.cryptojungle.co.il/gal-weizman-metamask/)
102102
- [Dror Aviely (Consensys) - The center of Ethereum](https://www.cryptojungle.co.il/dror-aviely-ethereum-center/)
103103
- [Nir Rozin - Being a cryptopunk](https://www.cryptojungle.co.il/nir-rozin-cryptopunk/)

public/content/community/research/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ lang: en
66

77
# Active areas of Ethereum research {#active-areas-of-ethereum-research}
88

9-
One of the primary strengths of Ethereum is that an active research and engineering community are constantly improving it. Many enthusiastic, skilled people worldwide would like to apply themselves to outstanding issues in Ethereum, but it is not always easy to find out what those issues are. This page outlines key active research areas as a rough guide to Ethereum's cutting edge.
9+
One of the primary strengths of Ethereum is that an active research and engineering community is constantly improving it. Many enthusiastic, skilled people worldwide would like to apply themselves to outstanding issues in Ethereum, but it is not always easy to find out what those issues are. This page outlines key active research areas as a rough guide to Ethereum's cutting edge.
1010

1111
## How Ethereum research works {#how-ethereum-research-works}
1212

public/content/contributing/adding-products/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Please also refer to our [terms of use](/terms-of-use/). Information on ethereum
8282

8383
As is the fluid nature of Ethereum, teams and products come and go and innovation happens daily, so we'll undertake routine checks of our content to:
8484

85-
- ensure that all dapps listed still fulfil our criteria
85+
- ensure that all dapps listed still fulfill our criteria
8686
- verify there aren't products that have been suggested that meet more of our criteria than the ones currently listed
8787

8888
You can help with this by checking and letting us know. [Create an issue](https://github.com/ethereum/ethereum-org-website/issues/new?assignees=&labels=Type%3A+Feature&template=feature_request.yaml&title=) or send an email to [website@ethereum.org](mailto:website@ethereum.org)

public/content/contributing/adding-wallets/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ If you want to add a wallet to ethereum.org, create an issue on GitHub.
6969

7070
As is the fluid nature of Ethereum, teams and products come and go and innovation happens daily, so we'll undertake routine checks of our content to:
7171

72-
- ensure that all wallets and dapps listed still fulfil our criteria
72+
- ensure that all wallets and dapps listed still fulfill our criteria
7373
- verify there aren't products that have been suggested that meet more of our criteria than the ones currently listed
7474

7575
ethereum.org is maintained by the open source community & we rely on the community to help keep this up to date. If you notice any information about listed wallets that needs to be updated, please [open an issue](https://github.com/ethereum/ethereum-org-website/issues/new?assignees=&labels=wallet+%3Apurse%3A&template=suggest_wallet.yaml) or [pull request](https://github.com/ethereum/ethereum-org-website/pulls)!
Binary file not shown.

0 commit comments

Comments
 (0)