Skip to content

Commit fd4d922

Browse files
Merge branch 'ethereum:dev' into shyam-header-fix
2 parents ee1ed11 + 074c989 commit fd4d922

File tree

537 files changed

+23259
-6677
lines changed

Some content is hidden

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

537 files changed

+23259
-6677
lines changed

.all-contributorsrc

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11020,6 +11020,87 @@
1102011020
"contributions": [
1102111021
"code"
1102211022
]
11023+
},
11024+
{
11025+
"login": "oleksandr-hyriavets",
11026+
"name": "Oleksandr Hyriavets",
11027+
"avatar_url": "https://avatars.githubusercontent.com/u/19614509?v=4",
11028+
"profile": "https://github.com/oleksandr-hyriavets",
11029+
"contributions": [
11030+
"code"
11031+
]
11032+
},
11033+
{
11034+
"login": "titanism",
11035+
"name": "titanism",
11036+
"avatar_url": "https://avatars.githubusercontent.com/u/101466223?v=4",
11037+
"profile": "https://github.com/titanism",
11038+
"contributions": [
11039+
"doc"
11040+
]
11041+
},
11042+
{
11043+
"login": "Maxservais",
11044+
"name": "Maxime Servais",
11045+
"avatar_url": "https://avatars.githubusercontent.com/u/43566493?v=4",
11046+
"profile": "https://www.ethereum-ecosystem.com/",
11047+
"contributions": [
11048+
"code"
11049+
]
11050+
},
11051+
{
11052+
"login": "nebolax",
11053+
"name": "Alexey Nebolsin",
11054+
"avatar_url": "https://avatars.githubusercontent.com/u/63492346?v=4",
11055+
"profile": "https://t.me/nebolax",
11056+
"contributions": [
11057+
"doc"
11058+
]
11059+
},
11060+
{
11061+
"login": "jimgreen2013",
11062+
"name": "jimgreen2013",
11063+
"avatar_url": "https://avatars.githubusercontent.com/u/15890793?v=4",
11064+
"profile": "https://github.com/jimgreen2013",
11065+
"contributions": [
11066+
"doc"
11067+
]
11068+
},
11069+
{
11070+
"login": "gabrieltemtsen",
11071+
"name": "Gabriel Temsten",
11072+
"avatar_url": "https://avatars.githubusercontent.com/u/57184013?v=4",
11073+
"profile": "https://github.com/gabrieltemtsen",
11074+
"contributions": [
11075+
"code"
11076+
]
11077+
},
11078+
{
11079+
"login": "jennyg0",
11080+
"name": "Jen ",
11081+
"avatar_url": "https://avatars.githubusercontent.com/u/60794961?v=4",
11082+
"profile": "https://github.com/jennyg0",
11083+
"contributions": [
11084+
"code"
11085+
]
11086+
},
11087+
{
11088+
"login": "Molotov-Eugene",
11089+
"name": "Eugene",
11090+
"avatar_url": "https://avatars.githubusercontent.com/u/95471552?v=4",
11091+
"profile": "https://github.com/Molotov-Eugene",
11092+
"contributions": [
11093+
"content"
11094+
]
11095+
},
11096+
{
11097+
"login": "rimtaex",
11098+
"name": "RimTaeX",
11099+
"avatar_url": "https://avatars.githubusercontent.com/u/155366533?v=4",
11100+
"profile": "https://github.com/rimtaex",
11101+
"contributions": [
11102+
"content"
11103+
]
1102311104
}
1102411105
],
1102511106
"contributorsPerLine": 7,

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,6 +1719,17 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
17191719
<td align="center" valign="top" width="14.28%"><a href="https://a-hagi.dev/"><img src="https://avatars.githubusercontent.com/u/92589940?v=4?s=100" width="100px;" alt="Abdullahi"/><br /><sub><b>Abdullahi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aa-hagi613" title="Bug reports">🐛</a></td>
17201720
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/pranav-konde-56aa141b5/"><img src="https://avatars.githubusercontent.com/u/76070589?v=4?s=100" width="100px;" alt="Pranav Konde"/><br /><sub><b>Pranav Konde</b></sub></a><br /><a href="#content-pranavkonde" title="Content">🖋</a></td>
17211721
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MohitKambli"><img src="https://avatars.githubusercontent.com/u/31406633?v=4?s=100" width="100px;" alt="Mohit Kambli"/><br /><sub><b>Mohit Kambli</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=MohitKambli" title="Code">💻</a></td>
1722+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/oleksandr-hyriavets"><img src="https://avatars.githubusercontent.com/u/19614509?v=4?s=100" width="100px;" alt="Oleksandr Hyriavets"/><br /><sub><b>Oleksandr Hyriavets</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=oleksandr-hyriavets" title="Code">💻</a></td>
1723+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/titanism"><img src="https://avatars.githubusercontent.com/u/101466223?v=4?s=100" width="100px;" alt="titanism"/><br /><sub><b>titanism</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=titanism" title="Documentation">📖</a></td>
1724+
<td align="center" valign="top" width="14.28%"><a href="https://www.ethereum-ecosystem.com/"><img src="https://avatars.githubusercontent.com/u/43566493?v=4?s=100" width="100px;" alt="Maxime Servais"/><br /><sub><b>Maxime Servais</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Maxservais" title="Code">💻</a></td>
1725+
</tr>
1726+
<tr>
1727+
<td align="center" valign="top" width="14.28%"><a href="https://t.me/nebolax"><img src="https://avatars.githubusercontent.com/u/63492346?v=4?s=100" width="100px;" alt="Alexey Nebolsin"/><br /><sub><b>Alexey Nebolsin</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=nebolax" title="Documentation">📖</a></td>
1728+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jimgreen2013"><img src="https://avatars.githubusercontent.com/u/15890793?v=4?s=100" width="100px;" alt="jimgreen2013"/><br /><sub><b>jimgreen2013</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=jimgreen2013" title="Documentation">📖</a></td>
1729+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/gabrieltemtsen"><img src="https://avatars.githubusercontent.com/u/57184013?v=4?s=100" width="100px;" alt="Gabriel Temsten"/><br /><sub><b>Gabriel Temsten</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=gabrieltemtsen" title="Code">💻</a></td>
1730+
<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>
1731+
<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>
1732+
<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>
17221733
</tr>
17231734
</tbody>
17241735
</table>

public/_redirects

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,4 @@
176176

177177
/*/guides/how-to-register-an-ethereum-account /:splat/guides/how-to-create-an-ethereum-account/ 301!
178178

179-
/studio /en/deprecated-software/#ethereum-studio 301!
180-
181-
/*/studio /:splat/deprecated-software/#ethereum-studio 301!
182-
183179
/en/stablecoins /stablecoins 301!

public/content/community/grants/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ These programs support the broad Ethereum ecosystem by offering grants to a wide
2727
These projects have created their own grants for projects aimed at developing and experimenting with their own technology.
2828

2929
- [Aave Grants Program](https://aavegrants.org/)_[Aave](https://aave.com/) grants DAO_
30-
- [Balancer](https://quark-ceres-740.notion.site/Balancer-Grants-938f1b979810427f8d903a904315da41)_[Balancer](https://balancer.fi/) ecosystem fund_
30+
- [Balancer](https://grants.balancer.community/)_[Balancer](https://balancer.fi/) ecosystem fund_
3131
- [Chainlink Grants Program](https://chain.link/community/grants) - _[Chainlink](https://chain.link/) community grants_
3232
- [Decentraland Grants Program](https://governance.decentraland.org/grants/)_[Decentraland](https://decentraland.org/) DAO Metaverse_
3333
- [Lido Ecosystem Grants Organisation (LEGO)](https://lido.fi/lego)_[Lido](https://lido.fi/) finance ecosystem_
3434
- [MetaMask Program](https://metamaskgrants.org/) - _[MetaMask](https://metamask.io/) employee-led grants DAO_
3535
- [SKALE Network Grants Program](https://skale.space/developers#grants) - _[SKALE Network](https://skale.space/) ecosystem_
36-
- [The Graph](https://airtable.com/shrdfvnFvVch3IOVm)_[The Graph](https://thegraph.com/) ecosystem_
37-
- [Uniswap Grants Program](https://www.uniswapfoundation.org/apply-for-a-grant) - _[Uniswap](https://uniswap.org/) community_
36+
- [The Graph](https://thegraph.com/ecosystem/grants/)_[The Graph](https://thegraph.com/) ecosystem_
37+
- [Uniswap Grants Program](https://www.uniswapfoundation.org/grants) _[Uniswap](https://uniswap.org/) community_
3838
- [Web3 Grants](https://web3grants.net) - _An extensive list of web3/crypto related grant programs_
3939

4040
## Quadratic funding {#quadratic-funding}

public/content/contributing/design/index.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ Ultimately, this is a great way to build a diverse and impressive portfolio that
1212

1313
## How to contribute?
1414

15-
### <Emoji text=":one:" size={1} /> Provide feedback on early design prototypes {#design-critique}
15+
### <Emoji text=":one:" size={1} /> &nbsp;Provide feedback on early design prototypes {#design-critique}
1616

1717
We sometimes need a help testing our raw ideas. This is a great way how to contribute without any technical knowledge.
1818

1919
1. The design team will share a mockup design on [Discord](https://discord.com/invite/ethereum-org) and on [GitHub](https://github.com/ethereum/ethereum-org-website/labels/design%20required%20%F0%9F%8E%A8).
2020
2. You will be guided through the designs to provide feedback via comments function.
2121
3. The outcome will be shared in the GitHub issue and then closed by the team.
2222

23-
### <Emoji text=":two:" size={1} /> Participate in survey research {#answer-surveys}
23+
### <Emoji text=":two:" size={1} /> &nbsp;Participate in survey research {#answer-surveys}
2424

2525
Provide feedback on our website by:
2626

2727
1. Visiting ethereum.org and reading through pages.
2828
2. Clicking on the feedback widget at the bottom right corner and answering design and content-related questions.
2929
3. Focus on the free format questions.
3030

31-
### <Emoji text=":three:" size={1} /> Find design related issues on the website and report them {#report-design-issues}
31+
### <Emoji text=":three:" size={1} /> &nbsp;Find design related issues on the website and report them {#report-design-issues}
3232

3333
Ethereum.org is a fast growing website with many features and content. Some of the UI can easily become obsolete or could be improved. If you encounter any such instance, please report it so that it gets our attention.
3434

3535
1. Go through the website and pay attention to its design.
3636
2. Take screenshots and notes if you see any visual or UX issues.
3737
3. Report the found issues using a [bug report](https://github.com/ethereum/ethereum-org-website/issues/new/choose).
3838

39-
### <Emoji text=":four:" size={1} /> Propose design changes {#propose-design-changes}
39+
### <Emoji text=":four:" size={1} /> &nbsp;Propose design changes {#propose-design-changes}
4040

4141
If you feel comfortable taking on design challenges, you can visit our GitHub issues board and filter for [design-related issues](https://github.com/ethereum/ethereum-org-website/labels/design%20required%20%F0%9F%8E%A8).
4242

@@ -45,7 +45,7 @@ If you feel comfortable taking on design challenges, you can visit our GitHub is
4545
3. Propose the solution in the corresponding GitHub issue or [create a new one.](https://github.com/ethereum/ethereum-org-website/issues/new?assignees=&labels=feature+%3Asparkles%3A&template=feature_request.yaml&title=Feature+request)
4646
4. Wait for the design team to review.
4747

48-
### <Emoji text=":five:" size={1} /> Build Design System together {#Contribute-to-design-system}
48+
### <Emoji text=":five:" size={1} /> &nbsp;Build Design System together {#Contribute-to-design-system}
4949

5050
Our design system makes designing ethereum.org fun and easy. If you are an experienced designer, you can help us prepare many components for the website.
5151

@@ -56,7 +56,7 @@ Our design system makes designing ethereum.org fun and easy. If you are an exper
5656
5. The design team will review.
5757
6. The Design team will incorporate the changes in the main file and publish the file to the community.
5858

59-
### <Emoji text=":six:" size={1} /> Write design-related content on the website {#write-design-articles}
59+
### <Emoji text=":six:" size={1} /> &nbsp;Write design-related content on the website {#write-design-articles}
6060

6161
The Ethereum developer community is strong, but the design community is falling slightly behind. If you are a designer with web3 knowledge, please consider sharing your learnings with the larger community so that we can all grow and improve together; we have [a page on designing for Ethereum](/developers/docs/design-and-ux/) you can contribute to. You can also check our [listing policies](/contributing/design/adding-design-resources).
6262

@@ -66,7 +66,7 @@ The Ethereum developer community is strong, but the design community is falling
6666
4. Once approved, write the content.
6767
5. Submit it in the corresponding GH issue.
6868

69-
### <Emoji text=":seven:" size={1} /> Draw new illustrations {#prepare-illustrations}
69+
### <Emoji text=":seven:" size={1} /> &nbsp;Draw new illustrations {#prepare-illustrations}
7070

7171
Visualisations are one of the most powerful tools to explain abstract topics. There is an enormous potential by adding diagrams and infographics. After all, one image can say thousand words.
7272

0 commit comments

Comments
 (0)