scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-22 13:32:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5954 commits 223 branches 1 tag 526 MiB
Commit graph

5954 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benjamin Wheeler
303481b61d
Merge pull request #3352 from benjiwheeler/join-flow-privacy-under 
Join flow revise descriptions and privacy messages
 2019-09-16 21:06:10 -04:00
Ben Wheeler
de4077773a updated email-step test 2019-09-16 20:12:42 -04:00
greenkeeper[bot]
5c6f94e5ba
chore(package): update lockfile package-lock.json 2019-09-16 23:12:33 +00:00
greenkeeper[bot]
20850da2c9
chore(package): update scratch-gui to version 0.1.0-prerelease.20190916225740 
Closes #3346
 2019-09-16 23:12:29 +00:00
Benjamin Wheeler
7e0ce1eb2d
Merge pull request #3351 from benjiwheeler/join-flow-info-format 
move info button down, and give its message a shadow
 2019-09-16 17:14:18 -04:00
Ben Wheeler
e95cd8e3d5 moved validation info box shadow, font weight into info-button-message class 2019-09-16 17:00:32 -04:00
rschamp
c6d39b7509 Remove tagline from site footer 2019-09-16 12:07:43 -04:00
Ben Wheeler
c26d37442d revised email info string 2019-09-16 11:46:44 -04:00
Ben Wheeler
2421d630e5 update email privacy info string 2019-09-15 21:41:27 -04:00
Ben Wheeler
148d1914dd remove unused class 2019-09-15 21:41:05 -04:00
Ben Wheeler
c08c9f8802 country step adjust spacing 2019-09-15 21:38:09 -04:00
Ben Wheeler
4341d364d4 adjust email step vertical spacing, redo its footer 2019-09-15 17:22:25 -04:00
Ben Wheeler
b82787fc6d move info button down, and give its message a shadow 2019-09-15 17:12:57 -04:00
Ben Wheeler
31d8189e54 format each join flow title’s padding differently 2019-09-15 17:11:43 -04:00
Ben Wheeler
ad3940555e remove descriptions from several join flow steps 2019-09-15 17:09:57 -04:00
Ben Wheeler
8bc83fa136 move privacy message to below inputs; format color 2019-09-15 17:08:40 -04:00
Benjamin Wheeler
df2fc74031
Merge pull request #3335 from benjiwheeler/join-flow-reorder 
reorder join flow to put country second
 2019-09-12 16:25:53 -04:00
Ray Schamp
510ea9acbf
Merge pull request #3338 from LLK/release/2019-09-11 
[Develop] Release for 2019-09-11
 2019-09-12 15:20:18 -04:00
Ray Schamp
665b9566ee
Merge pull request #3339 from LLK/release/2019-09-11 
[Master] Release for 2019-09-11
 2019-09-12 15:19:12 -04:00
Ray Schamp
a41e6d7d5c
Merge pull request #3345 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190912180550 
Update scratch-gui to the latest version 🚀
 2019-09-12 14:25:46 -04:00
greenkeeper[bot]
ce62a0da93
chore(package): update lockfile package-lock.json 2019-09-12 18:23:24 +00:00
greenkeeper[bot]
ea5bbee3a9
chore(package): update scratch-gui to version 0.1.0-prerelease.20190912180550 2019-09-12 18:23:20 +00:00
Ray Schamp
18b2ffe934
Merge pull request #3343 from LLK/hotfix/scratch-desktop-3.6.0 
Release Scratch Desktop 3.6.0
 2019-09-12 13:58:30 -04:00
Christopher Willis-Ford
ab35d1ee64 release Scratch Desktop 3.6.0 2019-09-12 09:46:06 -07:00
Ray Schamp
43996c6960
Merge pull request #3341 from benjiwheeler/fix-refresh-session 
put back missing refreshSession() call
 2019-09-12 10:58:24 -04:00
Ben Wheeler
cc578109fa put back missing refreshSession() call 2019-09-12 10:45:48 -04:00
Ray Schamp
d9f570a465
Merge pull request #3337 from LLK/develop 
Merge develop to release branch
 2019-09-11 18:04:35 -04:00
Ray Schamp
be76f323e6
Merge pull request #3336 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190911174033 
Update scratch-gui to the latest version 🚀
 2019-09-11 17:55:01 -04:00
greenkeeper[bot]
d0a71c761b
chore(package): update lockfile package-lock.json 2019-09-11 21:52:18 +00:00
greenkeeper[bot]
e5d6e8ad1d
chore(package): update scratch-gui to version 0.1.0-prerelease.20190911174033 2019-09-11 21:52:14 +00:00
picklesrus
3d7c23a6c4
Merge pull request #3334 from picklesrus/add-back-captcha-token 
Add captcha token to ther request. It was left out of #3291.
 2019-09-11 14:57:53 -04:00
picklesrus
b15dcaa2bc Add captcha token to ther request. It was left out of #3291. 2019-09-11 12:36:56 -04:00
Ben Wheeler
70baf75f5e reorder join flow to put country second 2019-09-11 10:39:46 -04:00
Benjamin Wheeler
290a6ad9ad
Merge pull request #3291 from benjiwheeler/join-flow-register 
join flow register user function, registration error component
 2019-09-11 10:37:49 -04:00
Ben Wheeler
2c2de08ed3 added tests for RegistrationErrorStep vs Progression 2019-09-10 16:37:10 -04:00
Ben Wheeler
7587c68582 include example of failing response 2019-09-10 16:37:10 -04:00
Ben Wheeler
ce3921bec5 update join flow lint exceptions 2019-09-10 16:37:10 -04:00
Ben Wheeler
9ea6cc8d42 use mergeProps to make tests work 2019-09-10 16:37:10 -04:00
Ben Wheeler
45629620b3 package-lock 2019-09-10 16:37:10 -04:00
Ben Wheeler
74dbec2d66 registration error test 2019-09-10 16:34:23 -04:00
Ben Wheeler
aec4d90201 join flow test 2019-09-10 16:34:23 -04:00
Ben Wheeler
a9a1f9a3b1 add redux mock store 2019-09-10 16:34:23 -04:00
Ben Wheeler
1d976c7cdf refactor handleRegistrationResponse 2019-09-10 16:34:23 -04:00
Ben Wheeler
643b4a611b comment preventDefault() 2019-09-10 16:34:23 -04:00
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