scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'develop' into beta

Browse source
This commit is contained in:
Andy O'Neill 2023-06-20 14:49:26 -04:00
commit fcf696a635
4 changed files with 152 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package-lock.json generated
View file

@ -102,7 +102,7 @@
"sass": "1.49.7",
"sass-loader": "10.2.1",
"scratch-gui": "2.0.0",
"scratch-l10n": "3.15.20230612032227",
"scratch-l10n": "3.15.20230620032154",
"selenium-webdriver": "4.1.0",
"slick-carousel": "1.6.0",
"style-loader": "0.12.3",
@ -24059,9 +24059,9 @@
}
},
"node_modules/scratch-l10n": {
"version": "3.15.20230612032227",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230612032227.tgz",
"integrity": "sha512-hmOuiBfhoCeV2Bn5NCbjMASZf5Hw3KGBm150dES2ZsLxWy4Hg1ftpF9vGbjvO8MbvZzDQAupUFQgDr5jt59N6Q==",
"version": "3.15.20230620032154",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230620032154.tgz",
"integrity": "sha512-fltlTjo19BO9EL7wCvZci3aFZzU5pt3GKESZ+HHJp7FuaW+gDGowYYVdKDi+rpi4x2hD6BsxXBEC7t3e4qYF8g==",
"dev": true,
"dependencies": {
"@babel/cli": "^7.1.2",

2
package.json
View file

@ -137,7 +137,7 @@
"sass": "1.49.7",
"sass-loader": "10.2.1",
"scratch-gui": "2.0.0",
"scratch-l10n": "3.15.20230612032227",
"scratch-l10n": "3.15.20230620032154",
"selenium-webdriver": "4.1.0",
"slick-carousel": "1.6.0",
"style-loader": "0.12.3",

2
src/views/about/about.jsx
View file

@ -186,7 +186,7 @@ const About = injectIntl(({intl}) => (
),
annualReportLink: (
<a
href="/annual-report"
href="https://www.scratchfoundation.org/annualreport"
>
<FormattedMessage id="about.annualReportLinkText" />
</a>

300
src/views/credits/people.json
View file

@ -19,16 +19,31 @@
"userId": 56182496,
"name": "Amielle"
},
{
"userName": "deepThought01",
"userId": 102947541,
"name": "Andy"
},
{
"userName": "achouse",
"userId": 4747093,
"name": "Annie"
},
{
"userName": "asingh7115",
"userId": 89358075,
"name": "Anu"
},
{
"userName": "carpeediem",
"userId": 85830206,
"name": "Ashlee"
},
{
"userName": "bassa846",
"userId": 77575217,
"name": "Ashley"
},
{
"userName": "wheelsonfire",
"userId": 10001044,
@ -44,6 +59,16 @@
"userId": 79626299,
"name": "Breanna"
},
{
"userName": "caitspace",
"userId": 103663570,
"name": "Caitlin"
},
{
"userName": "TheRiverClub",
"userId": 95681607,
"name": "Carlos"
},
{
"userName": "chrisg",
"userId": 1494,
@ -64,6 +89,11 @@
"userId": 10866958,
"name": "Colby"
},
{
"userName": "galbigrillmaster",
"userId": 105231822,
"name": "Connie"
},
{
"userName": "technoboy10",
"userId": 36977,
@ -89,6 +119,11 @@
"userId": 373646,
"name": "Dalton"
},
{
"userName": "darien_scratch",
"userId": 99394155,
"name": "Darien"
},
{
"userName": "BlueWillow78",
"userId": 86427896,
@ -124,11 +159,26 @@
"userId": 721727,
"name": "Francisco"
},
{
"userName": "theegreatcatsby",
"userId": 104616178,
"name": "Gabriella"
},
{
"userName": "pixelmoth",
"userId": 2408962,
"name": "Jacy"
},
{
"userName": "JJLBailey",
"userId": 97557177,
"name": "Jarvis"
},
{
"userName": "Call_Me_J_Money",
"userId": 90382234,
"name": "Jess"
},
{
"userName": "GourdVibesOnly",
"userId": 83196398,
@ -144,6 +194,21 @@
"userId": 86101613,
"name": "Kathryn"
},
{
"userName": "bambam2433",
"userId": 106524413,
"name": "Kelly"
},
{
"userName": "KBScratch_621",
"userId": 105937628,
"name": "Kevin"
},
{
"userName": "justaspeckintheuni",
"userId": 80834643,
"name": "Kimberly"
},
{
"userName": "lashaunan",
"userId": 97557216,
@ -159,6 +224,11 @@
"userId": 88789309,
"name": "Laura"
},
{
"userName": "lalizapper",
"userId": 97449744,
"name": "Laura"
},
{
"userName": "JumpingRabbits",
"userId": 3948118,
@ -169,6 +239,11 @@
"userId": 80082947,
"name": "Lindsay"
},
{
"userName": "Moshilu",
"userId": 106664575,
"name": "Lucy"
},
{
"userName": "algorithmar",
"userId": 43013126,
@ -184,6 +259,11 @@
"userId": 79824929,
"name": "Mariana"
},
{
"userName": "glowinday",
"userId": 95186069,
"name": "Marise"
},
{
"userName": "dietbacon",
"userId": 24137617,
@ -199,11 +279,41 @@
"userId": 78735197,
"name": "Melodie"
},
{
"userName": "ZiMereLu",
"userId": 103073460,
"name": "Meredith"
},
{
"userName": "my_uh",
"userId": 95347525,
"name": "Miah"
},
{
"userName": "pamimus",
"userId": 74474548,
"name": "Mimi"
},
{
"userName": "BeachOlive",
"userId": 97557363,
"name": "Mindee"
},
{
"userName": "Arduinah",
"userId": 106474044,
"name": "Nikki"
},
{
"userName": "ZipZapZuko",
"userId": 41136623,
"name": "Prasanth"
},
{
"userName": "topball",
"userId": 101013059,
"name": "Ramazan"
},
{
"userName": "rtrvmwe",
"userId": 61342326,
@ -219,11 +329,36 @@
"userId": 88383612,
"name": "Ron"
},
{
"userName": "rosie-at-scratch",
"userId": 101528674,
"name": "Rosie"
},
{
"userName": "Filmerguy",
"userId": 96131855,
"name": "Russell"
},
{
"userName": "Rhyolyte",
"userId": 80776012,
"name": "Ryan"
},
{
"userName": "GardenSamantha",
"userId": 105312115,
"name": "Samantha"
},
{
"userName": "sanj1717",
"userId": 106524910,
"name": "Sandra"
},
{
"userName": "Smurflyfriend",
"userId": 97544955,
"name": "Sarah"
},
{
"userName": "LT7845",
"userId": 68837085,
@ -234,6 +369,16 @@
"userId": 98494234,
"name": "Teo"
},
{
"userName": "The_Quirky_Witch",
"userId": 104383414,
"name": "Tiffany"
},
{
"userName": "Johnny2By4",
"userId": 99985150,
"name": "Timothy"
},
{
"userName": "cardboardbee",
"userId": 83142859,
@ -263,160 +408,5 @@
"userName": "Purple4143",
"userId": 80892866,
"name": "Yvette"
},
{
"userName": "my_uh",
"userId": 95347525,
"name": "Miah"
},
{
"userName": "TheRiverClub",
"userId": 95681607,
"name": "Carlos"
},
{
"userName": "glowinday",
"userId": 95186069,
"name": "Marise"
},
{
"userName": "galbigrillmaster",
"userId": 105231822,
"name": "Connie"
},
{
"userName": "caitspace",
"userId": 103663570,
"name": "Caitlin"
},
{
"userName": "topball",
"userId": 101013059,
"name": "Ramazan"
},
{
"userName": "Call_Me_J_Money",
"userId": 95347525,
"name": "Jess"
},
{
"userName": "GardenSamantha",
"userId": 105312115,
"name": "Samantha"
},
{
"userName": "justaspeckintheuni",
"userId": 80834643,
"name": "Kimberly"
},
{
"userName": "deepThought01",
"userId": 102947541,
"name": "Andy"
},
{
"userName": "rosie-at-scratch",
"userId": 101528674,
"name": "Rosie"
},
{
"userName": "Johnny2By4",
"userId": 99985150,
"name": "Timothy"
},
{
"userName": "Ronald",
"userId": 88383612,
"name": "delasare"
},
{
"userName": "Jessica",
"userId": 90382234,
"name": "Call_Me_J_Money"
},
{
"userName": "ZipZapZuko",
"userId": 41136623,
"name": "Prasanth"
},
{
"userName": "darien_scratch",
"userId": 99394155,
"name": "Darien"
},
{
"userName": "theegreatcatsby",
"userId": 104616178,
"name": "Gabriella"
},
{
"userName": "bambam2433",
"userId": 106524413,
"name": "Kelly"
},
{
"userName": "lalizapper",
"userId": 97449744,
"name": "Laura"
},
{
"userName": "Moshilu",
"userId": 106664575,
"name": "Lucy"
},
{
"userName": "ZiMereLu",
"userId": 103073460,
"name": "Meredith"
},
{
"userName": "Arduinah",
"userId": 106474044,
"name": "Nikki"
},
{
"userName": "sanj1717",
"userId": 106524910,
"name": "Sandra"
},
{
"userName": "Smurflyfriend",
"userId": 97544955,
"name": "Sarah"
},
{
"userName": "The_Quirky_Witch",
"userId": 104383414,
"name": "Tiffany"
},
{
"userName": "asingh7115",
"userId": 89358075,
"name": "Anu"
},
{
"userName": "bassa846",
"userId": 77575217,
"name": "Ashley"
},
{
"userName": "JJLBailey",
"userId": 97557177,
"name": "Jarvis"
},
{
"userName": "KBScratch_621",
"userId": 105937628,
"name": "Kevin"
},
{
"userName": "BeachOlive",
"userId": 97557363,
"name": "Mindee"
},
{
"userName": "Filmerguy",
"userId": 96131855,
"name": "Russell"
}
]