Skip to content

Commit 293151e

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into migrate/gitstars
2 parents f889edb + 5f6163a commit 293151e

File tree

68 files changed

+574
-387
lines changed

Some content is hidden

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

68 files changed

+574
-387
lines changed

.all-contributorsrc

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12261,7 +12261,8 @@
1226112261
"profile": "https://github.com/Shiva-Sai-ssb",
1226212262
"contributions": [
1226312263
"bug",
12264-
"maintenance"
12264+
"maintenance",
12265+
"content"
1226512266
]
1226612267
},
1226712268
{
@@ -12543,6 +12544,33 @@
1254312544
"contributions": [
1254412545
"maintenance"
1254512546
]
12547+
},
12548+
{
12549+
"login": "KatrixReloaded",
12550+
"name": "Kartikeya Sureka",
12551+
"avatar_url": "https://avatars.githubusercontent.com/u/68804269?v=4",
12552+
"profile": "https://github.com/KatrixReloaded",
12553+
"contributions": [
12554+
"code"
12555+
]
12556+
},
12557+
{
12558+
"login": "Piyush-Tilokani",
12559+
"name": "Piyush Tilokani",
12560+
"avatar_url": "https://avatars.githubusercontent.com/u/112542519?v=4",
12561+
"profile": "https://github.com/Piyush-Tilokani",
12562+
"contributions": [
12563+
"content"
12564+
]
12565+
},
12566+
{
12567+
"login": "jacobourar",
12568+
"name": "Jacobo Uribe",
12569+
"avatar_url": "https://avatars.githubusercontent.com/u/109108267?v=4",
12570+
"profile": "https://github.com/jacobourar",
12571+
"contributions": [
12572+
"content"
12573+
]
1254612574
}
1254712575
],
1254812576
"contributorsPerLine": 7,

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1875,7 +1875,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18751875
<td align="center" valign="top" width="14.28%"><a href="https://github.com/abonnaudet-ledger"><img src="https://avatars.githubusercontent.com/u/71646516?v=4?s=100" width="100px;" alt="abonnaudet-ledger"/><br /><sub><b>abonnaudet-ledger</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aabonnaudet-ledger" title="Bug reports">🐛</a></td>
18761876
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JacobSharples"><img src="https://avatars.githubusercontent.com/u/45126111?v=4?s=100" width="100px;" alt="Jacob Sharples"/><br /><sub><b>Jacob Sharples</b></sub></a><br /><a href="#content-JacobSharples" title="Content">🖋</a></td>
18771877
<td align="center" valign="top" width="14.28%"><a href="https://github.com/omahs"><img src="https://avatars.githubusercontent.com/u/73983677?v=4?s=100" width="100px;" alt="omahs"/><br /><sub><b>omahs</b></sub></a><br /><a href="#translation-omahs" title="Translation">🌍</a> <a href="#maintenance-omahs" title="Maintenance">🚧</a></td>
1878-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Shiva-Sai-ssb"><img src="https://avatars.githubusercontent.com/u/112751524?v=4?s=100" width="100px;" alt="Shiva Sai"/><br /><sub><b>Shiva Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AShiva-Sai-ssb" title="Bug reports">🐛</a> <a href="#maintenance-Shiva-Sai-ssb" title="Maintenance">🚧</a></td>
1878+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Shiva-Sai-ssb"><img src="https://avatars.githubusercontent.com/u/112751524?v=4?s=100" width="100px;" alt="Shiva Sai"/><br /><sub><b>Shiva Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AShiva-Sai-ssb" title="Bug reports">🐛</a> <a href="#maintenance-Shiva-Sai-ssb" title="Maintenance">🚧</a> <a href="#content-Shiva-Sai-ssb" title="Content">🖋</a></td>
18791879
<td align="center" valign="top" width="14.28%"><a href="https://bsaurabh.xyz/"><img src="https://avatars.githubusercontent.com/u/39492927?v=4?s=100" width="100px;" alt="Saurabh Burade"/><br /><sub><b>Saurabh Burade</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=saurabhburade" title="Code">💻</a></td>
18801880
</tr>
18811881
<tr>
@@ -1917,6 +1917,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
19171917
<tr>
19181918
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MaryNfs"><img src="https://avatars.githubusercontent.com/u/52598322?v=4?s=100" width="100px;" alt="MaryNfs"/><br /><sub><b>MaryNfs</b></sub></a><br /><a href="#content-MaryNfs" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AMaryNfs" title="Bug reports">🐛</a></td>
19191919
<td align="center" valign="top" width="14.28%"><a href="https://signor.vercel.app/"><img src="https://avatars.githubusercontent.com/u/94352660?v=4?s=100" width="100px;" alt="Signor Dev"/><br /><sub><b>Signor Dev</b></sub></a><br /><a href="#maintenance-Signor1" title="Maintenance">🚧</a></td>
1920+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/KatrixReloaded"><img src="https://avatars.githubusercontent.com/u/68804269?v=4?s=100" width="100px;" alt="Kartikeya Sureka"/><br /><sub><b>Kartikeya Sureka</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=KatrixReloaded" title="Code">💻</a></td>
1921+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Piyush-Tilokani"><img src="https://avatars.githubusercontent.com/u/112542519?v=4?s=100" width="100px;" alt="Piyush Tilokani"/><br /><sub><b>Piyush Tilokani</b></sub></a><br /><a href="#content-Piyush-Tilokani" title="Content">🖋</a></td>
1922+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jacobourar"><img src="https://avatars.githubusercontent.com/u/109108267?v=4?s=100" width="100px;" alt="Jacobo Uribe"/><br /><sub><b>Jacobo Uribe</b></sub></a><br /><a href="#content-jacobourar" title="Content">🖋</a></td>
19201923
</tr>
19211924
</tbody>
19221925
</table>

public/content/community/online/index.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,31 @@ lang: en
88

99
Hundreds of thousands of Ethereum enthusiasts gather in these online forums to share news, talk about recent developments, debate technical issues, and imagine the future.
1010

11+
## Listing Policy {#listing-policy}
12+
13+
To maintain the integrity and value of the listed communities, ethereum.org follows a strict policy for determining eligibility:
14+
15+
### Eligibility Criteria {#eligibility-criteria}
16+
17+
- **Relevance**: The community must be directly related to Ethereum and its ecosystem.
18+
- **Activity Level**: The community should be active, with regular interactions, posts, or discussions. Dormant or inactive communities may be removed.
19+
- **Inclusivity**: The community should foster a welcoming environment that respects diversity and encourages participation from people of all backgrounds.
20+
- **Non-commercial Focus**: Listings are intended for community-driven spaces rather than commercial or promotional platforms.
21+
22+
### Content Guidelines {#content-guidelines}
23+
24+
- **Appropriate Content**: Communities must have their own moderation guidelines, avoiding spam, hate speech, harassment, or any content that promotes illegal activities.
25+
- **Language**: While English is the primary language, communities in other languages are encouraged to submit as long as they maintain an inclusive and respectful atmosphere.
26+
- **Transparency**: Clear information about the community’s purpose, rules, and moderators should be available to members.
27+
28+
### Other Recommendations {#other-recommendations}
29+
30+
- **Accessibility**: Community forums should be accessible for everyone to read without requiring a sign-up or registration.
31+
- **Discord Server Invites**: It is recommended that only reliable Discord server invites be added to ethereum.org. Ideally, these invites should link to a community page on the website (e.g., [ethglobal.com/discord](https://ethglobal.com/discord)) or be from an official URL (e.g., [discord.gg/ethstaker](https://discord.gg/ethstaker) or [discord.com/invite/ethstaker](https://discord.com/invite/ethstaker)).
32+
33+
If you believe a community should be added or removed based on these guidelines, please [open an issue on our GitHub repository](https://github.com/ethereum/ethereum-org-website/issues).
34+
35+
1136
## Forums {#forums}
1237

1338
<SocialListItem socialIcon="reddit"><Link href="https://www.reddit.com/r/ethereum">r/ethereum</Link> - all things Ethereum</SocialListItem>

public/content/developers/docs/data-and-analytics/block-explorers/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ You should understand the basic concepts of Ethereum so you can make sense of th
2626
- [EthVM](https://www.ethvm.com/)
2727
- [OKLink](https://www.oklink.com/eth)
2828
- [Rantom](https://rantom.app/)
29+
- [Ethseer](https://ethseer.io)
2930

3031
## Open source tools {#open-source-tools}
3132

public/content/developers/docs/nodes-and-clients/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ Multiple trackers offer a real-time overview of nodes in the Ethereum network. N
4848
- [Map of nodes](https://etherscan.io/nodetracker) by Etherscan
4949
- [Ethernodes](https://ethernodes.org/) by Bitfly
5050
- [Nodewatch](https://www.nodewatch.io/) by Chainsafe, crawling consensus nodes
51+
- [Monitoreth](https://monitoreth.io/) - by MigaLabs, A distributed network monitoring tool
5152

5253
## Node types {#node-types}
5354

public/images/dapps/zerion.png

1.1 KB
Loading
-25.7 KB
Binary file not shown.
21.8 KB
Loading

public/images/layer-2/zerion.png

-11.6 KB
Loading

public/images/wallets/shapeshift.png

-39.5 KB
Loading

0 commit comments

Comments
 (0)