Commit graph

5073 commits

Author SHA1 Message Date
Eric Rosenbaum
de546a2056
Merge pull request #3370 from LLK/develop
Update release branch to include develop
2019-09-18 17:39:43 -04:00
DD Liu
4e2d1ff50c
Merge pull request #3369 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190918163722
Greenkeeper/scratch gui 0.1.0 prerelease.20190918163722
2019-09-18 14:05:33 -04:00
greenkeeper[bot]
7b2e2e2b17
chore(package): update lockfile package-lock.json 2019-09-18 16:52:44 +00:00
greenkeeper[bot]
38b03eda10
chore(package): update scratch-gui to version 0.1.0-prerelease.20190918163722
Closes #3368
2019-09-18 16:52:40 +00:00
Ray Schamp
d8ce9555c5
Merge pull request #3365 from LLK/hotfix/footer
Remove tagline from site footer
2019-09-18 10:41:30 -04:00
picklesrus
6a45907ded Handle errors of captcha loading by setting error state on JoinFlow. 2019-09-18 10:26:37 -04:00
Benjamin Wheeler
2e7a687547
Merge pull request #3359 from benjiwheeler/join-flow-placeholder-fixes
Join flow placeholder fixes
2019-09-17 21:43:06 -04:00
Benjamin Wheeler
c68cbf028f
Merge pull request #3360 from benjiwheeler/join-flow-spacing-fixes
fix welcome vertical spacing in Welcome step, make it flexible for localization
2019-09-17 21:35:51 -04:00
Karishma Chadha
7c065eb8cc
Merge pull request #3364 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190917180819
Update scratch-gui to the latest version 🚀
2019-09-17 14:32:33 -07:00
greenkeeper[bot]
6e0ef22f00
chore(package): update lockfile package-lock.json 2019-09-17 18:49:23 +00:00
greenkeeper[bot]
8d9b524a53
chore(package): update scratch-gui to version 0.1.0-prerelease.20190917180819 2019-09-17 18:49:18 +00:00
Paul Kaplan
c1d5b23bcf
Merge pull request #3363 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190916225740
Greenkeeper/scratch gui 0.1.0 prerelease.20190916225740
2019-09-17 12:36:51 -04:00
Ben Wheeler
d2bfa13d0a set size of join flow next step spinner 2019-09-16 22:49:28 -04:00
Ben Wheeler
5d1c46d24f slower spinner animation, with bezier timing 2019-09-16 22:41:28 -04:00
Ben Wheeler
628e00f401 when select dropdown is focused, clear any validation errors 2019-09-16 22:34:32 -04:00
Ben Wheeler
8f45c12b89 fix welcome vertical spacing, make it flexible 2019-09-16 21:49:06 -04:00
Ben Wheeler
87e8b18ab1 comment placeholder option 2019-09-16 21:45:45 -04:00
Ben Wheeler
e9605dcca1 disable birthdate placeholders 2019-09-16 21:45:26 -04:00
Ben Wheeler
c034c6c701 make sure correct input css is used for formik input 2019-09-16 21:45:11 -04:00
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