Commit graph

5987 commits

Author SHA1 Message Date
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
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