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

Merge remote-tracking branch 'origin/develop' into release/2022-08-24

Browse source
This commit is contained in:
cwillisf 2022-08-24 17:55:03 +00:00
commit 38c1772445
4 changed files with 45 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
package-lock.json generated
View file

@ -99,8 +99,8 @@
"regenerator-runtime": "0.13.9",
"sass": "1.49.7",
"sass-loader": "10.2.1",
"scratch-gui": "0.1.0-prerelease.20220817151113",
"scratch-l10n": "3.14.20220817031614",
"scratch-gui": "0.1.0-prerelease.20220824145530",
"scratch-l10n": "3.14.20220824031545",
"selenium-webdriver": "4.1.0",
"slick-carousel": "1.6.0",
"style-loader": "0.12.3",
@ -22878,9 +22878,9 @@
}
},
"node_modules/scratch-gui": {
"version": "0.1.0-prerelease.20220817151113",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220817151113.tgz",
"integrity": "sha512-UNgpm0Povalr7523hJwOmyG7ZSjagRkYwHOyttlL++SaTgf5jE8gLsAnixPrXEfopU5GzeeyTWkGf7HdqVH6EA==",
"version": "0.1.0-prerelease.20220824145530",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220824145530.tgz",
"integrity": "sha512-K9umXORhddSW8kaWK/4eb2HP9TBuCDJCpcI0tNggPexp71j5VOH1P0n+Mjp2APUJfEFKHu67jtLvSLYL6SSrkw==",
"dev": true,
"dependencies": {
"arraybuffer-loader": "^1.0.6",
@ -22932,13 +22932,13 @@
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
"scratch-blocks": "0.1.0-prerelease.20220524062105",
"scratch-l10n": "3.14.20220816031545",
"scratch-paint": "0.2.0-prerelease.20220816095955",
"scratch-l10n": "3.14.20220824031545",
"scratch-paint": "0.2.0-prerelease.20220824070845",
"scratch-render": "0.1.0-prerelease.20211028200436",
"scratch-render-fonts": "1.0.0-prerelease.20210401210003",
"scratch-storage": "2.0.2",
"scratch-svg-renderer": "0.2.0-prerelease.20220817124220",
"scratch-vm": "1.1.2",
"scratch-vm": "1.1.4",
"startaudiocontext": "1.2.1",
"style-loader": "^0.23.0",
"text-encoding": "0.7.0",
@ -23221,26 +23221,10 @@
"symbol-observable": "^1.0.3"
}
},
"node_modules/scratch-gui/node_modules/scratch-l10n": {
"version": "3.14.20220816031545",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220816031545.tgz",
"integrity": "sha512-anAm1FgYtTLxqmUBi84kJ5psug3pL5HbO4FT2+cyXA7r6eVofQSkNbSmtKizOWcJjRWfWlLtWGP/P2HBRdfSsg==",
"dev": true,
"dependencies": {
"@babel/cli": "^7.1.2",
"@babel/core": "^7.1.2",
"babel-plugin-react-intl": "^3.0.1",
"transifex": "1.6.6"
},
"bin": {
"build-i18n-src": "scripts/build-i18n-src.js",
"tx-push-src": "scripts/tx-push-src.js"
}
},
"node_modules/scratch-gui/node_modules/scratch-paint": {
"version": "0.2.0-prerelease.20220816095955",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220816095955.tgz",
"integrity": "sha512-GWza6ZL86N1gi109DNL1aR0XtTT6hGf4bKApdhA6izkCh4qE4pZ1Mgjiepn/RwSf38ECsGBfvRTE2gl9eGO1rw==",
"version": "0.2.0-prerelease.20220824070845",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220824070845.tgz",
"integrity": "sha512-rERhKdSs3O4HSZ8QitYCSizCoyRWesO/SKyCwEIsq2F6Yhip6JKiPm4WQcihg5BiZs9vXrXp3XolieqFV+6UFA==",
"dev": true,
"dependencies": {
"@scratch/paper": "0.11.20200728195508",
@ -23363,9 +23347,9 @@
}
},
"node_modules/scratch-l10n": {
"version": "3.14.20220817031614",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220817031614.tgz",
"integrity": "sha512-4DdVj1BCc9mqA5fNIjEEK/YOwyPXGOctjYaQjj7MzrtorAIP3jiHAtq2CPVhiGX34PQkvSbEGSfMtYhT0jxdvw==",
"version": "3.14.20220824031545",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220824031545.tgz",
"integrity": "sha512-ZISjEdBxulhqrpOIGtR6wuIwE/LYCKY9XZ5EquOVeNvaQSCggzaKeIKE5Lg2Osg/9gxiXdWOwPwlvu58jkXq3g==",
"dev": true,
"dependencies": {
"@babel/cli": "^7.1.2",
@ -23561,9 +23545,9 @@
"dev": true
},
"node_modules/scratch-vm": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.1.2.tgz",
"integrity": "sha512-/YNBTeXkuYpfFy0Z23IdS1BsICYynwtjjUy1F+QCDN0Ef9FAbmBPB4909EJk8xOdsjXdExO1vDEWjXmZb8OJwA==",
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.1.4.tgz",
"integrity": "sha512-/EF6XGPL7qEcjRdmHlYmgDgglfTpLyE+inh1JqhCXrSm/otr02bLVLulFiZMeY4O/lkTtmpaDrzdEvYpEGUivw==",
"dev": true,
"dependencies": {
"@vernier/godirect": "1.5.0",
@ -50802,9 +50786,9 @@
}
},
"scratch-gui": {
"version": "0.1.0-prerelease.20220817151113",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220817151113.tgz",
"integrity": "sha512-UNgpm0Povalr7523hJwOmyG7ZSjagRkYwHOyttlL++SaTgf5jE8gLsAnixPrXEfopU5GzeeyTWkGf7HdqVH6EA==",
"version": "0.1.0-prerelease.20220824145530",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220824145530.tgz",
"integrity": "sha512-K9umXORhddSW8kaWK/4eb2HP9TBuCDJCpcI0tNggPexp71j5VOH1P0n+Mjp2APUJfEFKHu67jtLvSLYL6SSrkw==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@ -50856,13 +50840,13 @@
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
"scratch-blocks": "0.1.0-prerelease.20220524062105",
"scratch-l10n": "3.14.20220816031545",
"scratch-paint": "0.2.0-prerelease.20220816095955",
"scratch-l10n": "3.14.20220824031545",
"scratch-paint": "0.2.0-prerelease.20220824070845",
"scratch-render": "0.1.0-prerelease.20211028200436",
"scratch-render-fonts": "1.0.0-prerelease.20210401210003",
"scratch-storage": "2.0.2",
"scratch-svg-renderer": "0.2.0-prerelease.20220817124220",
"scratch-vm": "1.1.2",
"scratch-vm": "1.1.4",
"startaudiocontext": "1.2.1",
"style-loader": "^0.23.0",
"text-encoding": "0.7.0",
@ -51091,22 +51075,10 @@
"symbol-observable": "^1.0.3"
}
},
"scratch-l10n": {
"version": "3.14.20220816031545",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220816031545.tgz",
"integrity": "sha512-anAm1FgYtTLxqmUBi84kJ5psug3pL5HbO4FT2+cyXA7r6eVofQSkNbSmtKizOWcJjRWfWlLtWGP/P2HBRdfSsg==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
"@babel/core": "^7.1.2",
"babel-plugin-react-intl": "^3.0.1",
"transifex": "1.6.6"
}
},
"scratch-paint": {
"version": "0.2.0-prerelease.20220816095955",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220816095955.tgz",
"integrity": "sha512-GWza6ZL86N1gi109DNL1aR0XtTT6hGf4bKApdhA6izkCh4qE4pZ1Mgjiepn/RwSf38ECsGBfvRTE2gl9eGO1rw==",
"version": "0.2.0-prerelease.20220824070845",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220824070845.tgz",
"integrity": "sha512-rERhKdSs3O4HSZ8QitYCSizCoyRWesO/SKyCwEIsq2F6Yhip6JKiPm4WQcihg5BiZs9vXrXp3XolieqFV+6UFA==",
"dev": true,
"requires": {
"@scratch/paper": "0.11.20200728195508",
@ -51209,9 +51181,9 @@
}
},
"scratch-l10n": {
"version": "3.14.20220817031614",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220817031614.tgz",
"integrity": "sha512-4DdVj1BCc9mqA5fNIjEEK/YOwyPXGOctjYaQjj7MzrtorAIP3jiHAtq2CPVhiGX34PQkvSbEGSfMtYhT0jxdvw==",
"version": "3.14.20220824031545",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220824031545.tgz",
"integrity": "sha512-ZISjEdBxulhqrpOIGtR6wuIwE/LYCKY9XZ5EquOVeNvaQSCggzaKeIKE5Lg2Osg/9gxiXdWOwPwlvu58jkXq3g==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
@ -51401,9 +51373,9 @@
"dev": true
},
"scratch-vm": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.1.2.tgz",
"integrity": "sha512-/YNBTeXkuYpfFy0Z23IdS1BsICYynwtjjUy1F+QCDN0Ef9FAbmBPB4909EJk8xOdsjXdExO1vDEWjXmZb8OJwA==",
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.1.4.tgz",
"integrity": "sha512-/EF6XGPL7qEcjRdmHlYmgDgglfTpLyE+inh1JqhCXrSm/otr02bLVLulFiZMeY4O/lkTtmpaDrzdEvYpEGUivw==",
"dev": true,
"requires": {
"@vernier/godirect": "1.5.0",

4
package.json
View file

@ -134,8 +134,8 @@
"regenerator-runtime": "0.13.9",
"sass": "1.49.7",
"sass-loader": "10.2.1",
"scratch-gui": "0.1.0-prerelease.20220817151113",
"scratch-l10n": "3.14.20220817031614",
"scratch-gui": "0.1.0-prerelease.20220824145530",
"scratch-l10n": "3.14.20220824031545",
"selenium-webdriver": "4.1.0",
"slick-carousel": "1.6.0",
"style-loader": "0.12.3",

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

@ -147,7 +147,6 @@ const Credits = () => (
Kreg Hanning,
Sean Hickey,
Christina Huang,
Cori Hudson,
Tony Hwang,
Abdulrahman Idlbi,
Rupal Jain,
@ -175,6 +174,7 @@ const Credits = () => (
Natalie Rusk,
Andrea Saxman,
Ray Schamp,
Eric Schilling,
Jay Silver,
Brian Silverman,
Andrew Sliwinski,

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

@ -84,6 +84,11 @@
"userId": 10866958,
"name": "Colby"
},
{
"userName": "technoboy10",
"userId": 36977,
"name": "Cori"
},
{
"userName": "spectre_specs",
"userId": 79615865,
@ -124,11 +129,6 @@
"userId": 159,
"name": "Eric"
},
{
"userName": "speakvisually",
"userId": 3484484,
"name": "Eric"
},
{
"userName": "scratcher-erik",
"userId": 82778056,
@ -269,6 +269,11 @@
"userId": 68837085,
"name": "Tasha"
},
{
"userName": "meyerhot",
"userId": 98494234,
"name": "Teo"
},
{
"userName": "cardboardbee",
"userId": 83142859,