Commit graph

7165 commits

Author SHA1 Message Date
apple502j
cb3a979144 Don't link when userName is blank, in credits 2019-11-09 00:38:33 +09:00
apple502j
e391f8ce87 Member updates in Credits 2019-11-09 00:33:06 +09: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
Ben Wheeler
2a318af246 revise, add join flow tests 2019-11-05 12:11:03 -05:00
Ben Wheeler
7ec4af6c10 test registration response validation function 2019-11-05 12:11:03 -05:00
Ben Wheeler
469db4dc36 simplify canTryAgain function, reset registrationError on retry 2019-11-05 12:11:03 -05:00
Ben Wheeler
9a97285ac6 rename handleRegistrationError to handleCaptchaError 2019-11-05 12:11:03 -05:00
Ben Wheeler
5cc0bfd782 fix password error regex 2019-11-05 12:09:56 -05:00
Ben Wheeler
a95d17f708 refactor error handling in join flow 2019-11-05 12:09:56 -05:00
Ben Wheeler
c6ae2176da added validation functions for error code validation 2019-11-05 12:09:56 -05:00
Ben Wheeler
ceb3af1c58 improve formatting of welcome, error step text 2019-11-05 12:09:56 -05:00
Ben Wheeler
517d8ff7cc registration error step takes different props 2019-11-05 12:09:56 -05:00
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