Commit graph

4998 commits

Author SHA1 Message Date
rschamp
bf9ab37eb0 Merge branch 'develop' into greenkeeper/babel-eslint-10.0.3 2019-09-26 13:59:35 -04:00
Paul Kaplan
3295c4a607
Merge pull request #3405 from LLK/release/2019-09-25
[develop] Release/2019 09 25
2019-09-26 11:19:42 -04:00
Paul Kaplan
ff2dad2aff
Merge pull request #3403 from LLK/release/2019-09-25
[master] Release 2019-09-25
2019-09-26 11:18:44 -04:00
Ben Wheeler
88abed34e9 revised fastly tests, added more 2019-09-26 10:59:55 -04:00
Paul Kaplan
8317b35022
Merge pull request #3412 from LLK/develop
Bring in GUI downgrades that needed reverting
2019-09-26 10:45:02 -04:00
Paul Kaplan
3a37cc718e
Merge pull request #3411 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190926141105
Update scratch-gui to the latest version 🚀
2019-09-26 10:44:23 -04:00
Paul Kaplan
db8cc6f80f Make app store links open in a new tab 2019-09-26 10:43:36 -04:00
Paul Kaplan
a3359a487e Update routes files 2019-09-26 10:39:36 -04:00
greenkeeper[bot]
c28b51d75b
chore(package): update lockfile package-lock.json 2019-09-26 14:26:05 +00:00
greenkeeper[bot]
2f9716cea5
chore(package): update scratch-gui to version 0.1.0-prerelease.20190926141105 2019-09-26 14:26:01 +00:00
Paul Kaplan
33ed02a983
Merge pull request #3408 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190926135045
Update scratch-gui to the latest version 🚀
2019-09-26 10:15:37 -04:00
greenkeeper[bot]
e8e6662eba
chore(package): update lockfile package-lock.json 2019-09-26 14:05:08 +00:00
greenkeeper[bot]
66d6524d07
chore(package): update scratch-gui to version 0.1.0-prerelease.20190926135045 2019-09-26 14:05:04 +00:00
Ben Wheeler
6ff1a1c4f1 add navigation test 2019-09-26 09:29:02 -04:00
Paul Kaplan
f81f27aad4
Merge pull request #3407 from LLK/develop
Update 9/25/2019 release with new renderer
2019-09-26 08:40:50 -04:00
Chris Willis-Ford
d0888f9392
Merge pull request #3406 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190925210032
Update scratch-gui to the latest version 🚀
2019-09-25 14:44:16 -07:00
greenkeeper[bot]
68ef754386
chore(package): update lockfile package-lock.json 2019-09-25 21:15:10 +00:00
greenkeeper[bot]
260be874cf
chore(package): update scratch-gui to version 0.1.0-prerelease.20190925210032 2019-09-25 21:15:06 +00:00
Paul Kaplan
fb0b14d620
Merge pull request #3404 from LLK/develop
Update release branch with most recent GUI
2019-09-25 16:11:33 -04:00
Paul Kaplan
9cd8fccd9a
Merge pull request #3402 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190925195008
Update scratch-gui to the latest version 🚀
2019-09-25 16:10:57 -04:00
greenkeeper[bot]
13cdad9662
chore(package): update lockfile package-lock.json 2019-09-25 20:08:22 +00:00
greenkeeper[bot]
915d2d3a57
chore(package): update scratch-gui to version 0.1.0-prerelease.20190925195008 2019-09-25 20:08:18 +00:00
Paul Kaplan
a317c5de0d
Merge pull request #3401 from LLK/develop
Bring in develop to 9/25/19 release branch
2019-09-25 16:05:52 -04:00
Paul Kaplan
a9a175b3cb
Merge pull request #3384 from benjiwheeler/join-flow-gender-strings
gender step uses blank default, lcase values
2019-09-25 16:04:58 -04:00
Paul Kaplan
626d0b5067
Merge pull request #3400 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190925145604
Greenkeeper/scratch gui 0.1.0 prerelease.20190925145604
2019-09-25 16:03:18 -04:00
Paul Kaplan
32165c0d31
Merge pull request #3397 from paulkaplan/chromeos-feature-flag
Download and initial extension pages for forthcoming ChromeOS app launch
2019-09-25 16:00:06 -04:00
greenkeeper[bot]
3d536bae41
chore(package): update lockfile package-lock.json 2019-09-25 15:10:35 +00:00
greenkeeper[bot]
dc5506f246
chore(package): update scratch-gui to version 0.1.0-prerelease.20190925145604
Closes #3380
2019-09-25 15:10:31 +00:00
Ben Wheeler
ccffa35037 change gender string defaults 2019-09-25 09:57:40 -04:00
Benjamin Wheeler
030f88f754
Merge pull request #3393 from benjiwheeler/join-flow-country-fixes
Join flow country placeholder
2019-09-25 09:50:59 -04:00
Ben Wheeler
6fc5705779 revise country placeholder 2019-09-24 20:16:48 -04:00
Benjamin Wheeler
af15188377
Merge pull request #3389 from benjiwheeler/join-flow-navigate-when-finished
Join flow navigate when finished
2019-09-24 20:08:18 -04:00
Ben Wheeler
7e86319a36 wired showCloseButton through new join flow 2019-09-24 18:43:29 -04:00
Ben Wheeler
691faabe28 pass createProjectOnComplete prop through join flow
…so welcome step can display correct completion text
2019-09-24 18:41:24 -04:00
Ben Wheeler
465a87d453 use Scratch3Registration instead of JoinModal in /join 2019-09-24 18:41:24 -04:00
Paul Kaplan
762dc324b8 Update extension pages for new OS picker 2019-09-24 16:25:58 -04:00
Paul Kaplan
5d39e59dd5 Use a feature flag to contain new Scratch Desktop updates 2019-09-24 15:17:11 -04:00
picklesrus
b81a288ce0
Merge pull request #3396 from picklesrus/add-logo-to-join-2
Add Logo to join flow standalone page.
2019-09-24 14:40:59 -04:00
picklesrus
fd131b84c1 Add Logo to join flow standalone page.
Will need some css work, especially for small screens.
2019-09-24 14:21:02 -04:00
picklesrus
036937bbfb
Merge pull request #3357 from picklesrus/join-modal-x-button
One approach to hiding the close button in the modal.
2019-09-24 14:03:19 -04:00
picklesrus
1a58095782 Put values directly in render props. 2019-09-24 13:43:34 -04:00
picklesrus
0d60b64c39 Add a prop to Modal that allows you to hide the close button. Set it to show by default and have the standalone join flow page set it to hidden. 2019-09-24 13:43:34 -04:00
Benjamin Wheeler
c609d99e0e
Merge pull request #3386 from benjiwheeler/join-flow-disable-click-outside
new join flow modal stays open on click outside
2019-09-24 12:10:56 -04:00
Benjamin Wheeler
0e13c2dd48
Merge pull request #3392 from benjiwheeler/join-flow-validation-positioning
Join Flow validation positioning/spacing fixes
2019-09-24 12:10:25 -04:00
Benjamin Wheeler
779520aa2a
Merge pull request #3395 from benjiwheeler/join-flow-responsive-validation
make validations be the same width as inputs…
2019-09-24 12:09:43 -04:00
Benjamin Wheeler
117f0cee91
Merge pull request #3394 from benjiwheeler/join-flow-drag
set modal close icon to draggable false
2019-09-24 09:29:23 -04:00
picklesrus
5f3d6506c0
Merge pull request #3367 from picklesrus/captcha-error-handling
Handle errors of captcha loading by setting error state on JoinFlow.
2019-09-23 23:57:13 -04:00
Ben Wheeler
e901deb398 make validations be the same width as inputs…
…when window is narrow
2019-09-23 16:26:34 -04:00
Ben Wheeler
d4c791adfb set modal close icon to draggable false 2019-09-23 15:16:20 -04:00
Ben Wheeler
865e0a09dd give join-flow validations more spacing from inputs they refer to; unset width of Required message 2019-09-23 13:23:38 -04:00