scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-17 19:12:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4426 from LLK/develop

Browse source 
merge from develop to release branch
This commit is contained in:
Eric Rosenbaum 2020-09-16 11:56:46 -04:00 committed by GitHub
commit 200e824047
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3137 additions and 428 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3553
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -128,7 +128,7 @@
"redux-mock-store": "^1.2.3", "redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1", "redux-thunk": "2.0.1",
"sass-loader": "6.0.6", "sass-loader": "6.0.6",
"scratch-gui": "0.1.0-prerelease.20200908214811", "scratch-gui": "0.1.0-prerelease.20200916123032",
"scratch-l10n": "latest", "scratch-l10n": "latest",
"selenium-webdriver": "3.6.0", "selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0", "slick-carousel": "1.6.0",

10
src/routes.json
View file

@ -505,6 +505,16 @@
"pattern": "^/pong/?$", "pattern": "^/pong/?$",
"redirect": "/projects/editor/?tutorial=pong" "redirect": "/projects/editor/?tutorial=pong"
}, },
{
"name": "animateacharacter-tutorial-redirect",
"pattern": "^/animate-a-character/?$",
"redirect": "/projects/editor/?tutorial=animate-a-character"
},
{
"name": "videosensing-tutorial-redirect",
"pattern": "^/video-sensing/?$",
"redirect": "/projects/editor/?tutorial=video-sensing"
},
{ {
"name": "clicker-tutorial-redirect", "name": "clicker-tutorial-redirect",
"pattern": "^/clicker/?$", "pattern": "^/clicker/?$",