Skip to content

Commit

Permalink
Merge branch 'dev' into pr/11344
Browse files Browse the repository at this point in the history
  • Loading branch information
wackerow committed Nov 30, 2023
2 parents c9e9727 + 9163e6b commit 9f6e88c
Show file tree
Hide file tree
Showing 1,388 changed files with 127,434 additions and 52,048 deletions.
275 changes: 273 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -8379,7 +8379,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/45835846?v=4",
"profile": "https://pandapip1.com/",
"contributions": [
"doc"
"doc",
"ideas"
]
},
{
Expand Down Expand Up @@ -10591,10 +10592,280 @@
"login": "natpicone",
"name": "Natalino Picone",
"avatar_url": "https://avatars.githubusercontent.com/u/4753402?v=4",
"profile": "http://nozominetworks.com",
"profile": "https://chainlabo.com",
"contributions": [
"content"
]
},
{
"login": "hammadsaedi",
"name": "Hammad Saaedi",
"avatar_url": "https://avatars.githubusercontent.com/u/71373419?v=4",
"profile": "https://github.com/hammadsaedi",
"contributions": [
"content"
]
},
{
"login": "srn08",
"name": "Shaunak Nagrecha",
"avatar_url": "https://avatars.githubusercontent.com/u/105499798?v=4",
"profile": "https://github.com/srn08",
"contributions": [
"bug"
]
},
{
"login": "schwindtkevin",
"name": "Kevin Schwindt",
"avatar_url": "https://avatars.githubusercontent.com/u/1700789?v=4",
"profile": "https://github.com/schwindtkevin",
"contributions": [
"content"
]
},
{
"login": "robertkodra",
"name": "Robert",
"avatar_url": "https://avatars.githubusercontent.com/u/36516516?v=4",
"profile": "https://github.com/robertkodra",
"contributions": [
"content"
]
},
{
"login": "0xObsidian",
"name": "obsidian",
"avatar_url": "https://avatars.githubusercontent.com/u/131651958?v=4",
"profile": "https://github.com/0xObsidian",
"contributions": [
"content"
]
},
{
"login": "MohamedFekryyy",
"name": "Fekry Aiad",
"avatar_url": "https://avatars.githubusercontent.com/u/36033065?v=4",
"profile": "http://www.scienft.com",
"contributions": [
"ideas"
]
},
{
"login": "Wilson-Wu1",
"name": "Wilson Wu",
"avatar_url": "https://avatars.githubusercontent.com/u/41039035?v=4",
"profile": "https://www.linkedin.com/in/wilson-wu-2021/",
"contributions": [
"doc"
]
},
{
"login": "fvaysh",
"name": "VAS",
"avatar_url": "https://avatars.githubusercontent.com/u/126754021?v=4",
"profile": "https://github.com/fvaysh",
"contributions": [
"doc"
]
},
{
"login": "costgallo",
"name": "Costanza",
"avatar_url": "https://avatars.githubusercontent.com/u/49433698?v=4",
"profile": "https://github.com/costgallo",
"contributions": [
"doc"
]
},
{
"login": "joaolago1113",
"name": "joao",
"avatar_url": "https://avatars.githubusercontent.com/u/22820692?v=4",
"profile": "https://github.com/joaolago1113",
"contributions": [
"doc"
]
},
{
"login": "rgb2hsl",
"name": "Eugene",
"avatar_url": "https://avatars.githubusercontent.com/u/3310192?v=4",
"profile": "http://p2p.org",
"contributions": [
"content"
]
},
{
"login": "g0rbe",
"name": "Dániel Görbe",
"avatar_url": "https://avatars.githubusercontent.com/u/36860942?v=4",
"profile": "http://www.danielgorbe.com",
"contributions": [
"doc"
]
},
{
"login": "s-crypt",
"name": "s-crypt",
"avatar_url": "https://avatars.githubusercontent.com/u/41712656?v=4",
"profile": "https://blog.insubli.me",
"contributions": [
"content"
]
},
{
"login": "tudorpintea999",
"name": "iwantanode",
"avatar_url": "https://avatars.githubusercontent.com/u/87604944?v=4",
"profile": "https://github.com/tudorpintea999",
"contributions": [
"content"
]
},
{
"login": "shak58",
"name": "shak58",
"avatar_url": "https://avatars.githubusercontent.com/u/150069539?v=4",
"profile": "https://github.com/shak58",
"contributions": [
"content"
]
},
{
"login": "Muhammad-Altabba",
"name": "Muhammad Altabba",
"avatar_url": "https://avatars.githubusercontent.com/u/24407834?v=4",
"profile": "https://linkedin.com/in/muhammadaltabba",
"contributions": [
"content"
]
},
{
"login": "darigovresearch",
"name": "Darigov Research",
"avatar_url": "https://avatars.githubusercontent.com/u/30328618?v=4",
"profile": "https://www.darigovresearch.com/",
"contributions": [
"content"
]
},
{
"login": "shubhusion",
"name": "SHUBHAM SHARMA ",
"avatar_url": "https://avatars.githubusercontent.com/u/96301987?v=4",
"profile": "https://github.com/shubhusion",
"contributions": [
"ideas"
]
},
{
"login": "paulallensuxs",
"name": "paulallensuxs",
"avatar_url": "https://avatars.githubusercontent.com/u/114240091?v=4",
"profile": "https://github.com/paulallensuxs",
"contributions": [
"content"
]
},
{
"login": "pseudomata",
"name": "Pseudomata",
"avatar_url": "https://avatars.githubusercontent.com/u/132238190?v=4",
"profile": "https://pseudomata.com",
"contributions": [
"code"
]
},
{
"login": "CodeDragonVN",
"name": "CodeDragonVN",
"avatar_url": "https://avatars.githubusercontent.com/u/150457827?v=4",
"profile": "https://github.com/CodeDragonVN",
"contributions": [
"content"
]
},
{
"login": "SamiAlHassan",
"name": "SamiAlHassan",
"avatar_url": "https://avatars.githubusercontent.com/u/150172180?v=4",
"profile": "https://github.com/SamiAlHassan",
"contributions": [
"content"
]
},
{
"login": "NaijaCoderGirl",
"name": "NaijaCoderGirl",
"avatar_url": "https://avatars.githubusercontent.com/u/150683513?v=4",
"profile": "https://github.com/NaijaCoderGirl",
"contributions": [
"content"
]
},
{
"login": "konstantinzolotarev",
"name": "Konstantin Zolotarev",
"avatar_url": "https://avatars.githubusercontent.com/u/286431?v=4",
"profile": "https://github.com/konstantinzolotarev",
"contributions": [
"content"
]
},
{
"login": "vuittont60",
"name": "vuittont60",
"avatar_url": "https://avatars.githubusercontent.com/u/81072379?v=4",
"profile": "https://github.com/vuittont60",
"contributions": [
"content"
]
},
{
"login": "goldnite",
"name": "Golden Ite",
"avatar_url": "https://avatars.githubusercontent.com/u/114434414?v=4",
"profile": "http://goldnite.github.io",
"contributions": [
"content"
]
},
{
"login": "Erlangshen219",
"name": "Erlangshen219",
"avatar_url": "https://avatars.githubusercontent.com/u/104747507?v=4",
"profile": "https://github.com/Erlangshen219",
"contributions": [
"content"
]
},
{
"login": "AyDeveloper",
"name": "AyDeveloper",
"avatar_url": "https://avatars.githubusercontent.com/u/72970379?v=4",
"profile": "https://oxpampam.netlify.app/",
"contributions": [
"content"
]
},
{
"login": "jeremyfritzen",
"name": "jeremyfritzen",
"avatar_url": "https://avatars.githubusercontent.com/u/26802442?v=4",
"profile": "https://github.com/jeremyfritzen",
"contributions": [
"content"
]
},
{
"login": "fuzheng1998",
"name": "Zheng Fu",
"avatar_url": "https://avatars.githubusercontent.com/u/24203166?v=4",
"profile": "https://github.com/fuzheng1998",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
* @samajammin @wackerow @corwintines @pettinarip @minimalsm @jmcook1186 @nhsz
* @wackerow @corwintines @pettinarip @minimalsm @nhsz

# Owners of specific files
/src/data/consensus-bounty-hunters.csv @djrtwo @asanso @fredriksvantes
2 changes: 1 addition & 1 deletion .storybook/i18next.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import i18n, { Resource } from "i18next"
import { initReactI18next } from "gatsby-plugin-react-i18next"
import fs from "fs"

export const baseLocales = {
en: { title: "English", left: "En" },
Expand All @@ -15,6 +14,7 @@ const ns = [
"glossary",
"page-about",
"page-index",
"page-learn",
"page-upgrades",
"page-developers-index",
]
Expand Down
2 changes: 1 addition & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const config: StorybookConfig = {
"@chakra-ui/storybook-addon",
"storybook-react-i18next",
],
staticDirs: ["../static"],
staticDirs: ["../static", "../src/assets"],
babel: async () => ({
...babelConfig,
}),
Expand Down
Loading

0 comments on commit 9f6e88c

Please sign in to comment.