4814 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
Eric Rosenbaum	10a1094116	Merge pull request #3391 from ericrosenbaum/feature/boost-troubleshooting-update ... Update BOOST troubleshooting to suggest updating Scratch Link	2019-09-23 12:21:56 -04:00
Eric Rosenbaum	21e9494e1a	Update BOOST troubleshooting to suggest Link update	2019-09-23 11:45:17 -04:00
Ray Schamp	638b4dca5c	Merge pull request #3388 from LLK/hotfix/zalgo ... [Develop] Contain zalgo text	2019-09-23 10:55:54 -04:00
Ben Wheeler	693c8e11e3	new join flow modal stays open on click outside	2019-09-23 10:36:58 -04:00
Paul Kaplan	e2e9bb8db3	Merge pull request #3375 from LLK/canonical-link ... Include canonical link in project meta tags	2019-09-23 10:21:59 -04:00
rschamp	cc61683fa3	Contain zalgo text	2019-09-23 10:11:05 -04:00
Benjamin Wheeler	ecdfaeeeec	Merge pull request #3361 from benjiwheeler/join-flow-dropdown-validation ... when select dropdown is focused, clear any validation errors	2019-09-23 09:56:19 -04:00
Benjamin Wheeler	c683eb9af9	Merge pull request #3381 from benjiwheeler/join-flow-handle-text-overflow ... Join flow handle text overflow more flexibly	2019-09-23 09:55:55 -04:00
Andrew Sliwinski	d146d868cf	Merge pull request #3385 from apple502j/patch-13 ... Update Code Club Link	2019-09-23 09:30:10 -04:00
apple502j	f00f11ed4c	Update Code Club Link	2019-09-21 08:25:00 +09:00
Ben Wheeler	106ccb34c6	make gender step height more flexible	2019-09-20 17:54:45 -04:00
Ben Wheeler	6bcde6129b	shorter description line height	2019-09-20 17:17:53 -04:00
Ben Wheeler	0e7ed0e0fd	show info button in a way that does not increase line height	2019-09-20 17:17:38 -04:00
Paul Kaplan	bbbe0f8836	Fix linter issues with prop ordering	2019-09-20 13:48:08 -04:00
Paul Kaplan	aa6e85d863	Include canonical link in project meta tags ... This will tell crawlers that this page and all its exact duplicates (/fullscreen, /editor, /embed, etc...) should be considered the same and use the project page as the canonical crawled page. We had an issue before where by not selected a canonical, google was considering all the project pages duplicates :(	2019-09-20 08:59:26 -04:00
picklesrus	8f84051a86	Merge pull request #3373 from picklesrus/captcha-travis-fix ... Hopefully fix captcha site key in prod. I think I made a copy/paste e…	2019-09-19 15:58:05 -04:00
picklesrus	cdd90da423	Rename error function.	2019-09-19 13:40:09 -04:00
picklesrus	b98f8eda72	Hopefully fix captcha site key in prod. I think I made a copy/paste error originally.	2019-09-19 13:12:50 -04:00
Eric Rosenbaum	60bb7199f8	Merge pull request #3372 from LLK/release/2019-09-18 ... [Develop] Release 2019-09-18	2019-09-19 11:51:43 -04:00
Eric Rosenbaum	3dd84a1f29	Merge pull request #3371 from LLK/release/2019-09-18 ... [Master] Release 2019-09-18	2019-09-19 11:49:59 -04:00
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