scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5082 commits 218 branches 1 tag 463 MiB
Commit graph

5082 commits

This branch
This branch
All branches
Author SHA1 Message Date
picklesrus
d1c7829853 Use indexOf instead of includes because of old browsers. 2019-11-18 14:06:19 -05:00
picklesrus
a111be6db9
Merge pull request #3540 from LLK/hotfix/join-flow 
[Develop] Hotfix/join Merge hotfix that enables join flow back to develop
 2019-11-18 12:44:03 -05:00
picklesrus
9bc6039011
Merge pull request #3544 from picklesrus/join-flow-launch 
Skip the join flow smoke test since it was put in place to make sure …
 2019-11-18 10:21:21 -05:00
picklesrus
7fa103e344 Skip the join flow smoke test since it was put in place to make sure we didn't launch the new join flow by mistake. 2019-11-18 10:20:02 -05:00
picklesrus
25620053c8
Merge pull request #3537 from picklesrus/join-flow-launch 
Roll out new Join Flow.
 2019-11-15 13:26:52 -05:00
picklesrus
1ae7052e50
Merge pull request #3538 from picklesrus/join-welcome-homepage 
Take user to the homepage when finishing the join flow (unless they c…
 2019-11-15 13:18:10 -05:00
picklesrus
6bf2f15ed7
Merge pull request #3536 from picklesrus/join-welcome-homepage 
Take user to the homepage when finishing the join flow (unless they c…
 2019-11-15 13:17:19 -05:00
picklesrus
5b351b6515 Roll out new Join Flow. 2019-11-15 11:28:10 -05:00
picklesrus
378cebe5f4 Take user to the homepage when finishing the join flow (unless they came from the editor). There is replication lag that makes creating a project immediatley a bad experience. We'll fix this in a followup. 2019-11-15 11:23:54 -05:00
picklesrus
f5148c2928
Merge pull request #3523 from LLK/release/2019-11-14 
[DEVELOP] Release 2019-11-14
 2019-11-15 11:08:15 -05:00
chrisgarrity
0bc3df1bd2
Merge pull request #3522 from LLK/release/2019-11-14 
[MASTER] Release 2019-11-14
 2019-11-14 14:02:57 -05:00
chrisgarrity
02197493d4
Merge pull request #3530 from fsih/updateGuiRelease 
Update gui to pull in render revert
 2019-11-14 13:09:13 -05:00
DD Liu
4873884d8a Update gui to pull in render revert 2019-11-14 11:55:11 -05:00
chrisgarrity
6846f8c07f
Merge pull request #3521 from LLK/develop 
Merge develop into release branch
 2019-11-14 07:52:30 -05:00
chrisgarrity
e4c204463e
Merge pull request #3513 from chrisgarrity/download-faq 
Additional ChromeOS/Android FAQs for the download page
 2019-11-13 10:38:07 -05:00
picklesrus
39aa4bca60
Merge pull request #3516 from picklesrus/fix-password-field 
Put the right value in the password field. This got mixed up in #3512.
 2019-11-13 10:35:40 -05:00
picklesrus
a036d5d13c Put the right value in the password field. This got mixed up in #3512. 2019-11-13 10:10:14 -05:00
Chris Garrity
0d93c3faf0 Correct TM capitalization 2019-11-13 09:43:24 -05:00
Karishma Chadha
11c9ec37fe
Merge pull request #3514 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191112225310 
Update scratch-gui to the latest version 🚀
 2019-11-12 20:03:57 -05:00
greenkeeper[bot]
5900dbff99
chore(package): update lockfile package-lock.json 2019-11-13 00:04:44 +00:00
greenkeeper[bot]
7bbd3abb07
chore(package): update scratch-gui to version 0.1.0-prerelease.20191112225310 2019-11-13 00:04:39 +00:00
Chris Garrity
4be41235b5 Additional ChromeOS/Android FAQs for the download page 
Two more questions related to bluetooth on ChromeOS/Android.

They should only be visible if either Chrome or Android is selected, and the `CHROME_APP_RELEASED` feature flag is true.
 2019-11-12 18:17:30 -05:00
Benjamin Wheeler
f239691a24
Merge pull request #3512 from benjiwheeler/join-flow-remove-password-length-limit 
remove truncation of password, passwordConfirm
 2019-11-12 17:10:53 -05:00
Ben Wheeler
48d7209942 remove truncation of password, passwordConfirm 2019-11-12 11:43:23 -05:00
Benjamin Wheeler
be0ae3307b
Merge pull request #3508 from picklesrus/policy-text 
Add privacy policy and link to the email step.
 2019-11-06 13:02:22 -05:00
picklesrus
3ad17a4572 Add privacy policy and link to the email step. 2019-11-06 12:32:55 -05:00
Benjamin Wheeler
9b79fd7eb9
Merge pull request #3507 from picklesrus/scratchr2-checkuser 
Switch to using scratchr2 check_username endpoint instead of api.
 2019-11-06 11:45:06 -05:00
picklesrus
c2004d0f43 Switch to using scratchr2 check_username endpoing instead of api. There are some cleanspeak differences with the api one that need to be resolved. 2019-11-06 11:25:07 -05:00
picklesrus
b845010025
Merge pull request #3503 from picklesrus/join-ga 
Add analytics logging to join flow.
 2019-11-06 11:01:40 -05:00
Benjamin Wheeler
7cea138c46
Merge pull request #3505 from LLK/revert-3495-revert-3468-country-data-name-fix 
Revert "Revert "fixed country options to use full country name string as option value""
 2019-11-06 10:22:31 -05:00
picklesrus
68fc4fe45b Fix merge conflicts :( 2019-11-05 20:01:35 -05:00
picklesrus
c77db39062 Guard calls to componentDidMount with a check for existence. 
Fix tag on username step.
 2019-11-05 19:50:42 -05:00
picklesrus
30967a3056 Set sendAnalytics to be required and send the right props to the error step. Also add a test for the error step. 2019-11-05 19:50:42 -05:00
picklesrus
e4b79c1bd2 Add analytics logging to join flow. Adding page views for each step in the flow. 2019-11-05 19:48:44 -05:00
Ben Wheeler
dd3e1c9f28 update country data test 2019-11-05 18:31:13 -05:00
Ben Wheeler
7b69935d50 in join flow, use country name options 2019-11-05 18:31:05 -05:00
Ben Wheeler
3e7753691f use country code options in regular registration 2019-11-05 18:30:49 -05:00
Ben Wheeler
70d81b85fe made separate functions for country options with name, code 2019-11-05 18:30:20 -05:00
Benjamin Wheeler
2182853dc6
Revert "Revert "fixed country options to use full country name string as option value"" 2019-11-05 18:07:31 -05:00
Benjamin Wheeler
77fca39bbf
Merge pull request #3485 from benjiwheeler/join-flow-cache-ignores-api-failures 
username step and email step caches ignore api failures
 2019-11-05 12:51:33 -05:00
Benjamin Wheeler
bb4e6c087f
Merge pull request #3473 from benjiwheeler/join-flow-particular-server-errors 
Join flow: custom error messages, retry rules for various particular registration error causes
 2019-11-05 12:49:37 -05:00
Ben Wheeler
b2e7a0c9eb revised join flow and registration error tests 2019-11-05 12:12:03 -05:00
Ben Wheeler
0305fff670 added test for error string with no message 2019-11-05 12:12:03 -05:00
Ben Wheeler
b1d71f2a4d revised join flow tests 2019-11-05 12:12:03 -05:00
Ben Wheeler
7b2e75821c revise function names and handling of registration errors 2019-11-05 12:12:03 -05:00
Ben Wheeler
e3d3d97c19 change p tags to divs; set isRequired on canTryAgain 2019-11-05 12:12:03 -05:00
Ben Wheeler
510906e538 removed stray onCaptchaError from bind list 2019-11-05 12:12:03 -05:00
Ben Wheeler
f713298d37 use class instead of id for identifying errorMsg in test 2019-11-05 12:11:04 -05:00
Ben Wheeler
6e83c496c8 revise and add registration error step tests 2019-11-05 12:11:04 -05:00
Ben Wheeler
d265ad3d44 show errorMsg content, not formatted message with errMsg as id 2019-11-05 12:11:03 -05:00