scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-12 00:31:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5173 commits 221 branches 1 tag 506 MiB
Commit graph

5173 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Wheeler
df6c369e89 Added error strings for particular join flow errors 2019-11-05 12:09:55 -05:00
DD Liu
f972ee85ad
Merge pull request #3504 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191105010907 
Greenkeeper/scratch gui 0.1.0 prerelease.20191105010907
brings in LLK/scratch-svg-renderer#99 via gui
 2019-11-04 20:56:51 -05:00
greenkeeper[bot]
79ab2395a9
chore(package): update lockfile package-lock.json 2019-11-05 01:23:45 +00:00
greenkeeper[bot]
dbdd6a6bca
chore(package): update scratch-gui to version 0.1.0-prerelease.20191105010907 
Closes #3502
 2019-11-05 01:23:40 +00:00
Benjamin Wheeler
0d95ad531f
Merge pull request #3483 from benjiwheeler/join-flow-usernames-can-have-underscores 
revise join flow username validation tests
 2019-11-04 18:45:06 -05:00
Ben Wheeler
cb1332fb90 revised and expanded email step tests 2019-11-04 15:34:17 -05:00
Benjamin Wheeler
e367950a7d
Merge pull request #3496 from benjiwheeler/join-flow-correct-intl-id 
correct misspelled join flow intl id
 2019-11-04 12:01:51 -05:00
Ben Wheeler
24fd824e72 removed unnecessary underscore 2019-11-04 11:59:17 -05:00
DD Liu
4c8fdbe91a
Merge pull request #3501 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191102003322 
Greenkeeper/scratch gui 0.1.0 prerelease.20191102003322
 2019-11-02 13:31:40 -04:00
greenkeeper[bot]
b9ba808bd2
chore(package): update lockfile package-lock.json 2019-11-02 01:11:23 +00:00
greenkeeper[bot]
d382d9cff9
chore(package): update scratch-gui to version 0.1.0-prerelease.20191102003322 
Closes #3500
 2019-11-02 01:11:06 +00:00
Ray Schamp
5db199d07a
Merge pull request #3499 from LLK/greenkeeper/eslint-plugin-json-2.0.1 
Greenkeeper/eslint plugin json 2.0.1
 2019-11-01 10:47:42 -04:00
rschamp
19be26865f Merge branch 'develop' into greenkeeper/eslint-plugin-json-2.0.1 2019-11-01 10:46:49 -04:00
Ray Schamp
b244b1ed24
Merge pull request #3498 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191031171928 
Greenkeeper/scratch gui 0.1.0 prerelease.20191031171928
 2019-11-01 10:15:29 -04:00
Ben Wheeler
b6fcffd6f3 correct misspelled join flow intl id 2019-10-31 23:21:21 -04:00
greenkeeper[bot]
94d1e1400a
chore(package): update lockfile package-lock.json 2019-10-31 17:46:10 +00:00
greenkeeper[bot]
e3bedff388
chore(package): update scratch-gui to version 0.1.0-prerelease.20191031171928 
Closes #3493
 2019-10-31 17:45:51 +00:00
Karishma Chadha
0fe4eaed03
Merge pull request #3492 from LLK/release/2019-10-30 
[Develop] Release 2019-10-30
 2019-10-31 13:29:45 -04:00
Karishma Chadha
bb8972abff
Merge pull request #3491 from LLK/release/2019-10-30 
[Master] Release 2019-03-07
 2019-10-31 13:24:55 -04:00
Benjamin Wheeler
1f4aabd9d0
Merge pull request #3495 from LLK/revert-3468-country-data-name-fix 
Revert "fixed country options to use full country name string as option value"
 2019-10-31 12:07:37 -04:00
Benjamin Wheeler
20d9ab64ac
Revert "fixed country options to use full country name string as option value" 2019-10-31 10:56:46 -04:00
Ben Wheeler
53f6b13399 revised tests to distinguish between erroneous remote requests 2019-10-30 17:45:15 -04:00
Karishma Chadha
c2a2c0a0ac
Merge pull request #3490 from LLK/develop 
Update release branch with latest changes from develop.
 2019-10-30 16:54:30 -04:00
Karishma Chadha
b72450241f
Merge pull request #3489 from LLK/hotfixes-from-production 
Merge changes from master (but not actually master) into develop to clean up previous release
 2019-10-30 16:38:40 -04:00
Karishma Chadha
b5de9dcf78 Merge branch 'develop' into hotfixes-from-production 2019-10-30 16:36:57 -04:00
Ben Wheeler
420e7dfa3e WIP trying to fix tests 2019-10-30 15:34:52 -04:00
Ray Schamp
3bd92cf092
Merge pull request #3488 from kosiecki17/kosiecki17-HoC-Redirects 
HoC Redirect to Talking Tales and Code a Cartoon
 2019-10-30 15:28:34 -04:00
kosiecki17
3cd5e9679b
HoC Redirect to Talking Tales and Code a Cartoon 2019-10-30 15:23:20 -04:00
Ben Wheeler
a9810b6a1f revised username tests to separate them, make them clearer 2019-10-30 15:16:15 -04:00
chrisgarrity
0be9b7636e
Merge pull request #3487 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191030020251 
Greenkeeper/scratch gui 0.1.0 prerelease.20191030020251
 2019-10-30 14:36:10 -04:00
Ben Wheeler
652871f0bd removed password length code, moved to separate PR 2019-10-30 14:32:04 -04:00
chrisgarrity
1126e4d692
Merge pull request #3486 from chrisgarrity/add-missing-tx 
Add translation resource mapping
 2019-10-30 08:02:02 -04:00
greenkeeper[bot]
543c1a66f1
chore(package): update lockfile package-lock.json 2019-10-30 04:00:04 +00:00
greenkeeper[bot]
124fa9d062
chore(package): update scratch-gui to version 0.1.0-prerelease.20191030020251 
Closes #3479
 2019-10-30 03:59:58 +00:00
Chris Garrity
45d672ab30 Add translation resource mapping 
When the name of the view in `routes.json` does not match the name of the resource in transifex there needs to be a mapping added to the script that generates translations. _Note: the resource name in transifex is usually based on the name of the source file in the `views` directory. Usually the name of the view in the routes file matches._

Since `routes.json` is a JSON file that does not support comments there’s no way to add a warning to the file when someone is adding a route.

The sympton was the message that there were no translations for ‘vernier’ or ‘embed’ when running translate. The `vernier` route is actually the `gdxfor` view, and `embed` is just another version of `preview`
 2019-10-29 17:48:01 -04:00
Eric Rosenbaum
5b70f28ca5
Merge pull request #3477 from LLK/hotfix/hoc-2-tutorials-2019-v3 
[Master] Update GUI to add 2 HoC tutorials
 2019-10-24 13:10:08 -04:00
Ben Wheeler
49fe86ae3c username step and email step caches ignore api failures 2019-10-23 17:02:57 -04:00
Ben Wheeler
87a73b3fce allow underscores in username 2019-10-23 17:01:58 -04:00
Eric Rosenbaum
c2957b5a56 Update GUI to add 2 HoC tutorials 2019-10-23 16:32:41 -04:00
greenkeeper[bot]
16fed7f783
chore(package): update lockfile package-lock.json 2019-10-23 03:04:00 +00:00
greenkeeper[bot]
2e30817c8b
chore(package): update eslint-plugin-json to version 2.0.1 
Closes #3466
 2019-10-23 03:03:55 +00:00
Ray Schamp
9221b6f6b5
Merge pull request #3472 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191022134757 
Update scratch-gui to the latest version 🚀
 2019-10-22 11:50:38 -04:00
greenkeeper[bot]
562d53e3c6
chore(package): update lockfile package-lock.json 2019-10-22 14:11:06 +00:00
greenkeeper[bot]
de50e43794
chore(package): update scratch-gui to version 0.1.0-prerelease.20191022134757 2019-10-22 14:11:01 +00:00
Karishma Chadha
2d7a560ff0
Merge pull request #3471 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191021202911 
Greenkeeper/scratch gui 0.1.0 prerelease.20191021202911
 2019-10-22 09:59:56 -04:00
greenkeeper[bot]
0786f9f402
chore(package): update lockfile package-lock.json 2019-10-22 05:20:40 +00:00
greenkeeper[bot]
1bcd4f9f34
chore(package): update scratch-gui to version 0.1.0-prerelease.20191021202911 
Closes #3451
 2019-10-22 05:20:34 +00:00
Ray Schamp
6631bbafb2
Merge pull request #3469 from rschamp/fix-dev-server 
Fix dev server by splitting up redirect regex
 2019-10-21 16:28:33 -04:00
Benjamin Wheeler
a85c1c3f78
Merge pull request #3468 from benjiwheeler/country-data-name-fix 
fixed country options to use full country name string as option value
 2019-10-21 16:12:25 -04:00
rschamp
21a8f4d5be Fix dev server by splitting up redirect regex 
This pattern works for building/deploying, but not for running locally. Split it up to deal with what express expects a path to look like.
 2019-10-21 13:51:50 -04:00