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
4910 commits 218 branches 1 tag 463 MiB
Commit graph

4910 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Wheeler
f693728c1c use consistent quotes in object keys 2019-09-10 16:34:23 -04:00
Ben Wheeler
ce5558f8e2 refactor advance step and register functions 2019-09-10 16:34:23 -04:00
Ben Wheeler
3809d83c36 rename RegistrationError to RegistrationErrorStep 2019-09-10 16:34:23 -04:00
Ben Wheeler
f7a70475e2 added explanatory join flow comments 2019-09-10 16:34:23 -04:00
Ben Wheeler
e44d52b735 added placeholder for g-recaptcha-response 2019-09-10 16:34:23 -04:00
Ben Wheeler
5269cf7330 join flow register user function, registration error component 
* add yesno checkbox
* allow checkbox to be hidden
* add registration error, waiting prop to join flow steps
* use redux to dispatch session refresh
* call register function in join flow
* make join flow modal stay showing even when session is refreshed
 2019-09-10 16:34:23 -04:00
picklesrus
20358fecb0
Merge pull request #3332 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190909235840 
Update scratch-gui to the latest version 🚀
 2019-09-10 11:14:28 -04:00
Benjamin Wheeler
8f11de675d
Merge pull request #3289 from benjiwheeler/join-flow-validate-email-remotely 
Join flow validate email remotely
 2019-09-10 10:05:27 -04:00
greenkeeper[bot]
7e8a160ea9
chore(package): update lockfile package-lock.json 2019-09-10 00:14:26 +00:00
greenkeeper[bot]
c8548b9cf4
chore(package): update scratch-gui to version 0.1.0-prerelease.20190909235840 2019-09-10 00:14:21 +00:00
Benjamin Wheeler
8431403322
Merge pull request #3297 from LLK/revert-3296-revert-3295-join-flow-create-project 
on complete join flow, take user to new project
 2019-09-09 10:32:48 -04:00
Ben Wheeler
46351c116d collapse switch cases 2019-09-05 11:53:47 -04:00
Ben Wheeler
55cb112ee9 use params prop instead of inline query params 2019-09-05 11:53:47 -04:00
Ben Wheeler
ee8cdac748 add tests for local email validation 2019-09-05 11:53:47 -04:00
Ben Wheeler
fa91a57b35 show email validation error until you make a change 2019-09-05 11:53:46 -04:00
Ben Wheeler
d6e5637dbe in email step, use remote validation 2019-09-05 11:53:46 -04:00
Ben Wheeler
020231bb02 add local, remote email validation to validate library 2019-09-05 11:53:46 -04:00
Benjamin Wheeler
f50717d4f9
Merge pull request #3306 from benjiwheeler/join-flow-restyle-next-button 
restyle next button to remove border, add hover color
 2019-09-05 11:28:10 -04:00
DD Liu
10ac6a950d
Merge pull request #3331 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190905003010 
Update scratch-gui to the latest version 🚀
 2019-09-04 21:21:21 -04:00
greenkeeper[bot]
52ecc0300e
chore(package): update lockfile package-lock.json 2019-09-05 00:43:49 +00:00
greenkeeper[bot]
e8a90667ce
chore(package): update scratch-gui to version 0.1.0-prerelease.20190905003010 2019-09-05 00:43:45 +00:00
Karishma Chadha
2d233d51a6
Merge pull request #3327 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190903144730 
Update scratch-gui to the latest version 🚀
 2019-09-04 14:35:42 -04:00
picklesrus
eaeea17d77
Merge pull request #3329 from picklesrus/standalone-take3 
Join flow standalone page
 2019-09-04 14:05:11 -04:00
Ben Wheeler
c92c0af396 more subtle Next hover state 2019-09-04 12:06:59 -04:00
picklesrus
6e5a2292a6 Requiring the Page component (even though we don't use it) allows www to build without running out of memory. 2019-09-04 10:51:13 -04:00
picklesrus
56063ffc7e
Merge pull request #3322 from picklesrus/test-email-step 
Add a unittest for the EmailStep.
 2019-09-04 10:21:51 -04:00
picklesrus
3d58fc4d12 Standardize on using require instead of import. 
Also fix a silly mistaake aand change the way I'm matching the contents 
of formData to be more specific.
 2019-09-03 17:32:31 -04:00
picklesrus
84be22f335 add in unused Page for testing webpack memory. 2019-09-03 16:57:43 -04:00
picklesrus
49ed43e397 Join flow standalone with no extra stuff. 2019-09-03 16:38:38 -04:00
greenkeeper[bot]
fa79a1c6a5
chore(package): update lockfile package-lock.json 2019-09-03 15:00:56 +00:00
greenkeeper[bot]
48bfbb0d89
chore(package): update scratch-gui to version 0.1.0-prerelease.20190903144730 2019-09-03 15:00:52 +00:00
Bryce Taylor
e8a8d6ab94
Merge pull request #3247 from BryceLTaylor/move-integration-tests-to-jest-2 
Move sign in and out integration tests to jest
 2019-08-30 15:31:06 -04:00
picklesrus
c9d7293119 use global.recaptcha instead of global.window.grecaptcha. 2019-08-30 13:42:49 -04:00
DD Liu
cf9b51784e
Merge pull request #3323 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190830160439 
Greenkeeper/scratch gui 0.1.0 prerelease.20190830160439

Pulls in removing antialias from render, which fixes the black dots bug
 2019-08-30 12:30:22 -04:00
greenkeeper[bot]
2e86a72dbf
chore(package): update lockfile package-lock.json 2019-08-30 16:18:10 +00:00
greenkeeper[bot]
8993304e76
chore(package): update scratch-gui to version 0.1.0-prerelease.20190830160439 
Closes #3320
 2019-08-30 16:18:05 +00:00
picklesrus
bd33b166f7 Add a unittest for the EmailStep. 2019-08-29 18:34:07 -04:00
picklesrus
73c353ba2c
Merge pull request #3276 from picklesrus/captcha-join 
Initial work for captcha in new join flow.
 2019-08-29 16:10:50 -04:00
Benjamin Wheeler
6939899038
Merge pull request #3315 from LLK/release/2019-08-29 
[Develop] Release/2019 08 29
 2019-08-29 13:15:49 -04:00
Benjamin Wheeler
98c6d65189
Merge pull request #3316 from LLK/release/2019-08-29 
[Master] Release/2019 08 29
 2019-08-29 13:14:04 -04:00
Benjamin Wheeler
e7c7b81264
Merge pull request #3319 from benjiwheeler/add-missing-string 
Add missing string
 2019-08-29 11:46:26 -04:00
Ben Wheeler
e3cd4e0628 changed string id to correct one 2019-08-29 11:44:08 -04:00
picklesrus
3c716af744 Fix merge conflicts. 2019-08-29 11:33:50 -04:00
picklesrus
c4d6e3dcef space fixes 2019-08-29 11:26:49 -04:00
picklesrus
f5a44c3458 Only load the captcha js if it hasn't been loaded yet. 2019-08-29 11:26:49 -04:00
picklesrus
350f6e6bab Make it so Create Account button is not clickable until captcha js loads. 2019-08-29 11:26:11 -04:00
picklesrus
b8b76f69ba Make sure the "create account" button is clickable until captcha is actually solved. 2019-08-29 11:24:59 -04:00
picklesrus
f83fa4390c - Undo bad merge changing name of validateEmail function 
- Move loading of capcha js to final step
- add in onload and onerror callbacks for catpcha js loading
 2019-08-29 11:24:59 -04:00
picklesrus
d2cb0818c8 Maybe setup captcha site keys properly? 2019-08-29 11:22:55 -04:00
picklesrus
9d4d2f3c67 Put the captcha badge in the bottom right. 2019-08-29 11:22:55 -04:00