3446 commits

Author	SHA1	Message	Date
Ben Wheeler	153c749546	pass onUpdateProjectThumbnail to gui when on project page	2018-12-17 15:36:09 -05:00
picklesrus	158f130fab	Fix some spacing issues on the download page. Adds a more padding under heading titles and makes the text in the older versions section have normal text styling.	2018-12-17 15:03:41 -05:00
Paul Kaplan	c768fab47d	Add flag for dynamic meta tags in the template	2018-12-17 14:55:27 -05:00
chrisgarrity	0d5323ff0c	Remove tutorial for logged in users.	2018-12-17 10:40:48 -05:00
Paul Kaplan	e20f928147	Put project info alerts below navbar	2018-12-14 16:47:54 -05:00
Ray Schamp	8ea6a9782f	Merge pull request #2488 from paulkaplan/change-comment-endpoint ... Change the endpoint for loading single comments	2018-12-14 14:27:28 -05:00
Paul Kaplan	3c7b090a1f	Change the endpoint for loading single comments	2018-12-14 14:03:18 -05:00
Benjamin Wheeler	92ac2786e5	Merge pull request #2474 from picklesrus/download-content-updates ... Download content updates	2018-12-14 12:58:32 -05:00
picklesrus	96bc439ab0	Merge pull request #2478 from picklesrus/educator-links ... Add proper links to cards and guides instead of hard coding them.	2018-12-14 07:14:28 -05:00
chrisgarrity	94a8396713	Make list of languages on www consistent with gui ... start to depend on `scratch-l10n` So far only the supported locales is used. There is one small difference between scratch-l10n and the `languages.json` that was removed. languages was: `{locale: ‘languagename’, …}` key value pairs. l10n exports: `{locale: {name: ‘languagename’},…} That required an additional change to the language chooser.	2018-12-13 16:00:41 -05:00
Benjamin Wheeler	d949edef6f	Merge pull request #2479 from benjiwheeler/fix-misalign ... don't use flex-row class to wrap instructions and credits	2018-12-13 15:48:15 -05:00
picklesrus	3ebdcc11f7	Add icon!	2018-12-13 14:57:21 -05:00
picklesrus	828bf569b8	Add links!	2018-12-13 14:32:38 -05:00
picklesrus	43db3c12e5	Add proper links to cards and guides instead of hard coding them.	2018-12-13 14:10:47 -05:00
Ben Wheeler	2a0a76fba1	don't use flex-row class to wrap instructions and credits	2018-12-13 14:01:27 -05:00
Eric Rosenbaum	e170a9cd4a	Merge pull request #2455 from ericrosenbaum/feature/ideas-page ... Ideas page	2018-12-13 13:58:55 -05:00
picklesrus	c52b083c62	Add correct screenshots. Update lots of text.	2018-12-13 12:57:42 -05:00
Eric Rosenbaum	b434865c45	Update l10n-static ids	2018-12-13 12:35:11 -05:00
Eric Rosenbaum	6d4af6014d	Fix spacing of lower cards and starter sections	2018-12-13 11:52:12 -05:00
Paul Kaplan	cac7c2ff49	Merge pull request #2457 from paulkaplan/scroll-studios ... Fix scrollbars for add-to-studio modal	2018-12-13 11:41:59 -05:00
chrisgarrity	f945897e86	Merge pull request #2470 from chrisgarrity/issue/2318-launch-banner ... Issue/2318 launch banner	2018-12-13 11:41:45 -05:00
chrisgarrity	9cbcd80c76	two more tweaks with the mobile version	2018-12-13 11:40:39 -05:00
picklesrus	8848f11c8d	download button padding	2018-12-13 11:20:32 -05:00
picklesrus	bdf93a15db	Add questions to FAQ and change some messages.	2018-12-13 11:16:59 -05:00
Eric Rosenbaum	7aecb1185d	Fix tile layout	2018-12-13 11:13:15 -05:00
Eric Rosenbaum	9f343fa662	Fix l10n-static ids	2018-12-13 11:01:25 -05:00
Eric Rosenbaum	6ae4bb882b	Update routes for ideas page	2018-12-13 10:49:04 -05:00
Eric Rosenbaum	4ca6570592	Remove or rename unused l10n strings	2018-12-13 10:28:48 -05:00
picklesrus	1ce8ef5b0d	Merge pull request #2449 from picklesrus/download-directly-version ... New Download page	2018-12-13 10:26:23 -05:00
Eric Rosenbaum	646624a07f	Clicking modal img also opens tutorial	2018-12-13 10:22:47 -05:00
Eric Rosenbaum	b993b274ad	Rename function and prop	2018-12-13 10:22:35 -05:00
picklesrus	c76d55de70	css cleanup!	2018-12-13 10:14:24 -05:00
picklesrus	f9bf122850	Merge pull request #2451 from picklesrus/educator-tweaks ... minor educator pages fixes	2018-12-13 09:54:23 -05:00
Ray Schamp	295c1df2ff	Hook up onClickLogo in GUI ... This way it will take us to where we expect on staging and production. Resolves #2296	2018-12-13 09:44:14 -05:00
picklesrus	7276cb3bff	remove leftover line	2018-12-13 09:27:46 -05:00
Paul Kaplan	eb0c98b939	Merge pull request #2464 from paulkaplan/minor-style-fixes ... Minor style fixes to the project page	2018-12-13 08:44:39 -05:00
Benjamin Wheeler	e9001e17c3	Merge pull request #2452 from benjiwheeler/parent-remix-null ... if remix parent or original is unshared, don't crash project page	2018-12-12 21:33:56 -05:00
chrisgarrity	c28b5051ca	revise with images absolute ... Switched the images div to absolute positioning instead of the header container.	2018-12-12 20:42:23 -05:00
Paul Kaplan	bbda370d56	Merge pull request #2445 from paulkaplan/fix-preview-remix-list ... Fix hard-coded /preview/id url for remix list.	2018-12-12 19:39:03 -05:00
Paul Kaplan	ef217b96a1	Use custom meta tag info for project page. ... Note this _will not_ work until the page uses a template that does not include these meta tags. That is because react-helmet does not override any existing info in the head. Thus, this was tested by removing that info from the template and seeing it work, then putting the template back.	2018-12-12 19:30:48 -05:00
Eric Rosenbaum	c1e5b05a0f	update static l10n	2018-12-12 18:36:32 -05:00
Eric Rosenbaum	3cc6794ca1	Merge pull request #2443 from ericrosenbaum/feature/landing-pages-update ... Update extension landing pages	2018-12-12 18:18:53 -05:00
Eric Rosenbaum	521a11e8a3	Remove duplicate l10n strings	2018-12-12 18:04:53 -05:00
Eric Rosenbaum	8fddd3b430	Use template for tutorial URLs	2018-12-12 17:22:17 -05:00
Eric Rosenbaum	ecccc6ac23	Add tutorial links	2018-12-12 17:13:31 -05:00
Eric Rosenbaum	7db60b7631	Align button text	2018-12-12 17:13:23 -05:00
Paul Kaplan	612d08e850	Fix line heights for instructions and comments	2018-12-12 17:04:14 -05:00
Paul Kaplan	fb4f6b6d56	Fix ordering and sizing of loves, extensions and mod info	2018-12-12 17:04:14 -05:00
Paul Kaplan	0af216137b	Give copy-link and other subaction buttons an active state to show click	2018-12-12 17:04:14 -05:00
Paul Kaplan	ac92c65af6	Increase comment box border to prevent popping when focused	2018-12-12 17:04:14 -05:00
Paul Kaplan	70ab7c9c45	Correctly align extension chip images	2018-12-12 17:04:14 -05:00
Paul Kaplan	48ed10b493	Merge pull request #2460 from paulkaplan/conserve-angular-momentum ... Make the remix button spin the correct the direction	2018-12-12 17:03:35 -05:00
Eric Rosenbaum	5829ff29b2	Improve l10n ids	2018-12-12 16:47:39 -05:00
Eric Rosenbaum	600830acc5	Fixing links	2018-12-12 15:57:27 -05:00
Paul Kaplan	16b8a90607	Actually return the mapping of extension info	2018-12-12 15:50:40 -05:00
Paul Kaplan	3aeda2208b	Make the remix button spin the correct the direction	2018-12-12 15:38:00 -05:00
Eric Rosenbaum	bd96aaf81f	l10n cleanup	2018-12-12 15:32:47 -05:00
Eric Rosenbaum	b9e4f51a00	Wording changes	2018-12-12 15:32:38 -05:00
Eric Rosenbaum	666e26b324	Cleanup	2018-12-12 15:21:14 -05:00
Paul Kaplan	1aafd28b0c	Fix scrollbars for add-to-studio modal	2018-12-12 15:14:13 -05:00
Eric Rosenbaum	43e7ec6ebf	css lint and cleanup	2018-12-12 15:05:36 -05:00
Eric Rosenbaum	8a06137284	Remove unused require	2018-12-12 14:25:25 -05:00
chrisgarrity	b9fb557b88	style adjustments	2018-12-12 14:24:07 -05:00
Eric Rosenbaum	20e3812380	First pass at complete layout	2018-12-12 14:17:39 -05:00
picklesrus	dcfb168878	fix lint	2018-12-12 13:45:42 -05:00
Ben Wheeler	634d6c93e0	if remix parent or original is unshared, don't crash project page	2018-12-12 13:24:41 -05:00
picklesrus	36ce0a4f74	minor educator pages fixes	2018-12-12 13:11:32 -05:00
picklesrus	3aaf36e82a	where did the ; go?	2018-12-12 12:41:31 -05:00
picklesrus	a3afa5e482	Merge pull request #2447 from picklesrus/educators ... Educators Page Changes	2018-12-12 12:18:34 -05:00
picklesrus	5c67ef4961	lint	2018-12-12 12:06:44 -05:00
picklesrus	dc24ab193d	Fix up some stuff to better match the spec	2018-12-12 12:01:15 -05:00
chrisgarrity	79449ac547	[WIP] Draft 3.0 Launch banner ... Started transition to ‘featured’ banner that is somewhat reusable. However, middle and smallTop banners are still based on beta. They’re not used for 3.0 launch.	2018-12-12 11:35:41 -05:00
Benjamin Wheeler	a9f9d7ee49	Merge pull request #2428 from benjiwheeler/fix-favorite-love ... make love and favorite icons respond to click immediately, cleanly	2018-12-12 11:25:31 -05:00
Benjamin Wheeler	964459fb17	Merge pull request #2437 from benjiwheeler/placeholder-text-go-away ... Placeholder text go away	2018-12-12 11:24:43 -05:00
picklesrus	5b6bbbdb8a	rename some messages and fix some wording	2018-12-12 10:21:12 -05:00
picklesrus	1d305adc79	Fix some messages.	2018-12-12 09:07:49 -05:00
picklesrus	c3dde0c9eb	version without app store buttons	2018-12-12 08:43:50 -05:00
Andrew Sliwinski	4587736684	Merge pull request #2438 from apple502j/patch-6 ... Unquote userId	2018-12-12 08:26:21 -05:00
picklesrus	e6420b601a	fix lint and remove unused stuff	2018-12-11 17:30:35 -05:00
picklesrus	09afde4396	add more links	2018-12-11 17:23:04 -05:00
Paul Kaplan	a99e8574f5	Merge pull request #2433 from paulkaplan/cloud-data-modal ... Show username and cloud var alerts on projects that use them.	2018-12-11 16:58:11 -05:00
picklesrus	0a39123a3b	more links	2018-12-11 16:53:43 -05:00
picklesrus	4716cb3b32	fix all the things	2018-12-11 16:36:17 -05:00
picklesrus	f3fb63b2e4	fix some stuff	2018-12-11 16:13:34 -05:00
picklesrus	8a8a564996	Beginnings of new educator page	2018-12-11 15:02:43 -05:00
Paul Kaplan	bc99c52ebe	Fix hard-coded /preview/id url for remix list.	2018-12-11 14:46:05 -05:00
Eric Rosenbaum	09a14b811a	Update microbit starter project links	2018-12-11 14:30:57 -05:00
Eric Rosenbaum	6a1cf5b6e9	Update landing getting started instructions	2018-12-11 14:28:08 -05:00
Eric Rosenbaum	13e3c8efdc	Update EV3 starter projects	2018-12-11 14:21:20 -05:00
Eric Rosenbaum	134126c170	Update WeDo starter projects	2018-12-11 13:53:49 -05:00
Ben Wheeler	478259a5d2	placeholder text goes away when instructions, credits clicked	2018-12-11 12:29:31 -05:00
picklesrus	84e3d84ed0	minor stuff	2018-12-11 11:55:42 -05:00
picklesrus	570ba86e75	lint!	2018-12-11 11:44:35 -05:00
picklesrus	60af2fff7c	Fix background color	2018-12-11 11:32:57 -05:00
picklesrus	145770798f	Fix padding around screenshots	2018-12-11 11:31:36 -05:00
picklesrus	6dde3fa231	Move the scratch2 download page to /download/scratch2.	2018-12-11 11:26:53 -05:00
Paul Kaplan	78506f82c7	Hide project info alerts when switching to editor	2018-12-11 11:18:53 -05:00
Paul Kaplan	ace110c59b	Show username and cloud var alerts on projects that use them. ... Only implemented for scratch3 projects	2018-12-11 11:15:00 -05:00
chrisgarrity	bc49f04ed6	Merge pull request #2387 from Kenny2github/delete-cards ... Redirect /info/cards route to /ideas /cc @ericrosenbaum	2018-12-11 10:25:48 -05:00
chrisgarrity	594ce06b5b	Merge pull request #2427 from chrisgarrity/issue/sb2-mod-info ... Add moderator info for sb2 projects	2018-12-11 10:13:45 -05:00
picklesrus	77c311ccea	clean up some css and align some images with text	2018-12-11 10:11:06 -05:00
apple502j	c134a95de3	Translate placeholder	2018-12-11 20:41:49 +09:00
apple502j	fa29c2f2a5	Unquote userId	2018-12-11 18:29:02 +09:00
picklesrus	8bfa310f5a	Fix line spacing and font size along with a message.	2018-12-10 19:34:23 -05:00
picklesrus	47ce5f5919	Crush the pngs	2018-12-10 18:49:03 -05:00
picklesrus	ce854f7b80	more faq. More messages	2018-12-10 18:35:17 -05:00
Eric Rosenbaum	7212436f3b	Update nav from “tips” to “ideas”	2018-12-10 18:17:05 -05:00
picklesrus	d7a678ad8c	Mostly adding messages and removing unnecessary sections	2018-12-10 18:09:36 -05:00
Eric Rosenbaum	68c8decae9	Remove microworlds pages	2018-12-10 18:06:23 -05:00
Eric Rosenbaum	8e6af59635	Initial draft of ideas page	2018-12-10 18:06:07 -05:00
picklesrus	2baf5860ca	Skeleton of downloads page.	2018-12-10 17:33:22 -05:00
Ben Wheeler	d5ec7e17df	add clientFaved and clientLoved, fix number selection	2018-12-10 11:59:32 -05:00
Paul Kaplan	26e821214a	Merge pull request #2431 from paulkaplan/fix-multi-love ... Only try to update fave counts if there are no requests in progress.	2018-12-10 10:56:34 -05:00
Paul Kaplan	901dfeb6ca	Merge pull request #2425 from rschamp/admin-panel-occlusion ... Don't occlude page content with the admin panel	2018-12-10 10:35:59 -05:00
Paul Kaplan	7c5d909a68	Only try to update fave counts if there are no requests in progress.	2018-12-10 10:31:58 -05:00
Paul Kaplan	98b5930b91	Use falsey check for shareDate instead of checking for null. ... It is set to empty string elsewhere when the value does not exist, not null	2018-12-10 09:15:24 -05:00
chrisgarrity	84cfcdee85	Add moderator info for sb2 projects	2018-12-10 08:47:01 -05:00
Benjamin Wheeler	9d5788cc77	Merge pull request #2417 from benjiwheeler/view-count ... pass onGreenFlag to GUI; when called, call API to register project view	2018-12-07 16:52:44 -05:00
Paul Kaplan	d20b16d79c	Merge pull request #2424 from paulkaplan/admin-toggle-comments ... Allow admins to toggle comments	2018-12-07 16:47:01 -05:00
Paul Kaplan	3934c92c7a	Merge pull request #2423 from paulkaplan/add-to-studio-fix ... Show addToStudio for all logged in users on shared projects	2018-12-07 16:46:42 -05:00
Paul Kaplan	551cc0cc13	Remove userOwnsProject because it is unused	2018-12-07 16:09:34 -05:00
Ray Schamp	1979675ebf	Don't occlude page content with the admin panel ... /ht @paulkaplan for the idea to move it below the nav bar.	2018-12-07 13:15:38 -05:00
Paul Kaplan	5d409bcdcf	Allow admins to toggle comments	2018-12-07 12:57:50 -05:00
Paul Kaplan	4522983e20	Show addToStudio for all logged in users on shared projects	2018-12-07 12:51:00 -05:00
Paul Kaplan	2a464c8c21	Remove share button on censored project banner. ... Functionality needs reconsidering.	2018-12-07 12:32:54 -05:00
Ben Wheeler	8dd239ebe5	use authorUsername, not users own username, in hitting logProjectView endpoint; use cookie and tokens in request	2018-12-07 11:00:43 -05:00
Ray Schamp	402799e55f	Fix lint issues ... My linter doesn't catch prop order for some reason. So fix linting so the build works.	2018-12-06 23:15:54 -05:00
Ben Wheeler	5c3300dd68	pass onGreenFlag to GUI; when called, call API to register project view	2018-12-06 23:06:27 -05:00
Ray Schamp	0957173c88	Fix CSS ... I dunno what I was seeing that made me think the width should be 237, but it was incorrect.	2018-12-06 22:48:03 -05:00
Ray Schamp	bc59a63e5e	Only show the admin panel to admins	2018-12-06 17:07:28 -05:00
Ben Wheeler	d235d872e1	show remixed banner to all, not just new scratchers	2018-12-06 16:01:28 -05:00
Ben Wheeler	07568b0f65	remove editor from url when not appropriate	2018-12-06 16:01:28 -05:00
Ben Wheeler	1adca1800a	Banner message showing that user has remixed	2018-12-06 16:01:28 -05:00
Ray Schamp	af32c08971	Merge pull request #2413 from rschamp/mod-panel-phase-3 ... Match scratchr2 admin panel behavior more closely	2018-12-06 15:47:48 -05:00
Ray Schamp	15cc6ca529	Lint	2018-12-06 15:16:22 -05:00
Ray Schamp	0f823531b6	Use local storage to remember the panel state ... This is mirroring from scratchr2	2018-12-06 15:06:55 -05:00
Ray Schamp	d243b5dad7	Allow the iframe to close the parent admin panel	2018-12-06 15:06:21 -05:00
Ray Schamp	e41cd84f09	Fix up admin panel styles ... Match the width more closely and hide scrollbars	2018-12-06 15:05:41 -05:00
Ray Schamp	b7ffa34eec	Open and close admin panel from parent component	2018-12-06 15:05:20 -05:00
chrisgarrity	7ac90afb56	Merge pull request #2406 from chrisgarrity/issue/2388-embed-project ... show embed view	2018-12-06 11:51:33 -05:00
Eric Rosenbaum	b49854300b	Merge pull request #2405 from ericrosenbaum/feature/landing-pg-vids ... Add videos to WeDo and EV3 landing pages	2018-12-06 10:38:19 -05:00
Eric Rosenbaum	c371a3757f	Maybe this is the correct order for CSS properties	2018-12-06 09:43:30 -05:00
Ray Schamp	8e75b8c6cf	Merge pull request #2404 from rschamp/mod-panel-phase-1 ... Admin panel for the project page	2018-12-06 09:33:02 -05:00
picklesrus	cb16831f4f	Merge pull request #2407 from picklesrus/credits-fix ... Fix image path bug and capitalization CBs name.	2018-12-06 08:50:38 -05:00
Paul Kaplan	27e0612ea9	Merge pull request #2401 from paulkaplan/admin-share-banner ... Allow admins to see share banner	2018-12-06 05:33:27 -05:00
picklesrus	11f8105de4	Fix image path bug and capitalization CBs name.	2018-12-05 17:48:58 -05:00
chrisgarrity	1a1122d984	show embed view ... * detect `embed` in the URL * initialize GUI in embed mode if detected * match `embed` in the project page route * add fastly config rules to redirect `/projects/embed/:id` to `/projects/:id/embed`	2018-12-05 17:35:44 -05:00
Eric Rosenbaum	8c6013b243	Add extension video component to wedo and ev3 pages	2018-12-05 17:25:07 -05:00
Ray Schamp	59e0941652	Update iframe to the standalone view	2018-12-05 17:12:18 -05:00
Ray Schamp	096aeb02a0	Lint	2018-12-05 16:09:04 -05:00
Ray Schamp	726a2005bb	Basic project admin panel support ... Just in case we don't do anything else, this "proxies" the old admin panel to the new project page. Requires https://github.com/LLK/scratchr2/pull/5219 to work.	2018-12-05 15:40:18 -05:00
chrisgarrity	8d88ab9b9b	Merge pull request #2389 from chrisgarrity/issue/2306-projects-404 ... Show NotAvailable for invalid URL	2018-12-05 15:01:51 -05:00
Paul Kaplan	b481ae7fad	Allow admins to see share banner	2018-12-05 13:39:18 -05:00
Eric Rosenbaum	d206b44abe	Add video player to wedo page	2018-12-05 10:48:46 -05:00
Paul Kaplan	40795d1cb9	Merge pull request #2394 from paulkaplan/fix-censor-endpoint-shape ... Use message instead of censorMessage for the censor message.	2018-12-05 08:31:33 -05:00
Kenny2github	2916da2822	Remove routeAlias	2018-12-05 10:33:05 +08:00
Benjamin Wheeler	93b04a59f1	Merge pull request #2393 from benjiwheeler/update-project-error ... project page will no longer vanish when project metadata update fails on the backend	2018-12-04 16:38:42 -05:00
Paul Kaplan	ff8bbe79b4	Use message instead of censorMessage for the censor message.	2018-12-04 16:29:46 -05:00
Eric Rosenbaum	824764bc83	Merge pull request #2380 from ericrosenbaum/feature/update-win-version-req ... Update Windows version requirement on hardware extension landing pages	2018-12-04 16:17:17 -05:00
Ben Wheeler	dab1be812e	handle update project metadata errors without setting body	2018-12-04 15:47:21 -05:00
Eric Rosenbaum	3c24bf236b	Adjust header layout	2018-12-04 14:58:16 -05:00
chrisgarrity	880b890dc2	Show NotAvailable for invalid URL ... `/projects` without an id or `editor` should just show a 404.	2018-12-04 10:48:16 -05:00
Paul Kaplan	4a57d36112	Merge pull request #2379 from paulkaplan/refresh-project-data ... Refresh the data related to the project json on switch back from editor	2018-12-04 08:34:45 -05:00
Kenny2github	06a38ca247	Redirect /info/cards route to /ideas	2018-12-04 10:47:14 +08:00
Eric Rosenbaum	e9c2e8f13f	Lint	2018-12-03 17:58:51 -05:00
Eric Rosenbaum	e9d2d9bffa	Add EV3 troubleshooting info about unpairing before reconnecting	2018-12-03 17:57:37 -05:00
chrisgarrity	ef64ccb343	Merge pull request #2374 from chrisgarrity/issue/2364-missing-redirects ... Add missing tutorial shortcuts	2018-12-03 17:40:06 -05:00
Eric Rosenbaum	e2ae6da18f	Add OS version troubleshooting to each landing page	2018-12-03 17:19:06 -05:00
Eric Rosenbaum	421aabadc1	Update version requirements	2018-12-03 15:29:25 -05:00
Paul Kaplan	e49eb3a222	Refresh the data related to the project json on switch back from editor	2018-12-03 15:15:18 -05:00
Karishma Chadha	da4cfb3120	Track isScratcher status and pass hasCloudPermission flag to gui.	2018-12-03 15:02:13 -05:00
Ray Schamp	7d816ac5e7	Merge branch 'develop' into hotfix/fix-adventure-game	2018-12-03 13:28:27 -05:00
Ray Schamp	a0b6fda7a0	Add project data to adventure game tutorial	2018-12-03 12:33:28 -05:00
chrisgarrity	44e64aede8	Add missing tutorial shortcuts ... Add `/bird` and `/makeitfly` as redirects to the tips page. When the Fly tutorial is created /mak	2018-12-03 10:45:03 -05:00
chrisgarrity	e246c6a75c	Merge pull request #2184 from sehgalvibhor/thumbnail-fix ... Thumbnail Fix	2018-12-03 09:53:45 -05:00
Ben Wheeler	655f3365ec	rearranged css for linting	2018-12-03 09:24:35 -05:00
Ben Wheeler	089cdbb06b	revised banner css to be more flexible ... simplified share banner conditionals shorter banner height without button; button has margin instead	2018-12-03 09:24:35 -05:00
apple502j	574f2b0897	HOTFIX: No localhost allowed on real website!	2018-12-03 20:31:49 +09:00
Ben Wheeler	351d38de09	fixed lint errors	2018-12-02 08:35:31 -05:00
Ben Wheeler	e1cc0c390b	tweaked banner css to bring it into line with design spec	2018-12-02 08:35:31 -05:00
Ben Wheeler	a6a5ef7941	long and short shared messages; clarified logic around which banner to show	2018-12-02 08:35:31 -05:00
Ben Wheeler	3af745eede	don't show shared message forever	2018-12-02 08:35:31 -05:00
Ben Wheeler	8d74726080	added congratulations on sharing message for new scratchers	2018-12-02 08:35:31 -05:00
Vibhor Sehgal	f1ccfbee66	Fix for Fashion microworld	2018-12-01 18:34:01 +05:30
Eric Rosenbaum	ab106f7723	Update windows version requirement	2018-11-30 17:21:59 -05:00
chrisgarrity	f6d54e25b9	Merge pull request #2367 from chrisgarrity/feature/mod-info ... Additional project data for Moderators/Admins on the project page	2018-11-30 08:21:15 -05:00
chrisgarrity	e95e5c5f25	Additional project data for Moderators/Admins	2018-11-29 15:43:28 -05:00
Eric Rosenbaum	8260d7bb5d	Add Makey Makey extension chip	2018-11-29 15:28:55 -05:00
Paul Kaplan	443039389a	Merge pull request #2366 from paulkaplan/fix-cloud-switching ... Pass canSave to both editor and player view to allow cloud reconnecting.	2018-11-29 11:26:52 -05:00
Paul Kaplan	c777ccffc8	Pass canSave to both editor and player view to allow cloud reconnecting. ... The canSave prop was being passed to the editor view, but needs to also be passed to the player view because it is used to decide whether to connect the viewer to cloud variables. People cannot connect to cloud variables after entering editor mode on anothers project.	2018-11-29 10:53:03 -05:00
Paul Kaplan	172915f9d9	Add project thumbnail update action	2018-11-29 09:55:45 -05:00
Benjamin Wheeler	84dc08b5cc	Merge pull request #2314 from chen-robert/gh2263-negative-loves ... Fix gh-2263: Negative loves	2018-11-28 19:25:01 -08:00
chrisgarrity	edfee0713a	show intro for logged out users ... Switch `&&` to `||`. Current date before AND after HoC is never true.	2018-11-28 12:23:47 -05:00
chrisgarrity	bef5e615f7	Merge pull request #2186 from apple502j/add-parents ... Migrate Parents Page	2018-11-28 09:23:01 -05:00
chrisgarrity	5cff3f9ae4	Revised unsupported browser info ... - Header reads ‘This browser is not supported’ - FAQ link goes to general Scratch FAQ.	2018-11-27 12:51:49 -05:00
Paul Kaplan	99ac59d2cb	Merge pull request #2350 from paulkaplan/fix-comments-remixing ... Remove comments when remixing, they do not exist on the new project	2018-11-26 16:32:12 -05:00
Paul Kaplan	1c4c5895af	Remove comments when remixing, they do not exist on the new project	2018-11-26 11:21:14 -05:00
Paul Kaplan	f025407818	Use a more popular clipboard manager	2018-11-26 10:22:55 -05:00
Paul Kaplan	1c09bdf7b0	Implement the copy link functionality ... This does not implement any further design, like showing a confirmation popover, but just makes sure the button works. I used a very slim package to implement copy that does not include any fallbacks for IE, since we do not need to support that here.	2018-11-26 10:22:34 -05:00
Paul Kaplan	d31cbe58e2	Merge pull request #2344 from paulkaplan/fix-comment-actions ... Show comment actions on hover and fix report translation	2018-11-26 10:15:16 -05:00
chrisgarrity	decb250dd5	Initial version	2018-11-26 09:43:05 -05:00
Paul Kaplan	1be21bdb7e	Merge pull request #2345 from paulkaplan/fix-placeholder-alignment ... Fix alignment of the placeholder and text in project instructions & note	2018-11-26 09:25:44 -05:00
Paul Kaplan	3fb5dd769a	Merge pull request #2340 from paulkaplan/visibility-info ... Show details about why a project is not public	2018-11-26 09:18:38 -05:00
Paul Kaplan	d5c3ae773f	Fix lint	2018-11-21 13:00:53 -05:00
Paul Kaplan	847d0c3844	Fix alignment of the placeholder and text in project instructions & note	2018-11-21 12:12:51 -05:00
Paul Kaplan	a8cf28958c	Fix incorrect translation string in comment report	2018-11-21 11:47:12 -05:00
Paul Kaplan	933b805044	Make comment actions (report, delete, restore) only visible on hover	2018-11-21 11:46:54 -05:00
chrisgarrity	345b111371	Merge pull request #2333 from chrisgarrity/feature/2270-shortcut-redirect ... Tutorial shortcut redirects	2018-11-21 11:31:00 -05:00
Paul Kaplan	2ed74a2682	Show deleted banner if both deleted and censored. ... This is because the user can take an action to remove the trash status, but not the censored status.	2018-11-21 10:36:27 -05:00
Paul Kaplan	0b8c13fb40	Use the project author username in visibility request instead of viewer ... /ht @chrisgarrity	2018-11-21 10:31:10 -05:00
Ray Schamp	df3d18e649	Revert "Revert "use cdn.scratch.ly in staging""	2018-11-21 10:27:13 -05:00
Ray Schamp	45415944c1	Revert "use cdn.scratch.ly in staging"	2018-11-21 10:07:57 -05:00
Benjamin Wheeler	95fb947c08	Merge pull request #2325 from benjiwheeler/hash-redirect ... redirect hash urls to url pathnames	2018-11-20 16:06:46 -05:00
Paul Kaplan	ac6a870a3f	Merge pull request #2334 from chrisgarrity/feature/rename-preview ... Rename /preview to /projects	2018-11-20 15:34:03 -05:00
Ben Wheeler	79ae4dd511	let pathname end without a slash	2018-11-20 15:03:57 -05:00
Eric Rosenbaum	bfc36e25f9	Merge pull request #2329 from ericrosenbaum/feature/get-link-from-app-stores ... App store badges for Link download	2018-11-20 13:17:18 -05:00
Paul Kaplan	c18ccba646	Fix scss linting	2018-11-20 12:16:10 -05:00
Paul Kaplan	122160726d	Show details about why a project is not public ... Follow up the project info request with a request to the visibility endpoint to find out if the project is trashed or censored. The project just not being published is handled by the existing code. This PR generalizes the ShareBanner to a more generic "Banner" that is then filled with the relevant content.	2018-11-20 12:01:52 -05:00
Paul Kaplan	af301ba450	Merge pull request #2336 from paulkaplan/exit-single-comment-view ... Allow user to exit "single comment mode" and see all comments.	2018-11-20 08:13:42 -05:00
Ben Wheeler	7ee463509c	use cdn.scratch.ly in staging	2018-11-19 17:07:48 -05:00
chrisgarrity	c4403c5d8d	Replace uses of /preview in URLs	2018-11-19 17:02:09 -05:00
Eric Rosenbaum	f77357daf2	Update mac and windows app store links	2018-11-19 15:59:37 -05:00
Paul Kaplan	3fe1242aa6	Allow user to exit "single comment mode" and see all comments. ... This visually appears like a "load more comments" button for now, but has the impact of unsetting the #comments-<id> hash in the url and resetting the comment state, showing all the comments (in paginated view)	2018-11-19 15:47:47 -05:00
chrisgarrity	2065090bb8	Merge pull request #2262 from sjgllghr/issue/gh2212-migrate-scratch-1.4 ... Fix gh-2212: Migrate Scratch 1.4 download page	2018-11-19 15:27:49 -05:00
Eric Rosenbaum	8efb6045ee	Lint	2018-11-19 15:22:18 -05:00
chrisgarrity	494bc3e48d	Rename /preview to /projects	2018-11-19 14:59:56 -05:00
chrisgarrity	dd620e1187	Tutorial shortcut redirects ... Duplicate tutorial shortcuts previously handled by scratchr2. Left out routeAlias as that is no longer needed.	2018-11-19 14:18:22 -05:00
Paul Kaplan	7cfc3ed846	Show projectNotAvailable view in editor mode also	2018-11-19 14:16:56 -05:00
Ben Wheeler	50a2072794	removed stale comment	2018-11-19 13:58:02 -05:00
Eric Rosenbaum	9ee3c9eb6c	App store badges for Link download	2018-11-19 13:51:29 -05:00
Ben Wheeler	1c8a124f44	switched button border radius back to 4px	2018-11-19 13:22:27 -05:00
chrisgarrity	911005f5ad	Merge branch 'master' into hotfix/hoc-banner	2018-11-19 12:03:02 -05:00
chrisgarrity	a06d8ec11e	Add more bottom padding to activities button ... Also restore hocbanner messages to l10n.json.	2018-11-19 11:11:48 -05:00
Ben Wheeler	cd030e0895	rearranged css to get tests working	2018-11-18 11:19:21 -05:00
Ben Wheeler	d9fdb67543	redirect hash urls to url pathnames	2018-11-17 23:59:41 -05:00
Ben Wheeler	30ed29a39a	enable remix button; format remix, see inside button css	2018-11-17 15:13:58 -05:00
chrisgarrity	f2f4a6ac7c	2018 Hour of Code Banners ... * add Top and Middle HoC banners * banners share styles * add new assets for banners * update presentation to check date to determine whether to show the HoC banners.	2018-11-16 14:02:56 -05:00
Paul Kaplan	16e3fa100b	Merge pull request #2313 from paulkaplan/fix-missing-extensions ... Add missing extensions and images	2018-11-14 20:31:26 -05:00
Robert Chen	9b7097a772	Resolved issue #2263	2018-11-14 17:06:33 -08:00
chrisgarrity	d2500e88c7	Merge pull request #2302 from chrisgarrity/issue/2281-gettingstarted ... Issue/2281 gettingstarted	2018-11-14 17:11:46 -05:00
chrisgarrity	7e9403d049	Merge pull request #2291 from chrisgarrity/feature/2280-hoc-2018 ... 2018 Hour of Code Banners	2018-11-14 17:10:35 -05:00
chrisgarrity	d24a76e896	Merge pull request #2303 from chrisgarrity/issue/fix-wedolegacy-translations ... Fix wedo-legacy translations	2018-11-14 17:08:42 -05:00
S. Gallagher	e4be2bd87c	make suggested changes	2018-11-14 13:36:21 -08:00
picklesrus	6c7a56dde8	Merge pull request #2220 from picklesrus/credits-stuff ... Redo the credits page.	2018-11-14 16:32:43 -05:00
Paul Kaplan	194dc90688	Add missing extensions and images	2018-11-14 15:39:40 -05:00
Paul Kaplan	476578cfa8	Merge pull request #2304 from paulkaplan/update-share-endpoint ... Move sharing to special endpoint.	2018-11-14 14:15:45 -05:00
Paul Kaplan	d36b71dcb3	Merge branch 'develop' into hide-backpack-logged-out	2018-11-14 14:12:51 -05:00
Eric Rosenbaum	9f640ffdd6	Merge pull request #2307 from ericrosenbaum/feature/update-microbit-hex-1.1.0 ... Update microbit hex file version	2018-11-14 13:28:54 -05:00
Benjamin Wheeler	6d09f2dada	Merge pull request #2289 from benjiwheeler/show-creator ... Pass authorId and authorUsername to gui	2018-11-14 06:43:29 -05:00
Ben Wheeler	4bb5e641bb	added comment about falseness of authorId, authorUsername	2018-11-14 06:42:57 -05:00
Eric Rosenbaum	1840c9ec19	Update microbit hex file version	2018-11-13 15:43:14 -05:00
Ben Wheeler	8e967737e5	use production or staging hosts for static assets url	2018-11-13 15:32:59 -05:00
picklesrus	4a66cc2e59	Fix code review comments. Got rid of a bunch of uncessary stuff.	2018-11-13 14:14:24 -05:00
Paul Kaplan	f8d598549d	Update instead of replacing project info to match API. ... The API endpoint will return just the updated slice of the projectInfo, so just update the projectInfo instead of replacing.	2018-11-13 12:23:05 -05:00
Paul Kaplan	3a03f10aff	Move sharing to special endpoint. ... This makes a couple of assumptions about the shape of the endpoint: - Route is /proxy/projects/:id/share. - Returns the full (updated) project info on success, just like the project update endpoint does. I reviewed these with colby since this is frontrunning the actual API, but I can update once the API is finalized.	2018-11-13 08:49:37 -05:00
chrisgarrity	48593869f9	Fix wedo-legacy translations ... The translation generatation script uses the view name from the routes file when generating the translations files. So the route `name:` and `view:` must match. Symptom: when generating translations there were warnings that there were no translations for `wedo-legacy`.	2018-11-12 14:07:44 -05:00
chrisgarrity	13b3e57381	open getting started tutorial for logged out users ... - `create` on the navbar opens the getting started tutorial if the user is not logged in - replaced any other use of `tip_bar=getStarted` with `tutorial=getStarted` (with the exception of Tips page) - did not replace other uses of `tip_bar=home` as those should probably go to the new tips/ideas page.	2018-11-12 12:58:59 -05:00
chrisgarrity	062c074407	allow query parameters on the preview route ... Preview needs to be able to handle query parameters for tutorials.	2018-11-12 10:16:22 -05:00
Ray Schamp	25f7f5b273	Merge pull request #2301 from MasterOfTheTiger/issue/gh2298-job-listing ... Removes Full Stack Job Listing	2018-11-11 18:26:16 +00:00
MasterOfTheTiger	4677feb371	State that no jobs are currently available	2018-11-11 08:58:55 -08:00
Ben Wheeler	c965fd15f9	generate author thumbnail and pass to gui	2018-11-10 02:07:48 -05:00
MasterOfTheTiger	12aeba90ed	Use https for ScratchJR links	2018-11-09 09:17:04 -08:00
Paul Kaplan	9ed3ecc7bb	Split up the backpack options and tie visibility to isLoggedIn	2018-11-08 13:19:12 -05:00
Paul Kaplan	c62470150b	Merge pull request #2290 from paulkaplan/project-not-available ... Add "project not available" view for when project body cannot be loaded	2018-11-08 12:58:37 -05:00
Paul Kaplan	ae05f07e07	Fix project not available flag setting and catch 404 responses	2018-11-08 08:43:36 -05:00
chrisgarrity	a156c404e1	2018 Hour of Code Banners ... * add Top and Middle HoC banners * banners share styles * add new assets for banners * update presentation to check date to determine whether to show the HoC banners.	2018-11-07 17:14:28 -05:00
Paul Kaplan	315c8b78fc	Add "project not available" view for when project body cannot be loaded ... This happens when the project id does not exist, or is not visible to the given user.	2018-11-07 16:32:12 -05:00
Ben Wheeler	464d5f7c2d	Pass authorId and authorUsername to gui	2018-11-07 12:59:16 -05:00
Ray Schamp	e2795ec4d6	Merge pull request #2284 from rschamp/bugfix/offline-homepage ... Avoid displaying an error when /news returns a 500	2018-11-07 17:57:10 +00:00
Paul Kaplan	80028bfea5	Merge pull request #2288 from paulkaplan/ip-muted-comments ... Add IP Mute message to project comment errors	2018-11-07 11:47:44 -05:00
Paul Kaplan	4105e88cfd	Add IP Mute message to project comment errors	2018-11-07 10:58:07 -05:00
chrisgarrity	b5d551b705	Add new strings in preparation for Hour of Code	2018-11-06 16:15:54 -05:00
Ray Schamp	037078d623	Avoid displaying an error when /news returns a 500 ... This situation probably occurs most frequently when running dev servers while offline, but could also happen if the API is having issues. 500 responses from the API should not take down the homepage so drastically, and are also sometimes unavoidable while working offline.	2018-11-06 12:25:04 +00:00
Andrew Sliwinski	7721418165	Merge pull request #2269 from DeleteThisAcount/patch-1 ... Fix typo on micro:bit landing page	2018-11-05 13:00:19 -05:00
S. Gallagher	24a345cc21	stop using FormattedHTMLMessage	2018-11-04 07:57:48 -08:00
Ben Wheeler	7aae4219ec	make share banner appear only if user has the power to share this project	2018-11-01 14:19:28 -04:00
S. Gallagher	3ba4e551d4	migrate scratch 1.4 download page	2018-10-31 16:20:35 -07:00
DeleteThisAcount	ab9004f901	fix small typo	2018-10-31 17:52:16 +01:00
Benjamin Wheeler	e14cb0f8f2	Merge pull request #2250 from benjiwheeler/share-button-icon ... removed erroneous share button icon	2018-10-30 22:29:19 -04:00
Karishma Chadha	950f13a35a	Merge pull request #2245 from kchadha/cloudhost ... Configure Cloud Host	2018-10-30 14:26:17 -04:00
Ben Wheeler	78f059e8b4	removed erroneous share button icon	2018-10-29 17:30:53 -04:00
picklesrus	db2453bc69	Replace FormattedHtmlMessage with FormattedMessage	2018-10-29 10:02:43 -04:00
chrisgarrity	b629d28a6d	Merge pull request #2242 from chrisgarrity/issue/2030-gui-layers ... remove obsolete code	2018-10-29 09:59:50 -04:00
Benjamin Wheeler	183bdccdae	Merge pull request #2223 from sehgalvibhor/develop ... Responsive about page!	2018-10-29 06:59:56 -04:00
Karishma Chadha	e771e91164	Configure cloud host and pass it as a prop to the gui.	2018-10-29 01:05:36 -04:00
Vibhor Sehgal	93d847271d	Travis Fix	2018-10-29 08:08:13 +05:30
chrisgarrity	9dd13dac74	remove obsolete code ... Preview doesn’t need to set a z-index (the first version was trying to overlay gui on top of the project view).	2018-10-26 15:11:46 -04:00
Paul Kaplan	f2490baa16	Merge pull request #2239 from paulkaplan/fix-comments-id ... Use #comments-id instead of #comment-id for fetching single comments	2018-10-25 16:56:27 -04:00
Benjamin Wheeler	cff5733833	Merge pull request #2234 from benjiwheeler/isshared ... pass isShared to gui	2018-10-25 15:57:07 -04:00
Benjamin Wheeler	8653e358b1	Merge pull request #2232 from benjiwheeler/dont-get-extensions ... moved getExtensions out of constructor, and out of projectInfo response	2018-10-25 15:56:39 -04:00
Paul Kaplan	32f0999bb0	Use #comments-id instead of #comment-id for fetching single comments	2018-10-25 15:53:34 -04:00
Paul Kaplan	e563254c8f	Merge pull request #2231 from paulkaplan/comment-linking ... Decorate comment text to add @username links and scratch-domain links	2018-10-25 15:18:56 -04:00
Paul Kaplan	f133f29353	Fix form styling for project edit fields	2018-10-25 11:38:27 -04:00
Paul Kaplan	209c8da9f7	Keep each input in its own formsy wrapper to improve performance ... Having Formsy around the entire page was causing re-renders to happen when you typed into an input, when really just that component needed to re-render.	2018-10-25 10:27:54 -04:00
Vibhor Sehgal	04adcb5063	Retaining Flex Layout	2018-10-25 09:53:28 +08:00
Ben Wheeler	c4de63d93a	pass isShared to gui	2018-10-24 18:13:57 -04:00
Paul Kaplan	dbca5a4044	Merge pull request #2226 from LLK/i10n-preview ... Extract strings for localizing the preview page	2018-10-24 16:00:40 -04:00
Paul Kaplan	fa7c2d5b09	Merge pull request #2230 from paulkaplan/single-comment-mode ... Showing specific comment by url hash on preview	2018-10-24 15:41:14 -04:00
Ben Wheeler	dd07e46c6a	moved getExtensions out of constructor, and out of projectInfo response	2018-10-24 15:38:18 -04:00
Benjamin Wheeler	95dc611d77	Merge pull request #2222 from benjiwheeler/copy-remix ... Set capability flags to be passed to GUI, to support remix and save as copy	2018-10-24 13:24:40 -04:00
Paul Kaplan	2c5efbda50	Fix scss linting	2018-10-24 11:45:17 -04:00
Paul Kaplan	5158907c5b	Merge pull request #2229 from paulkaplan/sudo-fix-load-more ... Do not rely on total comment number for load more functionality	2018-10-24 11:42:00 -04:00
Paul Kaplan	9066686c2b	Decorate comment text to add @username links and scratch-domain links	2018-10-24 11:25:32 -04:00
Paul Kaplan	faf3f49c50	Fix proptypes	2018-10-24 10:43:21 -04:00
Paul Kaplan	520018ee50	View single thread of comments by URL hash	2018-10-24 10:29:33 -04:00
Paul Kaplan	4d8256e985	Update all preview... l10n strings to project...	2018-10-24 09:35:30 -04:00
Paul Kaplan	ae626d5244	Do not rely on total comment number for load more functionality ... Show the load more comments button any time the last comment page was filled to the requested limit. As noted in the comment, this heuristic will be wrong at most 5% of the time but the failure mode (showing load more which, when clicked doesn't load any more, just goes away) is very mild, and for the overwhelming majority of project views that happen on projects with many, many comments, this is very unlikely to ever be noticed. It obviously isn't a perfect solution, but I cannot think of another that does not need the server to do another query to find out the total number of visible comments, or to find out if there are more comments after the requested offset+limit.	2018-10-24 09:18:45 -04:00
Paul Kaplan	efb1a380da	Update the comment routes	2018-10-24 08:55:36 -04:00
Ben Wheeler	3d964911a1	renamed canSaveAsCopy to canCreateCopy	2018-10-23 17:42:55 -04:00
Ben Wheeler	d713249bee	changed the meaning of canCreateNew to true creation	2018-10-23 17:42:55 -04:00
Ben Wheeler	e03f83466e	better logic around canSave when project is new	2018-10-23 17:42:55 -04:00
Ben Wheeler	ed7b6541e9	set canRemix and canSaveAsCopy	2018-10-23 17:42:55 -04:00
Paul Kaplan	f4887008a5	Extract strings for localizing the preview page	2018-10-23 11:38:34 -04:00
Vibhor Sehgal	733c3d1bff	Responsive about page.	2018-10-23 11:29:44 +08:00
chrisgarrity	3fcc13a8cd	Integrate www-gui localization ... * Initialize `locales` in redux using methods exported by GUI. * pass GUI method to set the `scratchlanguage` cookie NOTE: It does not reload the page, so switching back to the project page will not reflect language changes made in gui until the next page reload. Reloading the page will lose project state so we don’t want to do that.	2018-10-22 17:38:35 -04:00
Paul Kaplan	c289ce72d1	Use parent_id and commentee_id the right way when posting comments. ... The parent_id is the top-level-parent, the commentee_id is the user to whom the comment is directed , the one that is mentioned in @ reply.	2018-10-22 14:35:42 -04:00
picklesrus	d4a050a1c0	Remove duplicate message	2018-10-22 08:57:22 -04:00
picklesrus	ad564b4ea4	Redo the credits page. ... See https://github.com/LLK/scratch-www/issues/2093 for details.	2018-10-21 14:57:12 -04:00
Benjamin Wheeler	a6409bbcce	Pass to and receive from GUI info about project creation lifecycle; handle url changes (#2197) ... * add canSaveNew prop to pass to GUI * pass to and receive from GUI info about project lifecycle * reset project data or fetch new project data depending on updates received from gui * removed canSaveNew * projectId always a string * moved handleUpdateProjectId calls that fetch or set project metadata into componentDidUpdate * changed page history object * removed comments * two small fixes to deal with edge cases * cleaning up getExtensions	2018-10-19 16:02:59 -04:00
Paul Kaplan	8acbf05b1a	Merge pull request #2211 from paulkaplan/fix-studio-modal ... Connect the consolidated studio data directly	2018-10-19 10:44:32 -04:00
chrisgarrity	b0a5f7feff	Merge pull request #2183 from sehgalvibhor/character-fix ... Japanese Character Fix	2018-10-19 09:12:53 -04:00
Paul Kaplan	f9f662a3f3	Merge pull request #2206 from paulkaplan/staff-comments ... Add * to comments from staff on preview	2018-10-19 08:55:41 -04:00
apple502j	9cb2c34a1d	Merge branch 'develop' into add-parents	2018-10-19 21:14:57 +09:00
apple502j	43238c4bca	FAQ link fix	2018-10-19 21:13:27 +09:00
Paul Kaplan	35abd285df	Connect the consolidated studio data directly ... To the modal to prevent constantly updating. Also only render the modals if they are visible	2018-10-18 16:45:24 -04:00
Paul Kaplan	f3b9826fd5	Merge pull request #2208 from paulkaplan/fix-load-more ... Use top level + replies count to control "Load More" comments button	2018-10-18 13:19:10 -04:00
Paul Kaplan	4f6f7502ae	Use scratchteam instead of is_staff	2018-10-18 13:09:43 -04:00
Paul Kaplan	61947f2390	Use scratchteam instead of is_staff	2018-10-18 13:09:08 -04:00
Paul Kaplan	066e5ff141	Use top level + replies count to control "Load More" comments button ... This fixes an issue where a project with one top-level comment and one reply would should the "Load more" button at the bottom, even though there were no more to load	2018-10-18 11:42:10 -04:00
Paul Kaplan	1d3c3ff431	Use EmojiText component to allow emoji display when API includes them	2018-10-18 10:18:00 -04:00
Paul Kaplan	c257379846	Add * to comments from staff on preview ... This requires the API to include the `is_staff` flag, but it will not change functionality if it is not there, everyone would be considered not staff, which is the current behavior.	2018-10-18 10:14:42 -04:00
Paul Kaplan	d982d2d723	Show the username of the person being replied to in a comment on preview	2018-10-18 10:11:51 -04:00
Paul Kaplan	312a9e2bff	Restrict reporting comments to logged in users	2018-10-17 13:19:46 -04:00
Paul Kaplan	7b514344fa	Allow admins access to comment delete	2018-10-17 13:16:41 -04:00
Paul Kaplan	242f01118b	Add missing status message for comments	2018-10-17 11:56:43 -04:00
Ray Schamp	cd0fb08045	Change conditional rendering to be consistent	2018-10-17 11:21:52 -04:00
Paul Kaplan	2ac90315ea	Use can prefix instead of undefined callback	2018-10-16 15:09:10 -04:00
Paul Kaplan	1965a1223d	Fix sass lint	2018-10-16 15:08:01 -04:00
Paul Kaplan	7772e197c7	Make comment deleting and restoring correctly update replies	2018-10-16 15:08:01 -04:00
Paul Kaplan	592c0e5703	Add restore functionality to comments for admins	2018-10-16 15:08:00 -04:00
Paul Kaplan	b0ac4018ee	Use admin routes to include all comments when loading page	2018-10-16 15:08:00 -04:00
Paul Kaplan	b7b7b079b9	Combine comment reported and deleted flags into visibility string ... To prepare for server including visibility	2018-10-16 15:08:00 -04:00
sjgllghr	6d8235c7e8	Fix gh-2156: Use variables for media queries for consistency (#2182) ... * use variables for media queries * add medium-and-intermediate media query variable	2018-10-16 13:28:41 -04:00
Paul Kaplan	effbfbeaff	Merge pull request #2196 from paulkaplan/share-banner ... Make share banner work on preview	2018-10-16 13:21:16 -04:00
Paul Kaplan	9ce79deac6	Control visibility externally and fix css	2018-10-16 13:02:22 -04:00
Paul Kaplan	21a7f1227e	Make share banner actually share projects	2018-10-16 11:38:26 -04:00
Benjamin Wheeler	4124e26588	set explicit capabilities like “can____” for GUI and project page (#2187) ... * set explicit capabilities like “can____” for GUI and project page * set canShare to proper value instead of hardcoding it * don't tell gui canReport	2018-10-16 10:49:35 -04:00
Paul Kaplan	29a6a27f46	Merge pull request #2173 from paulkaplan/comment-i10n ... Localize all the comment related strings	2018-10-16 10:04:06 -04:00
Paul Kaplan	bb71bd706a	Merge pull request #2190 from paulkaplan/move-report-to-api ... Use the proper API route for reporting projects	2018-10-16 10:03:43 -04:00
Paul Kaplan	95d088f56a	Merge pull request #2191 from paulkaplan/fix-delete-comment ... Fix comment delete endpoint	2018-10-16 10:03:26 -04:00
Benjamin Wheeler	9106a14340	made account menu have min-width, changed max-width to rem from px (#2181)	2018-10-15 16:00:47 -04:00
Paul Kaplan	cef36682fd	Fix comment delete endpoint	2018-10-15 15:24:20 -04:00
Paul Kaplan	85f13935b3	Use the proper API route for reporting projects	2018-10-15 11:17:40 -04:00
Robert Chen	24d07f6139	Fix gh-2160: Search with % (#2161) ... * Fixed turning '+' into ' ' * Fixed issue 2160 * Added space before '{'	2018-10-15 09:36:05 -04:00
apple502j	ec1d46eef6	Parents Page fix	2018-10-15 19:51:57 +09:00
apple502j	4845b5af3e	l10n	2018-10-15 19:51:46 +09:00
Vibhor Sehgal	1ae8180aa4	Fix Select Menu in Messages Section (#2179) ... * Fix width for Select in Message Section * Removed extra CSS property * Removed Margin property; Not required * Fix for the CI test	2018-10-15 06:48:29 -04:00
apple502j	972ae72a61	Parents Page SCSS	2018-10-15 18:18:04 +09:00
apple502j	1481bba310	Parents Page!	2018-10-15 18:17:43 +09:00
apple502j	7bf2c6d7e3	l10n	2018-10-15 18:17:31 +09:00
apple502j	38c85f559d	Routes config	2018-10-15 18:16:17 +09:00
Vibhor Sehgal	56f7cf06ea	Thumbnail Fix	2018-10-14 14:54:11 +05:30
Vibhor Sehgal	d9018185e7	Japanese Character Fix	2018-10-14 13:28:48 +05:30
Paul Kaplan	231e9c6d89	Internationalize strings in compose-comment	2018-10-12 09:16:27 -04:00
Paul Kaplan	9e1741f883	Merge pull request #2174 from paulkaplan/fix-comment-replying ... Prevent replying when comments are turned off	2018-10-12 09:11:34 -04:00
Benjamin Wheeler	d5343dfb01	fix ReactModal bodyOpenClassName error so that it is entirely omitted, rather than passing null value (#2176)	2018-10-11 16:58:30 -04:00
Paul Kaplan	600ba29933	Prevent replying when comments are turned off	2018-10-11 11:54:58 -04:00
Paul Kaplan	1f8342b987	Merge pull request #2164 from paulkaplan/comment-report-delete ... Comment report action and modal flow for deleting	2018-10-11 11:08:07 -04:00
Paul Kaplan	57408e46af	Fix scss name order	2018-10-10 15:29:30 -04:00
Paul Kaplan	086012f802	Add comment toggling	2018-10-10 15:14:53 -04:00
Benjamin Wheeler	8b222f0466	fix base modal prop passed to ReactModal (#2165)	2018-10-10 14:08:59 -04:00
Paul Kaplan	c535f8e731	Update report route to match newest API update	2018-10-10 14:01:14 -04:00
Paul Kaplan	6b4e0595d0	Use gray for deleted, red for reported	2018-10-10 11:25:16 -04:00
Paul Kaplan	c19adee84a	Fix internationalization	2018-10-10 11:15:09 -04:00
Paul Kaplan	237c6ecb55	Add parens for clarity	2018-10-10 09:17:18 -04:00
Paul Kaplan	997d0b5694	Fix css for report and delete comment styles	2018-10-10 09:13:21 -04:00
Paul Kaplan	ce84dddc34	Fix proptype warning for project id	2018-10-09 11:38:34 -04:00
Paul Kaplan	bdde34ba26	Implement report action with modal flow	2018-10-09 11:38:24 -04:00
chrisgarrity	32aa3e66d4	Merge pull request #2153 from LiFaytheGoblin/2133/move-media-queries-to-frameless ... Move media queries used in responsive project page to frameless	2018-10-09 10:56:11 -04:00
chrisgarrity	47f71c2758	Fix confict resolution error ... I missed one of the changes when resolving conflicts.	2018-10-09 10:24:02 -04:00
Paul Kaplan	c622d52396	Pass the topLevelCommentId to make sure nested comment deleting works	2018-10-09 10:16:35 -04:00
Paul Kaplan	e29caceb6b	Merge pull request #2150 from paulkaplan/new-comment ... Add comments to projects and replies to comments	2018-10-09 10:02:17 -04:00
Benjamin Wheeler	341428ce50	storage.js can use PROJECT_HOST env setting (#2146)	2018-10-09 09:59:04 -04:00
Paul Kaplan	58ab51a629	Add messages for other rejected comment reasons	2018-10-09 09:36:42 -04:00
Paul Kaplan	9b122470f5	Fix formatting from review comments	2018-10-09 09:36:42 -04:00
Paul Kaplan	24fe4fef65	Use topLevelCommentId to simplify adding and deleting comments ... This fixes the nested comment deletion problem: https://github.com/LLK/scratch-www/issues/2151	2018-10-09 09:36:41 -04:00
Paul Kaplan	744c90501e	Add comments to projects and replies to comments	2018-10-09 09:36:41 -04:00
chrisgarrity	7af2c8a80a	Merge branch 'develop' into 2133/move-media-queries-to-frameless	2018-10-09 09:12:58 -04:00
Ray Schamp	ab08aa4281	Merge pull request #2152 from LiFaytheGoblin/2133/subactions-share-date-as-prop ... [new project page] share date is passed as a prop to subactions component	2018-10-08 21:35:38 +01:00
Ray Schamp	3f5f224a76	Merge pull request #2107 from LiFaytheGoblin/responsive-project-page/container-width ... Make container smaller for mobile to allow for space left and right	2018-10-08 18:13:40 +01:00
Linda	14741e1cb8	if the report or add to studio modals are open, don't switch to fulls… (#2145) ... * if the report or add to studio modals are open, don't switch to fullscreen on orientationchange landscape * fix linting errors	2018-10-05 18:00:52 -04:00
Linda	d358c45482	media queries used in responsive project page have been moved to frameless.css	2018-10-05 10:25:56 -04:00
Linda	8db5216f17	share date is passed as a prop to subactions	2018-10-05 09:15:09 -04:00
Linda	bf3977821a	fixed linting errors	2018-10-04 10:51:26 -04:00
Linda	ad1531aff3	fixes to spacing around page content and a few other fixes	2018-10-04 10:41:10 -04:00
Linda	502ead072f	Merge branch 'develop' into responsive-project-page/container-width	2018-10-04 10:25:48 -04:00
Linda	79afc55f26	Merge pull request #2108 from LiFaytheGoblin/responsive-project-page/modals ... Make modals responsive	2018-10-04 10:23:35 -04:00
Linda	8476cd3152	solution from before was not working if combined with current develop branch	2018-10-04 09:47:28 -04:00
Paul Kaplan	24e1c92b74	Merge pull request #2141 from paulkaplan/comment-delete ... Add comment deleting for project owners on preview	2018-10-03 16:26:50 -04:00
Linda	27d7a3bf59	Merge pull request #2135 from LiFaytheGoblin/responsive-project-page/header ... Make header of new project page look good on mobile	2018-10-03 15:41:03 -04:00
Linda	1aa30fb10b	Merge pull request #2136 from LiFaytheGoblin/responsive-project-page/see-inside-remix-buttons ... New project page: See inside and remix buttons disappear on mobile	2018-10-03 15:40:47 -04:00
Paul Kaplan	a3f1ccc132	Fix sass-lint	2018-10-03 14:00:56 -04:00
Paul Kaplan	24b456873b	Add comment deleting for project owners	2018-10-03 13:31:54 -04:00
Linda	fc57218066	fix linting errors	2018-10-03 11:12:56 -04:00
Linda	a3df002b49	resolve mergin issues	2018-10-03 11:03:18 -04:00
Linda	437334b872	resolve merging conflicts	2018-10-03 10:54:53 -04:00
Linda	193a4ac70a	Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons	2018-10-03 10:45:10 -04:00
Linda	38b8e2e97e	on mobile, remix credit is still a flex row	2018-10-03 10:32:12 -04:00
Linda	f11d338d65	text gets vertically centered	2018-10-03 10:29:45 -04:00
Linda	57e147e110	remove commented out css	2018-10-03 10:09:44 -04:00
Linda	8009978c06	fixed linting errors	2018-10-03 10:09:44 -04:00
Linda	6f5b5c3278	extract css for new components and make some fixes to validation in report modal	2018-10-03 10:09:44 -04:00
Linda	5832969912	fixed linting errors	2018-10-03 10:09:44 -04:00
Linda	0895719f36	subactions getting own component	2018-10-03 10:09:44 -04:00
Linda	d85ca5d755	subactions getting their own component	2018-10-03 10:05:21 -04:00
Linda	b4a4ded822	share date positioning on small screens	2018-10-03 09:59:15 -04:00
Linda	8b10f3cba4	made project stats and action buttons responsive	2018-10-03 09:58:01 -04:00
Linda	2408568dda	Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons	2018-10-02 17:03:18 -04:00
Linda	a525e09cf6	Merge branch 'develop' into responsive-project-page/header	2018-10-02 16:59:01 -04:00
Linda	d0257ae43d	Merge pull request #2105 from LiFaytheGoblin/responsive-project-page/landscape-player ... If in landscape format on mobile, switch to fullscreen mode	2018-10-02 16:38:57 -04:00
Linda	f55dd02665	never mind screen.orientation	2018-10-02 15:42:29 -04:00
Linda	06bb9c60c4	fixed problem where sometimes there would be two scrollbars	2018-10-02 15:33:15 -04:00
Linda	b03bd51f79	fixed linting error	2018-10-02 13:57:41 -04:00
Linda	7c8fdbfcc3	fixed height of studio buttons scrolling container to fill all modal	2018-10-02 13:49:56 -04:00
Linda	a0b190aa87	Merge pull request #2118 from LiFaytheGoblin/responsive-project-page/notes-section ... Made project notes look better on mobile	2018-10-01 19:30:36 -04:00
Linda	3432d95cdb	Merge pull request #2117 from LiFaytheGoblin/responsive-project-page/comments ... Made comments look better on mobile	2018-10-01 19:30:25 -04:00
Linda	ef1b7d8f9f	checking for landscape browser proof	2018-10-01 16:58:05 -04:00
Linda	d5641daae6	improve solution for spacing in container and used desktop variable instead of hardcoded value	2018-10-01 13:56:11 -04:00
Linda	f1738ca384	improved the code stylewise	2018-10-01 09:52:50 -04:00
Linda	3010db684d	Merge pull request #2116 from LiFaytheGoblin/responsive-project-page/thumbnailcolumns ... Thumbnailcolumns appear at bottom on mobile	2018-09-28 13:57:24 -04:00
Linda	ec067778f2	Merge pull request #2099 from LiFaytheGoblin/2067/project-page/comments-fade-out-safari ... Made comments fade out look nice in Safari too	2018-09-28 13:57:11 -04:00
Ray Schamp	5278e77e0c	Merge pull request #2098 from chen-robert/gh1930-teacher-register-year ... Fix gh-1930: Teacher registration dates	2018-09-28 10:58:26 -04:00
Linda	50c7eb9bfd	added todo	2018-09-27 10:31:32 -04:00
Ray Schamp	1ad9a95a3d	Add placeholder share handler ... Having the `onShare` prop defined to a function enables the button in the GUI	2018-09-26 21:42:44 -04:00
Linda	e014906125	linting fixes	2018-09-26 17:26:19 -04:00
Linda	3d67488b29	Merge pull request #2106 from LiFaytheGoblin/responsive-project-page/extension-buttons ... Extension buttons are responsive	2018-09-26 17:19:38 -04:00
Linda	fa049d79fc	Merge pull request #2112 from LiFaytheGoblin/2104/remove-mod-pos-from-jobs ... Removed moderator position from jobs page	2018-09-26 17:19:14 -04:00
Linda	32ab0202bc	made project notes look better on mobile	2018-09-26 17:16:17 -04:00
Linda	b5a49e6cf2	linting fixes	2018-09-26 16:45:42 -04:00
Linda	c18a073e17	some fixes	2018-09-26 16:39:37 -04:00
Linda	532e201f53	made comments roughly responsive	2018-09-26 16:36:48 -04:00
Linda	cc57d0f206	removed stuff that doesn't belong into this pr	2018-09-26 15:01:25 -04:00
Linda	4f3d77f42a	some fixes and adapted remix and studio thumbnails	2018-09-26 14:55:17 -04:00
Linda	a4e7ee35e4	adapted show and remix button to mobile	2018-09-26 14:54:33 -04:00
Linda	4299afaec5	fixes to warning and thumbnailcolumns for mobile WIP	2018-09-26 14:35:36 -04:00
Robert Chen	a94b9d6c84	Fix gh-1934: Search bar special chars (#2075) ... * Fixed Issue 1934 The text was encoded once already by the search bar. That means we need to decode it twice in order to decode special characters. * Rewrote search query parsing	2018-09-26 14:16:56 -04:00
Linda	7465c2e85a	removed sth that isn't part of the title issue	2018-09-26 12:02:00 -04:00
Linda	6445c7471e	some fixes and adapted remix and studio thumbnails	2018-09-26 11:52:32 -04:00
Linda	6b2ddcd217	adapted title area for mobile	2018-09-26 11:48:29 -04:00
Linda	89aaaab4d3	removed moderator position from jobs page	2018-09-26 10:24:53 -04:00
Linda	35194803b4	fixed linting errors	2018-09-25 16:06:46 -04:00
Linda	a5d2ee18ef	fixed validation message for modals	2018-09-25 15:58:10 -04:00
Linda	d061e2afe9	improve responsiveness for project page modals and also clean up the modals a bit	2018-09-25 15:40:27 -04:00
Linda	55cdeea04d	wip refactored and responsive project page modals	2018-09-25 15:37:52 -04:00
Linda	f1c6f6c223	fixed linting errors	2018-09-25 15:31:31 -04:00
Linda	4983fb3f8c	solution for container size for screen size between tablet and 942 according to design	2018-09-25 15:21:26 -04:00
Linda	51bb905381	extensions appear on correct place depending on media query	2018-09-25 15:04:31 -04:00
Linda	d066e73b91	extensions buttons made responsive	2018-09-25 14:49:37 -04:00
Linda	56f1b80f24	if in landscape format on mobile, switch to fullscreen mode	2018-09-25 14:36:34 -04:00
Benjamin Wheeler	eb9abd23a0	fixed errors in splash page that appear in develop (#2077)	2018-09-25 00:52:23 -04:00
Benjamin Wheeler	935eb0b15f	move login/registration functions and view state to session reducer, pass to gui (#2078) ... * move login/registration functions and view state to session reducer, pass to gui * navigation reducer handles login; gui passed renderLogin function * put back in join class to make smoke tests keep working	2018-09-24 11:04:30 -04:00
Linda	a160180245	added transparent for ui primary for cross browser support to colors css	2018-09-21 13:26:49 -04:00
Linda	c047612d68	Merge pull request #2083 from LiFaytheGoblin/2082/project-page/project-notes-alignment ... Fix notfications box, player box, buttons and icons alignments	2018-09-21 10:03:58 -04:00
Linda	0d894e3208	convention of writing hsl is with percentages	2018-09-21 09:57:49 -04:00
Linda	8bc158118e	fixed color gradiant display in Safari	2018-09-21 09:53:58 -04:00
Robert Chen	86551baa94	Fixed Issue 1930	2018-09-20 22:15:24 -07:00
Linda	f721c9591a	Ok, css that doesn't work in all browsers is not an option...	2018-09-20 10:33:00 -04:00
Linda	c9b2306827	removed some stuff that is not needed anymore	2018-09-19 16:17:14 -04:00
Linda	a9872a14ff	fixed problem that occured with remix credits	2018-09-19 15:03:20 -04:00
Linda	d0d7bba70e	Merge pull request #2079 from LiFaytheGoblin/2065/title-too-long-warning ... Implemented design for title-too-long-warning	2018-09-18 13:20:13 -04:00
Linda	42f0ed16e5	Merge pull request #2073 from LiFaytheGoblin/2005/animate-add-to-studio-buttons ... Animate add-to-studio-buttons on preview project page	2018-09-14 12:28:44 -04:00
Linda	0a50c1fb34	align notes box and player box on same y pos and align buttons and icons below notifications and player at same y pos	2018-09-13 14:58:00 -04:00
Linda	497aae2a3c	convention fixes	2018-09-13 11:04:14 -04:00
Linda	35558bfdba	fixed linking problems	2018-09-13 10:49:59 -04:00
Linda	8a8f3b6da1	implemented title too long warning design	2018-09-13 10:39:19 -04:00
Linda	a60bd65887	positioning of alert field incomplete	2018-09-12 17:28:27 -04:00
Linda	c54b7413bc	replaced old spinner with new svg to work everywhere where spinner is used	2018-09-12 14:54:15 -04:00
Linda	1cee3c68fc	removed some leftovers	2018-09-11 17:18:09 -04:00
Linda	a8ebdb7d32	Merge pull request #2046 from LiFaytheGoblin/2045/project-page/studio-thumbnails ... Fix appearance of studio thumbnails on preview project page	2018-09-11 10:10:21 -04:00
Linda	0898054e41	Merge pull request #2043 from LiFaytheGoblin/1986/project-page/fit-title-length ... Keep title on preview project page from overflowing or otherwise messing up the layout	2018-09-11 10:08:38 -04:00
Linda	7313f26530	fixed linting errors	2018-09-07 16:45:17 -04:00
Linda	b582b31491	added comments and improved spin animation a little	2018-09-07 16:19:49 -04:00
Linda	ab4f8a09ce	the animation now works	2018-09-07 16:11:37 -04:00
Benjamin Wheeler	3271c54744	Merge pull request #2052 from benjiwheeler/rename_title ... pass project title to GUI, and disable submit when editing title	2018-09-07 16:03:16 -04:00
Linda	ed604a21d4	add studio buttons animation on preview page, need fixing	2018-09-07 09:26:11 -04:00
Ben Wheeler	2a19bb283f	no need to pass title to embedded gui	2018-09-06 16:54:12 -04:00
Ben Wheeler	2f5604d23d	localized Title too long error string	2018-09-05 18:38:19 -04:00
Ben Wheeler	478a30efcb	pass project title to GUI, and disable submit when editing title	2018-09-05 18:38:19 -04:00
Ben Wheeler	4bf0964bf2	moved dispatched navigation function calls to mapDispatchToProps	2018-09-05 17:52:03 -04:00
Benjamin Wheeler	3c6530fe85	Merge pull request #2022 from benjiwheeler/account-nav-component ... split account nav into its own component, pass logout callback to GUI	2018-09-05 13:32:45 -04:00
Ben Wheeler	f9003077a3	use account-nav class, not account-nav id	2018-09-04 17:15:52 -04:00
Linda	0f2ca09892	added Katelyn to credits page	2018-09-04 12:54:29 -04:00
Linda	d78ee1fe7c	some linting	2018-08-30 15:44:17 -04:00
Linda	b0ecae351e	prevented the project title from overflowing in a way more elegant way	2018-08-30 15:37:51 -04:00
Linda	591c792a5c	Merge branch 'develop' of https://github.com/LLK/scratch-www into 1986/project-page/fit-title-length	2018-08-30 13:47:19 -04:00
chrisgarrity	39aa73c095	Merge pull request #2058 from LLK/hotfix/search-default-mode ... [DEVELOP] Hotfix/search default mode	2018-08-30 11:12:34 -04:00
chrisgarrity	6722582994	Use popular for the default sort mode	2018-08-30 10:51:02 -04:00
chrisgarrity	17bf7c4061	Merge pull request #2044 from LLK/release/august-2018 ... [Master] Release for August 2018	2018-08-30 10:10:22 -04:00
Linda	affdc7e670	use specific class instead of h2	2018-08-28 17:01:36 -04:00
Linda	3863e9c5bf	remove unnecessary comments	2018-08-28 16:50:34 -04:00
Linda	a1721abc46	Merge pull request #2042 from LiFaytheGoblin/2038/add-to-studio-dialog-entries-cursor ... 2038/add to studio dialog entries cursor	2018-08-28 17:41:44 -03:00
Linda	f10c811009	Merge pull request #2048 from LiFaytheGoblin/2047/project-page/white-space-next-to-comments ... 2047/project page/white space next to comments	2018-08-28 17:39:15 -03:00
Linda	c52eb610b4	Merge pull request #2041 from LiFaytheGoblin/1991/accessibility-extension-landing ... 1991/accessibility extension landing	2018-08-28 17:37:51 -03:00
Ray Schamp	e6ea1e301d	Merge pull request #2037 from LiFaytheGoblin/2016/add-to-studio-dialog-clip-studio-name ... 2016/add to studio dialog clip studio name	2018-08-28 16:08:29 -04:00
Linda	0ef4eca0bb	improved wording	2018-08-28 09:33:06 -04:00
Ben Wheeler	733134c421	pass through logout callback to GUI	2018-08-27 18:56:27 -04:00
Eric Rosenbaum	a72f187b94	Add wedo troubleshooting item about updating scratch link	2018-08-27 12:17:59 -04:00
Linda	919910f30a	made empty space next to comments section a bit smaller	2018-08-24 13:14:22 -04:00
Linda	10aa57e4a2	fixed ordering and so in css	2018-08-24 09:25:04 -04:00
Linda	d95ee37c04	now you can see the full title of something when hovering over the title which might be cut off	2018-08-24 09:09:17 -04:00
Linda	79e80aea54	improved remix and studio row	2018-08-24 09:05:08 -04:00
Linda	ba919062f3	changed look of studio thumbnails	2018-08-24 08:41:37 -04:00
Linda	befa5485bb	some ordering of css stuff fixed	2018-08-23 14:31:44 -04:00
Linda	9db42fe9f4	prevented overflowing project title in a nice looking way	2018-08-23 14:24:31 -04:00
Ben Wheeler	796ad7b152	split account nav into its own component	2018-08-23 14:10:55 -04:00
Linda	50242a3bb1	added pointer cursor style to the buttons that add or remove a project to or from a studio	2018-08-23 11:32:18 -04:00
Linda	f934b9bc7e	fixed some intendation	2018-08-23 11:18:12 -04:00
Linda	b3b0843b75	some improvements and added alt attributes for microbit	2018-08-23 11:05:38 -04:00
Linda	4635ae3b82	added alt tags to wedo page	2018-08-23 10:38:49 -04:00
Eric Rosenbaum	f51f6801e6	Add wedo troubleshooting item about updating scratch link	2018-08-23 10:03:02 -04:00
Linda	641e9895f6	updated from develop with new extension landing pages	2018-08-22 18:05:57 -04:00
Linda	56d9ac2af9	resolve travis errors caused by wrong ordering of css stuff	2018-08-22 16:48:07 -04:00
Eric Rosenbaum	78b32597c5	Merge branch 'develop' into hotfix/extension-landing-pages	2018-08-22 16:28:52 -04:00
Ray Schamp	7851789f9f	Merge pull request #2001 from kyleplo/patch-2 ... Add sort scheme dropdown to search results page	2018-08-22 15:59:25 -04:00
Linda	68c7616a25	remove now obsolete truncate library	2018-08-22 15:10:19 -04:00
Linda	a7c279fab5	cut of studio name on studio adding dialog using css and not using the library for that anymore, also displays full title as a title of the div	2018-08-22 15:05:21 -04:00
kyleplo	d7feb51695	Fix non-existent term	2018-08-22 14:50:19 -04:00
kyleplo	d2721f0bbc	Fix getting query	2018-08-22 14:43:00 -04:00
kyleplo	0b9ceb413f	Fix getting querystring	2018-08-22 14:25:31 -04:00
kyleplo	78b88443c0	Fix setting mode	2018-08-22 14:17:26 -04:00
Linda	253d6ac279	style fix	2018-08-22 13:32:23 -04:00
Linda	d4ad8f7d35	add language tag	2018-08-22 13:05:49 -04:00
Linda	9a91fa9b0a	h2 in header is now h1, including overwritten styles	2018-08-22 10:45:19 -04:00
Linda	c26dc79b8d	add alt tags to remaining images and correct some	2018-08-22 10:21:28 -04:00
kyleplo	46e24ac3ef	Fix spacing in message title	2018-08-22 08:15:22 -04:00
kyleplo	458170390c	Fix acceptableModes	2018-08-22 08:05:20 -04:00
kyleplo	4435408cdc	Revert "Add mode"	2018-08-22 07:57:19 -04:00
Linda	83553c3bc2	making the conditional translation more elegant	2018-08-21 16:40:49 -04:00
Linda	25234d7e27	add conditional alt attributes to ev3 landing page installation step	2018-08-21 16:33:50 -04:00
Linda	bf5a890a87	added alt attributes to img tags in starter projects component and when using this component on ev3 page	2018-08-21 16:07:27 -04:00
Eric Rosenbaum	179edefaaa	Use relative link to wedo-legacy	2018-08-21 15:48:28 -04:00
Italy	1ff394f9b2	adding simple alt attributes to imgs on ev3 landing page	2018-08-21 15:39:59 -04:00
Eric Rosenbaum	d0881c3ba2	Add mint green	2018-08-21 15:34:02 -04:00
Eric Rosenbaum	6884314492	Add WeDo legacy page link to troubleshooting	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	9c6721c888	Fix swapped starter project links	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	1e4d7000a5	Add WeDo starter project links, images and text	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	7be5857120	Add todo comment	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	0c5de6cea1	Detect mac vs windows	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	287bc8405a	Use project id links for starter projects instead of downloads	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	fd10e08d80	Use temp l10n strings without duplication	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	43ee8a6631	Lint	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	1356d863b1	Remove “manual update” from firmware update instructions	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	b666382f8b	Change LEGO MINDSTORMS EV3 in body text to LEGO MINDSTORMS Education EV3	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	d0bf1bb36a	Update links for wedo and EV3 to lego education pages	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	ac1d5ae325	SYNCHRONIZE JUICE FLAVORS ... Ray told me I can’t put emoji here, sorry everyone	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	83232212ab	css for outline around screenshot images	2018-08-21 15:16:07 -04:00
Eric Rosenbaum	0c628c3e97	Add new WeDo landing page, move old one to wedo-legacy	2018-08-21 15:16:06 -04:00
Connor Hudson	3f3c36d733	Add missing l10n strings to EV3 page (#2013)	2018-08-21 15:15:50 -04:00
Connor Hudson	b604b19641	Refactor Extension Landing Pages (#2006) ... * Add extension-landing generalized styles, install scratch link component * Make EV3 page use generalized stuff * Use OS_ENUM file instead of class variable * use extension-landing/os-enum in os chooser * Use extension-landing class in extension-landing.scss * Use extension-landing styles and components on microbit page * Add view-specific styles * Move install scratch link l10n strings to src/l10n.json * Start moving steps display to its own components * Finish initial pass at Step, Steps components for extension landing pages * Create ProjectCard component * Use new components on InstallScratchLInk component * Use new components on EV3 page * allow className prop in Steps component * Use new components on micro:bit landing page * imageUrl -> imageSrc in ProjectCard * Create ExtensionHeader component and use it on micro:bit and EV3 pages * Fix a spacing issue in the InstallScratchLink component * Add ExtensionRequirements component * Use ExtensionRequirements component on landing pages * Remove requirements l10n string for ev3 page * Move project card styles out of things-to-try section * Don't render the number row in a step if compact and number props are not set * Add ExtensionSection component * Use ExtensionSection on ev3 and microbit pages * Move state configuration to ExtensionLanding class * Move tip box, screenshot styles outside of specific section * Add TipBox component and use it on the EV3 page * Use hr element instead of section-separator div * Remove refactor TODO comments :)	2018-08-21 15:13:49 -04:00
Ray Schamp	39c0bc9048	Merge pull request #2009 from apple502j/patch-4 ... Update the last updated date	2018-08-21 14:10:58 -04:00
Ray Schamp	a3c929db3d	Finish setup of backpack, assets, projects hosts	2018-08-16 17:40:09 -04:00
Ray Schamp	d538412357	WIP: configure GUI for staging	2018-08-16 17:39:04 -04:00
Ray Schamp	a19fb29f36	WIP: enable backpack in preview	2018-08-16 17:37:19 -04:00
Ray Schamp	fccbed0782	Merge pull request #2021 from technoboy10/preview-hide-intro-modal ... Hide intro modal in editor on new project page	2018-08-16 17:02:57 -04:00
Ben Wheeler	466b53b518	project page stage margin and width adjustments to match gui stage css changes	2018-08-13 23:48:27 -04:00
Connor Hudson	d795d87e18	Hide intro modal in editor on new project page	2018-08-09 15:50:31 -04:00
Ben Wheeler	2c8990ae7e	report project POSTs to scratchr2, displays modal reactively	2018-08-09 12:41:38 -04:00
Connor Hudson	1875870a86	Initial implementation for displaying comments on project page (#1997) ... * Create Comment component, start styling it * Restructure PreviewPresentation to better match mockup * Add padding, border to comment bubble * add padding to bottom row of comment * Tweak alignment of avatar and comment content * Add margin to lower project page container * Use border-box box sizing for comment bubble * Make user avatar a link * Add initial implementation of comment tail * Align username row properly, fix comment bubble width * Use ::before pseudoelement for comment tail * Remove unused props to Comment component * Add CommentContainer to handle comment replies * Use CommentContainer instead of Comment in PreviewPresentation * Remove debug data from CommentContainer * Fetch top level comments from the API * Force comment container to stretch to bottom of view div * Remove unused api import in CommentContainer * Long words in comments should not overflow page * Remove @ before username in comment title * Fix word wrapping on Firefox * Refactor CommentContainer into a class * Properly export CommentContainer component * Make replies column take up proper width * Pass project ID to CommentContainer * Fetch comment replies in CommentContainer * Initial implementation for loading more comments * Add "Load More" button to Presentation * Initial implementation of collapsing threads longer than 3 replies * Remove console log from preview.js redux * Tweak last comment gradient color * Only show three total replies in collapsed state * Match scratchr2 behavior for thread collapsing * Use width calc instead of margin and width 100% * Fix styling for load more button * Make comment border gray to match the wireframe * Allow clicking through comment fade gradient * Add comment compose component * style comment compose box * Style post, cancel buttons on comment compose component * Add margin to create comment container * Tweak styling for characters remaining text * Tweak placeholder text * Add more margin to comment avatar * Add icons and styling to delete, report text * Refactor px -> rem where possible in comment styles * Change comment time color to dark gray * Tweak margin and border radius * Add reply icon to preview comments * Clean up unused imports, console.log in compose-comment component * Remove console statement in preview.jsx * Add some clarifying comments to unfinished parts of comments * Remove direct passing of comment api response to CommentContainer * CommentContainer should not pass api response directly * Rename CommentContainer to TopLevelComment * First pass at getReplies for comments in redux * Move reply fetching into redux actions instead of in TopLevelComment * Refactor getReplies logic to behave better * Remove components not directly related to reading comments * Hide load more button if all comments are loaded This uses the project info returned by the API * Use same gradient as add to studio modal on comment thread	2018-08-06 11:52:18 -04:00
Connor Hudson	7742eccb87	Add missing l10n strings to EV3 page (#2013)	2018-08-03 17:29:15 -04:00
Benjamin Wheeler	f76ca8b891	Merge pull request #1985 from benjiwheeler/studio-modal-benwheeler ... Add To Studio modal on project page. Sorry for merge commit, merges from develop made these un-squashable :(	2018-08-02 17:53:53 -04:00
Connor Hudson	de2691762e	Refactor Extension Landing Pages (#2006) ... * Add extension-landing generalized styles, install scratch link component * Make EV3 page use generalized stuff * Use OS_ENUM file instead of class variable * use extension-landing/os-enum in os chooser * Use extension-landing class in extension-landing.scss * Use extension-landing styles and components on microbit page * Add view-specific styles * Move install scratch link l10n strings to src/l10n.json * Start moving steps display to its own components * Finish initial pass at Step, Steps components for extension landing pages * Create ProjectCard component * Use new components on InstallScratchLInk component * Use new components on EV3 page * allow className prop in Steps component * Use new components on micro:bit landing page * imageUrl -> imageSrc in ProjectCard * Create ExtensionHeader component and use it on micro:bit and EV3 pages * Fix a spacing issue in the InstallScratchLink component * Add ExtensionRequirements component * Use ExtensionRequirements component on landing pages * Remove requirements l10n string for ev3 page * Move project card styles out of things-to-try section * Don't render the number row in a step if compact and number props are not set * Add ExtensionSection component * Use ExtensionSection on ev3 and microbit pages * Move state configuration to ExtensionLanding class * Move tip box, screenshot styles outside of specific section * Add TipBox component and use it on the EV3 page * Use hr element instead of section-separator div * Remove refactor TODO comments :)	2018-08-02 13:09:55 -04:00
Connor Hudson	afde4597d0	Merge pull request #2010 from technoboy10/bugfix/tablet-banner-centering ... [DEVELOP] Fix top banner centering on android chrome	2018-08-01 16:45:52 -04:00
Connor Hudson	42dbeee985	Set more position properties to fix banner centering on android chrome	2018-08-01 16:43:21 -04:00
Ben Wheeler	d941ec1dff	do not modify state object directly	2018-08-01 16:37:48 -04:00
Ben Wheeler	7aa81199ce	modal halo	2018-08-01 15:53:53 -04:00
Benjamin Wheeler	08453f9f7c	Merge branch 'develop' into studio-modal-benwheeler	2018-08-01 14:46:33 -04:00
Ben Wheeler	4ce72ce61f	consolidated colors per consult with Carl	2018-08-01 14:42:15 -04:00
Ben Wheeler	38f4c6a5c3	rearranged colors; longer studio button names	2018-08-01 11:01:37 -04:00
Connor Hudson	d48adc2ae4	Set more position properties to fix banner centering on android chrome	2018-08-01 10:26:26 -04:00
Ben Wheeler	5fab657fad	Merge remote-tracking branch 'origin/develop' into studio-modal-benwheeler	2018-08-01 10:14:09 -04:00
kyleplo	86befd1e31	Remove recent from language	2018-08-01 09:17:01 -04:00
kyleplo	7091e65fb5	Remove recent option	2018-08-01 09:16:41 -04:00
apple502j	b7fd515517	Update the date	2018-08-01 09:35:18 +09:00
Ben Wheeler	c450b7e658	corrected brackets for lint error	2018-07-31 18:10:42 -04:00
kyleplo	a6bb77de8a	Rename m query parameter to mode	2018-07-31 17:26:03 -04:00
Ben Wheeler	e83f29dbbc	moved NaN check in preview.jsx to be guard-style	2018-07-31 16:38:49 -04:00
carljbowman	3352f8a7f0	Add missing semicolon	2018-07-31 15:33:34 -04:00
carljbowman	e3e422714e	Fix 2017 conference banner ... Updates the light blue background to a dark blue. Give the text more contrast.	2018-07-31 15:33:11 -04:00
carljbowman	e41d16e656	Fix button contrast in Tips page masthead ... Previously the button was made aqua, but there was a lot of contrast between the ui-blue and ui-aqua.	2018-07-31 15:32:29 -04:00
Ben Wheeler	097fb66955	currentStudioIds now an array; reverted a few changes	2018-07-31 15:00:56 -04:00
carljbowman	6a8676ea35	Remove Darken and Ligthen SCSS ... Updated all the places in the SCSS where we use Darken and Lighten properties. These properties have been problematic in the past and caused some state issues, e.g. New message(s) hightlight (which was fixed seperately from this issue)	2018-07-31 14:37:49 -04:00
chrisgarrity	4b3d6b9e9d	Merge pull request #1964 from JoelGritter/JoelGritter-patch-1 ... Fix gh-1962: Update footer wiki link	2018-07-31 08:08:55 -04:00
chrisgarrity	409b452200	Merge pull request #1979 from joker314/feature/add-bryce-taylor ... Add brycedtea to Credits page	2018-07-31 08:08:21 -04:00
chrisgarrity	08e45c076f	Merge pull request #1980 from GreenBayRules/develop ... Add Kathy Wu to Credits	2018-07-31 08:07:49 -04:00
kyleplo	9bf2f7d436	Add mode	2018-07-28 07:36:08 -04:00
kyleplo	5ad2476790	Fix indent	2018-07-27 14:16:57 -04:00
kyleplo	0494822f7c	Fix more errors	2018-07-27 13:15:53 -04:00
kyleplo	190cb7553e	Fix errors	2018-07-27 13:09:48 -04:00
kyleplo	6c5d655bd5	Add language file	2018-07-27 12:56:27 -04:00
kyleplo	539cfa5bcd	Add filter mode dropdown	2018-07-27 12:54:59 -04:00
kyleplo	3ebe44f86a	Add css for dropdown	2018-07-27 12:06:06 -04:00
Ben Wheeler	8eec0d3a87	corrected parentheses for lint error	2018-07-27 10:49:42 -04:00
Ben Wheeler	a60da11f8a	curated studios endpoint doesn't pass unnecessary token to api	2018-07-26 18:54:58 -04:00
Ben Wheeler	7cc2f61a2b	compressed svgs; small modal scss reversion	2018-07-25 16:30:50 -04:00
Ben Wheeler	1a4922a262	addtostudio buttons in own component; currentStudioIds redux object; lint fixes	2018-07-25 15:08:12 -04:00
Sean Hickey	767fabb22c	Updated livestream link to proper URL	2018-07-24 12:12:17 -04:00
Ben Wheeler	0c6b8607da	better approach to tracking which studios the project current belongs to	2018-07-24 11:50:03 -04:00
Ben Wheeler	66c21d8b33	merged docker-compose	2018-07-24 09:29:07 -04:00
Ben Wheeler	ffe5e8cb43	adding distinct object to redux/preview.js state to track studio membership	2018-07-24 09:12:13 -04:00
Sean Hickey	8ab5656e33	Added link to keynote livestream	2018-07-23 16:49:13 -04:00
Ben Wheeler	52281502b2	corrected mismatched addtostudio field name in redux/preview.js	2018-07-23 10:39:20 -04:00
carljbowman	7de1cb80d6	Fix new message highlight ... New messages should now have a blue backgroud (like they did previously).	2018-07-21 09:55:08 -04:00
Ben Wheeler	d1d42f4245	resolved spinner conflict	2018-07-20 21:14:41 -04:00
Ben Wheeler	1ad7ce4f4c	resolved version conflicts	2018-07-20 21:08:33 -04:00
Ben Wheeler	fc5912526e	addtostudio modal interfaces with api add/remove endpoints; waits to close; handles open studios that user does not curate. ... addtostudio modal interfaces with api add/remove endpoints; waits to close; handles open studios that user does not curate.	2018-07-20 20:37:36 -04:00
Connor Hudson	5f0016f385	Add landing pages for the micro:bit and EV3 extensions (#1981) ... * start building ev3 landing page structure * Inject translations, add more content and structure to ev3 landing page * Add ev3 route * add active styles for os chooser buttons * Add ev3 assets * Add content and intial styles for everything down to "Sample Projects" * Add correct padding to all sections on ev3 page * Add more margins to match the mockup * Create os chooser component for reuse on other landing pages * Make EV3 page stateful, add OS logic, change step styles, fix images on Chrome * Add sample project cards and styles * Add fixed ev3 icon svg * Add app store badges (no href on links yet) * Add section separator, fix sample project card margins * Add border to project cards, make project cards clickable links * Add FAQ boilerplate and styling from InformationPage component * Add indented ol style, example * Add link style with underline * Add EV3 retail link * Content updates * Fix some z-index issues with os chooser * micro:bit page mega-commit * os chooser should not have a higher z-index than nav * Update starter projects * Localize OS chooser * Add localization configuration for EV3 page * Localize section titles on ev3 page * Add starter project images and descriptions * Add link to microbit.org * Fix tip box width on microbit and ev3 pages * add l10n strings up to things to try on ev3 page * Fix lint error in ev3.scss * Add download link style to ev3 * microbit getting started text and images * Remove tip about microbit name * Hex file and starter project download links * microbit wording updates * update images * Fix issues with download link style * text fix * Add ev3 starter project downloads * Add microbit l10n file and config * Add l10n strings for microbit header and scratch link sections * Add l10n strings for microbit page up to faq * content updates * Fix some page overflow issues * microbit faq content and style * Use zipped version of microbit hex file * Add platform name to scratch link download button * Add EV3 faq to l10n.json * Add final strings from micro:bit and EV3 pages to l10n.json files * Add white download asset * Tweak styles for ev3 and microbit * Add some final tweaks to the EV3 page styles * Add TODO comments about refactoring duplicate code	2018-07-19 18:08:44 -04:00
Sheshank Shankar	3c020d9200	Update credits.jsx	2018-07-19 10:57:09 -07:00
Sheshank Shankar	a5070bfda5	Remove trailing spaces	2018-07-19 09:08:20 -07:00
Sheshank Shankar	4de9b49d2a	Bug fix	2018-07-19 09:07:08 -07:00
Sheshank Shankar	7b205fb136	Add Kathy Wu to credits	2018-07-19 08:59:43 -07:00
jokebookservice1	0f5778cab9	Add brycedtea to Credits page	2018-07-19 18:54:50 +03:00
Ben Wheeler	cf63c35e94	interface with api add/remove project to/from studio works; addtostudio modal waits to close	2018-07-18 18:52:15 -04:00
Ken	d95058a1bc	Added Community Moderator job listing ... Closes #1972	2018-07-18 17:17:59 +02:00
Connor Hudson	61cfbb90e6	Remove extra characters from preview faq redirect routeAlias	2018-07-17 10:36:13 -04:00
Andrew Sliwinski	61bfc254ce	Merge pull request #1956 from technoboy10/feature/beta-banner ... Add top and middle splash page banners for beta launch	2018-07-17 09:46:14 -04:00
carljbowman	ef9b726f63	Replace last remaining HEX colors in _colors.scss ... There were a few colors used in the logged-out Welcome message. Replaced them with new 3.0 colors.	2018-07-17 09:26:46 -04:00
carljbowman	9d87d8700c	Remove custom color in What’s Happening Callout ... Swapped colors to make it more consistent.	2018-07-17 09:15:17 -04:00
carljbowman	cf7149a356	Fix linting	2018-07-16 19:25:35 -04:00
carljbowman	12c0706dbb	Modify load more button ... With box-shadows being removed from buttons there were a few places that needed to be adjusted: white buttons on light gray backdrop	2018-07-16 18:06:15 -04:00
carljbowman	201517a32d	Remove shadows on buttons ... GET OUT OF HERE BOX SHADOWS.	2018-07-16 18:05:10 -04:00
carljbowman	5a067132b6	Remove numeric font-weights ... We have seen lots of issues across browsers with font-weights defined as numbers (e.g. 400 vs regular). Updated one place that was effected by new line lengths and wrapping issues.	2018-07-16 18:04:43 -04:00
carljbowman	ebd41b169e	Update colors to match 3.0 palette ... Updates maintain WWW color variable naming conventions, but replaces values with 3.0 colors. Colors have the commented HEX and GUI variable name. More work to do auditing but it’s a start.	2018-07-16 18:02:12 -04:00
Ben Wheeler	a59d533a1c	merged changes in report modal and add to studio handling	2018-07-16 13:39:29 -04:00
Connor Hudson	90bd2af3aa	Move banner timestamps to constants at top of file	2018-07-16 13:16:48 -04:00
Connor Hudson	a669106796	Redirect /preview-faq -> /3faq, remove "Preview" from faq title	2018-07-16 12:47:18 -04:00
Connor Hudson	595a4a8c60	Hide banners before launch date (actual dates TBD)	2018-07-16 11:35:25 -04:00
Bryce Taylor	656b22f713	Merge pull request #1958 from joker314/develop ... Remove unneeded testing file	2018-07-16 10:28:20 -04:00
Connor Hudson	664fc1998e	Update beta banner styles to match mockup	2018-07-16 10:09:34 -04:00
Connor Hudson	ae49bbf74f	Update l10n strings	2018-07-16 10:09:10 -04:00
Connor Hudson	fee657977e	Use module.exports for banners, remove .default for banner imports in presentation	2018-07-16 09:17:26 -04:00
Ben Wheeler	bc7b31e924	finished draft of intermediary refactor of addtostudio modal redux code, container-presentation code simplified	2018-07-13 09:50:17 -04:00
Ben Wheeler	6a32edb2fe	addtostudiomodal: incomplete progress on 1. container-presentation refactor, 2. redux handling of add and leave studio requests	2018-07-11 15:08:01 -04:00
Joel Gritter	90ab0f75d0	Update wiki link	2018-07-10 17:29:25 -04:00
Ray Schamp	5844fed2e0	Merge branch 'hotfix/update-conference-2018-3' into develop	2018-07-09 16:34:23 -04:00
jokebookservice1	07202ff6ec	Remove unneeded testing file	2018-07-09 16:48:17 +03:00
Andrew Sliwinski	f3bd092482	Merge pull request #1951 from JoelGritter/JoelGritter-patch-1 ... Fix gh-1950: Update parent email age on FAQ page	2018-07-09 08:47:24 -04:00
Ben Wheeler	9cac70ab18	small steps towards addtostudio modal's container-presentation refactor	2018-07-07 14:09:43 -04:00
Connor Hudson	5b520c21ef	Update copy from doc	2018-07-06 13:47:55 -04:00
Connor Hudson	a7aae29041	Tweak small top banner styles	2018-07-06 11:38:41 -04:00
Connor Hudson	917497ab66	Use localization strings for banner copy	2018-07-06 10:37:51 -04:00
Connor Hudson	565eeb776f	Make middle banner image resize properly and keep its aspect ratio	2018-07-06 10:37:10 -04:00
Sean Hickey	377eaf0e61	Conference updates - schedule, logos, room locations	2018-07-06 10:17:57 -04:00
Connor Hudson	61aad76b68	Fix middle banner image styles	2018-07-06 09:52:24 -04:00
Connor Hudson	d1d7b2e711	Adjust middle banner width and margin to match other front page rows	2018-07-05 15:26:34 -04:00
Ben Wheeler	d9543314cc	small comment	2018-07-05 13:34:41 -04:00
Joel Gritter	b77c5fe837	Update parent email age ... 13 -> 16	2018-07-05 09:27:53 -04:00
Ben Wheeler	af25e44fc6	refactoring add to studio modal into container and presentation; added getCuratedStudios functionality to preview	2018-07-04 18:01:11 -04:00
Connor Hudson	4129a701e7	Second pass at responsive top banner	2018-07-03 16:18:11 -04:00
Connor Hudson	5ebb5fa8db	Fix image weirdness on chrome, safari	2018-07-03 15:02:00 -04:00
Connor Hudson	08178a58e5	Initial work on responsive middle banner	2018-07-03 14:48:20 -04:00
Connor Hudson	0eb12ae469	Style button on top banner	2018-07-03 13:16:01 -04:00
Connor Hudson	97cb50917f	Add initial pass at middle banner	2018-07-03 12:21:21 -04:00
Connor Hudson	142b46b138	Rename image container	2018-07-03 12:07:03 -04:00
Connor Hudson	655625568c	Add initial pass at top banner with assets	2018-07-03 12:03:22 -04:00
Connor Hudson	4eca432811	Style middle banner	2018-07-02 11:41:17 -04:00
Connor Hudson	251f7bf59d	Add middle banner in progress copy	2018-07-02 11:41:10 -04:00
Connor Hudson	dfaee503b8	Style top banner, add placeholder copy	2018-07-02 10:51:19 -04:00
Connor Hudson	5b5eb8cc5a	Tweak class for small top banner	2018-07-02 10:25:58 -04:00
Connor Hudson	cf48231284	Tweak class names, button padding for small top banner	2018-07-02 10:08:38 -04:00
Connor Hudson	918b4b5948	Style small top banner a little more	2018-07-02 09:59:22 -04:00
Ray Schamp	ff662b37c5	Merge pull request #1946 from JoelGritter/JoelGritter-patch-1 ... Fix gh-1899: Add Console Warning	2018-06-29 10:24:04 -04:00
Joel Gritter	b4c35122b9	eslint-disable for console.log's ... Should resolve the Travis-CI errors	2018-06-29 09:57:46 -04:00
Connor Hudson	4c49ae1701	Create small top banner component	2018-06-29 09:28:11 -04:00
Connor Hudson	fd9c0df623	Add styles for banners	2018-06-29 09:28:03 -04:00
Connor Hudson	4ee6bfcad2	Add call to action link to banners	2018-06-29 09:27:54 -04:00
Joel Gritter	1a6fa9466f	Add console warning	2018-06-29 09:23:55 -04:00
Connor Hudson	c469a0ed97	Show MiddleBanner if logged out	2018-06-28 13:58:23 -04:00
Connor Hudson	178ee415e7	Show top banner if logged in and on tablet or desktop	2018-06-28 13:51:51 -04:00
Connor Hudson	1371687a22	Add boilerplate code for beta banners	2018-06-28 13:50:18 -04:00
Connor Hudson	289e17195d	Merge pull request #1932 from technoboy10/feature/projects-extension-display ... Preview - Implement extension info strip	2018-06-27 16:59:47 -04:00
Colby Gutierrez-Kraybill	02c45300d6	Merge pull request #1940 from LLK/hotfix/update-conference-2018-2 ... [DEVELOP] Conference site updates	2018-06-27 12:37:03 -04:00
Ben Wheeler	6989fd4ecf	Added SVGs for add to studio modal	2018-06-27 11:38:32 -04:00
Sean Hickey	05fd133f27	Updated LEGO Foundation logo to LEGO Education logo. Removed Thursday dinner from expect page.	2018-06-26 15:04:55 -04:00
Connor Hudson	da1fe6a6fc	Use lib/log instead of console.log for project parsing error	2018-06-26 08:41:06 -04:00
Connor Hudson	5ab0aa50ad	Add min-height: 0 to description block to fix notes layout on Firefox	2018-06-25 16:41:39 -04:00
Connor Hudson	80dfaa6a1e	Use l10n ids in extension chip	2018-06-22 10:01:12 -04:00
Ben Wheeler	ab0ec0f10e	simplified addtostudio modal code	2018-06-22 09:19:44 -04:00
Connor Hudson	1842be2f1a	Add l10n strings for extension chips	2018-06-22 09:16:20 -04:00
Connor Hudson	363c0fdfb5	Update extension parsing in Preview to match updated VM PR	2018-06-22 09:02:11 -04:00
Connor Hudson	2293eebaec	Try to fetch extensions in constructor of Preview	2018-06-21 09:45:53 -04:00
Connor Hudson	5dfbe422d7	Add additional check to getExtensions function	2018-06-21 09:45:32 -04:00
Ben Wheeler	6e4cd63e95	spinner logic works, at least with mocked situation and no request or response from server	2018-06-20 23:12:54 -04:00
Ben Wheeler	0a6ec304d3	starting to change addtostudios modal to make changes on the fly	2018-06-20 20:25:46 -04:00
Connor Hudson	ccfd25d864	Use project ID from state instead of props	2018-06-20 17:08:06 -04:00
Connor Hudson	456e99f1be	Catch errors in getExtensions function	2018-06-20 17:04:16 -04:00
Connor Hudson	b2ddc50529	Remove misplaced getExtensions call in handleReportClick (5!)	2018-06-20 15:58:34 -04:00
Connor Hudson	058b851823	Remove outdated comment from storage.js ... The issue pointed to was fixed by a separate commit.	2018-06-20 13:53:02 -04:00
Connor Hudson	b958567a24	Fix scss lint errors	2018-06-20 10:25:00 -04:00
Connor Hudson	a69ad0ec86	Implement extension fetching in Preview component	2018-06-20 09:55:09 -04:00
Connor Hudson	9f2304b8c9	Add check for extensions prop existence in PreviewPresentation	2018-06-20 09:48:40 -04:00
Connor Hudson	7fb7e9146b	Merge upstream/develop, move logic to preview instead of presentation	2018-06-20 09:28:41 -04:00
Andrew Sliwinski	1fc9ed43a9	Merge pull request #1931 from thisandagain/bugfix/gdpr ... Fix issue with error copy to match new teacher age limit.	2018-06-20 09:18:41 -04:00
Andrew Sliwinski	af1f67a70a	Fix issue with error copy to match new teacher age limit.	2018-06-20 09:06:38 -04:00
Ben Wheeler	c25bfab7bb	improved addtostudio modal variable names	2018-06-20 08:38:16 -04:00
Ben Wheeler	0f819f6a49	addtostudio formatting much closer to design spec	2018-06-20 00:19:52 -04:00
Ben Wheeler	e44b21a712	fixed elusive setState bug in addToStudio modal, by calling setState only when content is confirmed to have changed	2018-06-19 22:43:50 -04:00
Connor Hudson	bd22d573b6	extension-info.js -> extensions.js	2018-06-19 16:18:08 -04:00
Connor Hudson	168e155ac5	Use EXTENSION_INFO file in presentation.jsx	2018-06-19 16:13:47 -04:00
Connor Hudson	7539e74436	Add extension icons, extension info object	2018-06-19 16:13:25 -04:00
Connor Hudson	f7987fd568	Don't display image in extension chip if iconURI undefined	2018-06-19 15:58:54 -04:00
Ben Wheeler	b44c8ab60b	debugger statements back in, some tiny fixes	2018-06-19 15:43:07 -04:00
Ben Wheeler	e89325889b	got gradient overlay working on addtostudio modal	2018-06-19 13:46:17 -04:00
Ben Wheeler	db4e64e4c7	cleaned up debug code, formatting of addtostudio buttons	2018-06-19 12:59:27 -04:00
Connor Hudson	ea1c0ce4a2	Add initial implementation of loading extension info from sb3 project	2018-06-19 12:26:22 -04:00
Ben Wheeler	1b874b748c	further debugging addtostudio modal	2018-06-19 11:26:02 -04:00
Connor Hudson	ca91294b31	Add ScratchStorage subclass for getting project JSON	2018-06-19 11:24:54 -04:00
Ben Wheeler	61dda43b8f	further debugging addtostudio modal	2018-06-19 11:07:25 -04:00
Ray Schamp	5740fe8bf8	Merge pull request #1912 from chrisgarrity/feature/preview-restructure ... Feature/preview restructure	2018-06-19 10:47:40 -04:00
Ben Wheeler	b18ddeedaf	better handling of addtostudio modal scrollbar; attempting to debug its setstate calls	2018-06-19 10:47:17 -04:00
Ben Wheeler	16190f1147	got addtostudio modal state changes to work, though not updating to server yet	2018-06-19 10:13:40 -04:00
Ben Wheeler	bc0a5f64f7	add to studio modal: notes on next steps	2018-06-19 00:14:32 -04:00
Ben Wheeler	e05079a28c	mocked my permissioned studios	2018-06-19 00:00:37 -04:00
Ben Wheeler	4c657a1e80	showing actual studio membership, though not unadded studios yet	2018-06-18 23:36:20 -04:00
Ben Wheeler	847e204efc	add to studio modal scrollbar formatting works	2018-06-18 19:47:43 -04:00
Ray Schamp	9e02798f7b	Lint	2018-06-18 17:19:12 -04:00
Ray Schamp	0c3221f835	Prevent wrapping the notes and credits column	2018-06-18 17:15:56 -04:00
Ben Wheeler	f8df3c0146	added royal blue color, button styles, small jsx fixes to Add to Studio modal	2018-06-18 15:17:19 -04:00
Ben Wheeler	9d9226f4a4	got rid of bug keeping page from displaying	2018-06-16 19:28:28 -04:00
Ben Wheeler	f0fbc0a57f	add to studio modal appears from project page, looks horrendous	2018-06-16 19:13:50 -04:00
Ben Wheeler	20242af3de	preview view comment	2018-06-16 18:19:31 -04:00
Connor Hudson	b826a1ad2f	Add onExtensionAdded function to bindAll call	2018-06-15 09:52:12 -04:00
Connor Hudson	3b09bf145c	Fix hasStatus prop type	2018-06-15 08:47:52 -04:00
Connor Hudson	1f5075f9d8	Initial (hacky) solution for loading EIABCW content	2018-06-14 16:54:55 -04:00
chrisgarrity	7f41771710	Merge pull request #1925 from LLK/hotfix/update-conference ... [HOTFIX] [DEVELOP] - Content updates for Scratch Conference 2018 website (sponsor logos and keynote descriptions)	2018-06-14 16:32:19 -04:00
chrisgarrity	83a27f11c0	Merge pull request #1924 from LLK/hotfix/update-conference ... [HOTFIX] - Content updates for Scratch Conference 2018 website (sponsor logos and keynote descriptions)	2018-06-14 16:31:15 -04:00
Connor Hudson	3eb0e12bf6	Only use extensions with preexisting data URIs for demo chips	2018-06-14 15:11:03 -04:00
Connor Hudson	b40f939566	iconSrc -> iconURI to match CategoryInfo format	2018-06-14 15:10:33 -04:00
Andrew Sliwinski	3f4f413510	Merge pull request #1923 from apple502j/patch-3 ... Change splash to use 30000000	2018-06-14 12:29:17 -04:00
Ray Schamp	1840b9df31	Convert presentation function component ... Fixing a typo let the linter catch that this no longer needs to be a class component	2018-06-14 09:26:44 -04:00
Ray Schamp	4ce05622bc	Move report options from state ... These never change so don't belong there.	2018-06-14 09:22:00 -04:00
Connor Hudson	b317c12e79	Add some mockup extensions	2018-06-13 16:45:48 -04:00
Connor Hudson	e7e0ba720c	Add extension list styles	2018-06-13 16:45:06 -04:00
Andrew Sliwinski	87a039c101	Merge pull request #1919 from thisandagain/bugfix/gdpr ... Use 16 as offset for teacher registration	2018-06-13 16:24:28 -04:00
Connor Hudson	f9dd4e76aa	Add padding to extension status div	2018-06-13 15:35:58 -04:00
Connor Hudson	0733a5dde4	Fix class name for extension icon	2018-06-13 15:32:31 -04:00
Connor Hudson	11af7fec9b	Add extension status styling, tweak margins and spacing	2018-06-13 15:24:19 -04:00
Sean Hickey	8f0b12c2a6	Updated sponsor logos and keynote descriptions	2018-06-13 15:12:50 -04:00
Ray Schamp	add01c8393	Merge pull request #1922 from colbygk/hotfix/funding_redirects ... [Develop] Add donate and connect (email list) redirects	2018-06-13 14:57:50 -04:00
Connor Hudson	a9e8a06c6d	Add props to ExtensionChip	2018-06-13 14:53:41 -04:00
Connor Hudson	0056e93e4a	Add more margin to extension chip content, use rem where it makes sense	2018-06-13 14:53:26 -04:00
Connor Hudson	6bace1b11e	Add ExtensionChip component with demo content	2018-06-13 14:05:20 -04:00
apple502j	070cbe091f	Change splash (GH-1916) ... It uses "30000000 projects" by default now!	2018-06-13 17:32:35 +09:00
Colby Gutierrez-Kraybill	835b33e91e	Add donate and connect (email list) redirects ... * https://scratch.mit.edu/donate → https://secure.donationpay.org/scratchfoundation/ * https://scratch.mit.edu/connect → https://eepurl.com/cws7_f	2018-06-12 18:27:15 -04:00
Andrew Sliwinski	ca6d78d928	Use 16 as offset for teacher registration as per GDPR	2018-06-12 15:40:52 -04:00
apple502j	6bb022107d	Changed link from /help to /tips ... #1909	2018-06-05 18:26:34 +09:00
Andrew Sliwinski	680695d8de	Merge pull request #1902 from Kenny2github/fix-research-link ... Fix the /about research page link	2018-06-04 12:22:57 -04:00
Andrew Sliwinski	8824b64c89	Merge pull request #1904 from apple502j/patch-1 ... Updated link to Scratch Wiki - to new domain	2018-06-04 12:22:19 -04:00
jokebookservice1	f95b05467d	Fix search bar's handling of special characters ... `decodeURI` is used for full URIs, not components thereof.	2018-06-03 13:23:52 +01:00
chrisgarrity	74c76fb1cf	Refactor report-modal ... * addresses comments for https://github.com/LLK/scratch-www/pull/1900 * renames report fields to match scratchr2 expectations * restyle modal to allow display of validation messages * removed cruft	2018-06-01 15:25:28 -04:00
chrisgarrity	47b90d449b	Fix formatting of long project description fields ... Description block also needed to be `display: flex`, and the content was missing the `overflow: auto` to make it scrollable.	2018-06-01 09:45:49 -04:00
chrisgarrity	6872cfc51f	FIxing PR #1900 comments ... addresses most comments except modal refactor, and error response from sumitting report. * restore gui as a dev dependency * better separation of view container/presentation * replace absolute heights for textareas with making all sub components `display: flex` * start to make presentation more modular added subcomponents to the view folder: * share-banner (moved from components) * remix-credit * remix-list * studio-list	2018-05-31 21:04:11 -04:00
chrisgarrity	285b2dbcff	Updated styles	2018-05-31 15:02:45 -04:00
chrisgarrity	db3120091d	Fix lint and don’t duplicate the ‘other’ string	2018-05-31 15:02:45 -04:00
chrisgarrity	c6f197f576	Adjust share-date to give action buttons more room	2018-05-31 15:02:45 -04:00
chrisgarrity	0bc5bf745d	Fix up stats line ... * Update for newer version of API - remix count in stats * create projectShape to remove duplication * add approximate-number to limit the size of the stats row.	2018-05-31 15:02:45 -04:00
chrisgarrity	71dfe690be	First pass at correcting project input styles ... * Add placeholders to description input text-areas * fix styling to show box shadow highlight on focus * adjust height for non-remix project * fix lint errors	2018-05-31 15:02:45 -04:00
chrisgarrity	08cf4f4f3d	Refactor report modal ... * move all the report modal presentation into the component * add strings to general l10n file because we don’t handle l10n files in components * Add current project id and username to the data before submitting	2018-05-31 15:02:44 -04:00
chrisgarrity	34042c9e8e	Report first pass ... Report button opens a modal with the report project form. All the content is currently in `preview/presentation` because components cannot have their own l10n files.	2018-05-31 15:02:44 -04:00
chrisgarrity	bd391b422a	presentation first pass ... First pass at project page design using actual assets from Carl, and matching styles with current design. Includes a (negative margin) hack to line up the stage. see https://github.com/LLK/scratch-gui/issues/2132	2018-05-31 14:58:23 -04:00
chrisgarrity	81ac8eeef2	Merge pull request #1907 from LLK/hotfix/conference-2018 ... [DEVELOP]: Hotfix/conference 2018	2018-05-31 14:49:54 -04:00
chrisgarrity	99ed30e2c8	Fix up favorites ... Found a couple of typos now that API can process favorites.	2018-05-30 14:39:25 -04:00
apple502j	2c6ffd6fd9	Updated link to Scratch Wiki - to new domain	2018-05-30 20:14:03 +09:00
Ken	5deff9c9bd	Fix the /about research page link	2018-05-30 11:17:40 +08:00
Sean Hickey	f86bd5b84b	Fixed up page/render include order. Fixed up code readability issue in details page.	2018-05-29 11:07:08 -04:00
Sean Hickey	f54379e0d7	Cleaned up linter errors	2018-05-29 11:07:08 -04:00
Sean Hickey	fd24fbacef	Updated asset paths	2018-05-29 11:07:08 -04:00
Sean Hickey	9ef187aada	Updated conference pages for 2018	2018-05-29 11:07:07 -04:00
chrisgarrity	80de164d02	Handle See inside button (#1890) ... * Handle See inside button Import GUI reducers, initial state and middleware (throttle). Update render to handle state and middleware. Remove preview mode state and use scratchGui.mode from redux instead. URL is getting updated, and mode will be updated based on URL. However, the history needs work - it doesn’t work with the modal back. * Update to latest GUI This is the minimum version of GUI that is needed for see-inside * Really remove cruft.	2018-05-24 16:23:07 -04:00
Andrew Sliwinski	c0ac741065	Remove link from email address	2018-05-23 09:55:56 -04:00
Andrew Sliwinski	0a7bcdf907	Fix mailto link	2018-05-23 09:55:52 -04:00
Andrew Sliwinski	311d7e5959	Fix links to account settings / password	2018-05-23 09:55:48 -04:00
Andrew Sliwinski	59ca64579e	Fix typo	2018-05-23 09:55:42 -04:00
Andrew Sliwinski	244a76149b	Resolve lint issues	2018-05-23 09:55:36 -04:00
Andrew Sliwinski	f6a11e1c43	Update default 'opt-in' state for teacher registration	2018-05-23 09:55:27 -04:00
Andrew Sliwinski	71af5978ad	Update privacy policy	2018-05-23 09:55:08 -04:00
Andrew Sliwinski	f19a6c6196	Remove link from email address	2018-05-22 16:15:26 -04:00
Andrew Sliwinski	7241164cf7	Fix mailto link	2018-05-22 09:59:08 -04:00
Andrew Sliwinski	8b9df4857f	Fix links to account settings / password	2018-05-22 09:58:17 -04:00
Andrew Sliwinski	495d9e1177	Fix typo	2018-05-22 09:24:36 -04:00
Andrew Sliwinski	585a2e6686	Merge pull request #1891 from thisandagain/hotfix/privacy ... [Develop] Hotfix - Update Privacy Policy	2018-05-21 17:15:21 -04:00
Andrew Sliwinski	88e99e655b	Resolve lint issues	2018-05-21 17:04:50 -04:00
Andrew Sliwinski	d78d78e1fa	Update default 'opt-in' state for teacher registration	2018-05-21 15:55:42 -04:00
Andrew Sliwinski	881c2affa4	Update privacy policy	2018-05-21 15:55:21 -04:00
Andrew Sliwinski	32fc959ed2	Remove references to Linux in download l10n strings	2018-05-16 09:44:11 -04:00
Andrew Sliwinski	a302d37eef	Remove references to Linux for the Scratch 2.0 offline editor. Resolves GH-1880	2018-05-15 10:19:12 -04:00
chrisgarrity	6df58e41fd	Correct preview route for fastly ... - use more explicit route - handle fastly error in the callback correctly - more succinct parsing of the URL path	2018-05-02 17:04:14 -04:00
chrisgarrity	d1420862ea	Initial GUI embed (#1869) ... - `/preview/editor` will load GUI with an empty project - `/preview/:id/editor` will load GUI with a project from the projects server (not local data) - passes intl object to GUI - `/preview/:id` with show the project page with an embedded player - `/preview/:id/fullscreen` will load the project page with the player in fullscreen mode. * Note that we needed to Increase memory for the build to avoid running out of heap space, and build time increases by about 2 minutes	2018-05-02 15:27:49 -04:00
chrisgarrity	65e7657680	Merge pull request #1868 from LLK/hotfix/close-conf-reg ... [DEVELOP] Close registration when full	2018-04-26 15:00:22 -04:00
chrisgarrity	b8326a3d57	Feature/preview project2 (#1856) ... * Add user-session awareness - only show remix button if user is logged in (TBD: probably will want to hide if project creator == user) * decorate text with @mentions and #hashtags * Add studios, loves, favs * In-place editing of title and description if current user is author and project shared (with validation)	2018-04-24 11:00:47 -04:00
Ray Schamp	c173922df6	Merge pull request #1861 from LLK/hotfix/conference-remove-dorm ... [Develop] Remove dorm information from 2018 Conference page	2018-04-23 16:38:53 -04:00
Ray Schamp	9816846409	Merge pull request #1862 from LLK/hotfix/remove-recent-row ... [Develop] remove recent projects row	2018-04-23 16:37:58 -04:00
chrisgarrity	520bd21cf2	remove obsolete l10n message	2018-04-23 16:29:51 -04:00
chrisgarrity	8cd28baef4	Remove recently shared row	2018-04-20 17:33:38 -04:00
chrisgarrity	ce6d78c715	Remove NEU dorm accomodations ... Dorms are no longer available. Fixes #1851	2018-04-19 17:06:58 -04:00
seotts	9ab5cc9e5c	added p around list	2018-04-10 16:33:41 -05:00
Andrew Sliwinski	b544ccdaa7	Merge pull request #1846 from apple502j/develop ... Added Giga	2018-04-09 08:26:10 -04:00
Ray Schamp	417791b589	Merge pull request #1849 from LLK/release/march-2018 ... [Develop] March 2018 Release	2018-04-05 17:01:47 -04:00
apple502j	3a6c182087	Added Giga	2018-04-04 08:36:04 +09:00
Ray Schamp	52a5d929d1	Render messages inline ... This omits `for...of` which requires Symbol. The Symbol polyfill required by Babel for `for...of` apparently doesn't work for the react-tooltip library. So just don't use `for...of`.	2018-04-03 17:27:06 -04:00
Ken	68ae157bbf	Add /info/research redirect	2018-04-03 21:13:30 +08:00
Kenny2github	a516e8d9be	Lint	2018-04-03 19:28:53 +08:00
Kenny2github	bf8baaf7d0	Fix everything ... *Updated to new convention for InformationPages +Added route in routes.json (might be missing previous /info/research path) -Removed package-lock.json to fix conflicts *Updated l10n to not use HTML	2018-04-03 16:22:36 +08:00
Ray Schamp	2f8017bb89	Lint	2018-04-02 17:04:54 -04:00
Ray Schamp	a01cb1962e	Use empty string for placeholder value ... Fixes React warning about using `selected` prop on `select` component options	2018-04-02 15:16:19 -04:00
chrisgarrity	19039a4905	Catch empty phone number	2018-04-02 13:49:45 -04:00
chrisgarrity	730835c4be	Fix validation and lint errors ... * checkbox needed a default value * general-error is passed a ref by formsy - cannot be stateless function * add missing `label` prop to input field * add missing proptypes to phoneinput.	2018-04-02 12:26:12 -04:00
Ray Schamp	191a95eb76	Resurrect phone input validation	2018-03-30 13:45:42 -04:00
Ray Schamp	41780fb7cb	Finish updating react-telephone-input	2018-03-30 12:11:21 -04:00
Ray Schamp	ad81dba61b	Finish linting	2018-03-30 11:28:59 -04:00
Ray Schamp	9001e6ba5c	Lint	2018-03-30 11:21:41 -04:00
chrisgarrity	7c46f6957a	Fix up student registration	2018-03-30 10:51:23 -04:00
chrisgarrity	67f292037a	Correcting teacher registration for react16	2018-03-30 10:51:22 -04:00
Ray Schamp	55a45349da	WIP - update phone input	2018-03-30 10:51:22 -04:00
chrisgarrity	53ca763646	Add Error Boundary and Crash message ... Added all the strings to general l10n as error boundary/crash message applies to all pages.	2018-03-30 10:51:22 -04:00
Ray Schamp	79665e5986	Fix warnings on About	2018-03-30 10:49:58 -04:00
Ray Schamp	f375130190	Remove unrecognized props from Input ... In the process, make Input into a stateless component, since apparently this state isn't ever changed.	2018-03-30 10:49:58 -04:00
Ray Schamp	34f39b1c0b	Update to React 16, and dependent packages ... The Splash page renders with this commit.	2018-03-30 10:49:58 -04:00
Ray Schamp	61c2bb148a	Use country data from an NPM package ... To prepare to upgrade react-telephone-input which removed this module	2018-03-30 10:49:58 -04:00
Kenny2github	82c651cece	A New Beginning	2018-03-27 18:33:10 +08:00
chrisgarrity	b7900aca05	Merge pull request #1833 from chrisgarrity/feature/preview-project ... Feature/preview project - part 1 (elements 'above the fold')	2018-03-21 10:29:01 -04:00
chrisgarrity	1b2050c58a	cleanup	2018-03-20 20:19:48 -04:00
chrisgarrity	c5ea057974	Merge pull request #1835 from JoelGritter/patch-2 ... Fix #1825	2018-03-19 10:00:38 -04:00
Joel Gritter	536e4c7e0b	Remove filled jobs ... Removed: Designer, Learning Resource Designer, QA Engineer, Senior Backend Engineer	2018-03-17 18:50:04 -04:00
Joel Gritter	316a36f1ed	Fix gh-1824: Add note about real names (#1830) ... * Add note about real names as a new string Fixes gh-1824	2018-03-16 16:18:17 -04:00
chrisgarrity	1c6b0dd64c	Cleanup ... Fixing lint problems and removing (most) unused code. I left user and session as they will get used soon even though they aren’t currently.	2018-03-15 17:40:16 -04:00
Andrew Sliwinski	7bf690df5e	Merge pull request #1821 from ktrvs/ktrvs-update-privacy-policy ... Update privacy policy to be more clear. | Fixes #1803	2018-03-15 13:00:48 -04:00
chrisgarrity	9545e53c98	Close registration when full ... Hotfix ready to deploy when conference registration has filled up.	2018-03-15 09:00:49 -04:00
chrisgarrity	f836c6e3a8	Adding in remix metadata ... - Moved preview state into redux - Gets remix credit if the project is a remix - Shows up to 5 remixes (direct children?) - handles empty remixes result (it’s not an array) - Added Column component - based on Grid, but doesn’t use frameless to set width. - allows trailing ‘/‘ on the URL - cleaned up conditional content	2018-03-14 15:50:27 -04:00
chrisgarrity	79199d6d32	Placeholders for everything ‘above the fold’	2018-03-08 15:57:19 -05:00
chrisgarrity	2d6327ba01	Update Northeastern accomodation info	2018-02-28 14:08:16 -05:00
chrisgarrity	f86bd01609	Remove obsolete code	2018-02-28 13:58:22 -05:00
Kerr	cf40bea072	Update privacy policy	2018-02-28 12:50:37 +00:00
chrisgarrity	ea6de54104	[WIP]: embed GUI in a preview page	2018-02-21 14:39:21 -05:00
chrisgarrity	1d42674651	Conference March 1 update ... - Add buttons that link to conference registration - Updated FAQ copy	2018-02-21 11:19:13 -05:00
Kerr Travers	2d98faf160	Update footer.jsx	2018-02-14 16:32:24 +00:00
Ray Schamp	788d24b0f0	Merge pull request #1806 from LLK/release/2.2.27-jan ... [Develop] January 2018 Release	2018-02-13 10:49:55 -05:00
Ray Schamp	2617dc95d1	Add Full Stack Engineer job post ... Also reorder existing posts to be alphabetical	2018-02-12 13:33:20 -05:00
Ray Schamp	c6f7681197	Fix merge issues	2018-02-12 09:26:39 -05:00
Ray Schamp	5513b6a7e9	Merge branch 'develop' of github.com:LLK/scratch-www into issue/gh1400-load-more-button-behavior ... # Conflicts: # src/views/search/search.jsx	2018-02-08 10:42:04 -05:00
chrisgarrity	aff3c33817	Merge pull request #1796 from chrisgarrity/hotfix/conf2018-feb5 ... [DEVELOP] Hotfix Conference page to close session proposals	2018-02-05 08:41:27 -05:00
chrisgarrity	a5f2121fea	Another hotel update	2018-02-02 10:25:12 -05:00
chrisgarrity	901ec9d2f1	Update hotel links	2018-02-02 09:23:46 -05:00
St19_Galla	15982b5699	Fix gh-1780: Corrects Link on About Page (#1781) ... * Update about.jsx * shorten	2018-02-01 17:26:34 -05:00
Linda	358ac9a5b9	fixes #1764/reduce string duplication in teaacher registration (#1791)	2018-02-01 17:25:55 -05:00
Arav Narula	2799d12069	Update credits.jsx (#1770) ... * Update credits.jsx * Fix up ES6 changes.	2018-02-01 17:24:28 -05:00
Ray Schamp	25a1280cca	Merge pull request #1759 from towerofnix/fix-firefox-focusring ... Hide Firefox focus ring on <select> elements (language selector)	2018-02-01 09:29:09 -05:00
chrisgarrity	2989857dbe	Update Conference page to close session proposals ... Fixes #1782, needs to be hotfixed on Feb 5	2018-01-31 17:14:42 -05:00
Ray Schamp	cbc5bbd565	Fix search tabs	2018-01-31 13:00:27 -05:00
Ray Schamp	83db222e28	Fix "Load More" on search ... Concatenating a number with null results in NaN, and when NaN was used as an API query argument, resulted in a 503.	2018-01-30 10:50:05 -05:00
Ray Schamp	0054424b9d	Restore JSON linting	2018-01-30 10:36:08 -05:00
Ray Schamp	53d3bb94dc	Revert "Merge pull request #1787 from LLK/revert-1786-hotfix/es6-upgrade" ... This reverts commit 5ce1a9f411, reversing changes made to 5be4c45f08.	2018-01-30 10:33:15 -05:00
Ray Schamp	c7c92c49f7	Revert "[Master] Upgrade to ES6"	2018-01-30 09:53:25 -05:00
chrisgarrity	a7532c49db	Fix projects curated row ... Changed the localization string to use a placeholder to allow translators to re-order if needed. Also added preview-faq to the transifex config.	2018-01-29 14:22:23 -05:00
Ray Schamp	57cc6f8770	Fix padding on Privacy Policy page	2018-01-29 14:18:57 -05:00
Ray Schamp	2ac6ed4c73	Use a prop for refreshSession ... Since dispatch is not passed in anymore.	2018-01-29 14:16:59 -05:00
Ray Schamp	99c1f3f0b8	Avoid adding click event properties to formData ... Setting onClick to onNextStep directly caused click event data to be passed in handleAdvanceStep, which then merged it with the formData state in student registration. This caused issues.	2018-01-29 14:00:29 -05:00
Ray Schamp	2df911259d	Disable no-multi-comp completely for steps.jsx	2018-01-29 14:00:29 -05:00
chrisgarrity	7b15ef2363	Handle search queries	2018-01-29 13:07:48 -05:00
chrisgarrity	404dc4b04c	Ensure dropdown links are always white ... Add state pseudo classes to make the style more ‘specific’	2018-01-29 10:54:32 -05:00
chrisgarrity	0841dc93e7	Fix tips modal	2018-01-29 10:08:17 -05:00
chrisgarrity	4633086bf3	Remove blue outline around modals	2018-01-29 08:56:03 -05:00
chrisgarrity	f8473b6bc8	Fix FormattedMessage ids	2018-01-26 13:26:13 -05:00
chrisgarrity	0d3db461c4	Fix other page header padding issues	2018-01-25 17:17:45 -05:00
chrisgarrity	273227aab4	Remove extra padding from FAQ page header ... Reorder the import of InformationPage and Page.	2018-01-25 17:06:35 -05:00
chrisgarrity	484c949a92	Remove extra space before messages view ... MessagesPresenation has to be loaded after Page.	2018-01-25 16:35:38 -05:00
Ray Schamp	ff211e312e	Fix teacher registration starting step	2018-01-25 15:44:00 -05:00
Ray Schamp	560538f046	Lint	2018-01-25 15:25:39 -05:00
Ray Schamp	911ba64444	Merge branch 'develop' of github.com:LLK/scratch-www into hotfix/es6-upgrade	2018-01-25 15:23:07 -05:00
Ray Schamp	2a64d61fed	Fix registration modal close behavior	2018-01-25 15:01:42 -05:00
Ray Schamp	6036fa79bc	Fix homepage row links	2018-01-25 14:48:09 -05:00
Andrew Sliwinski	ad3189c164	Merge pull request #1768 from LiFaytheGoblin/gh-1751/add_abkhaz_to_languages_menu ... Gh 1751/add abkhaz to languages menu	2018-01-24 14:46:56 -05:00
Ray Schamp	d5411ca20b	Fix dropdown opening	2018-01-23 13:58:09 -05:00
Ray Schamp	f6bffd4192	Merge branch 'develop' of github.com:LLK/scratch-www into hotfix/es6-upgrade ... # Conflicts: # src/views/developers/developers.jsx	2018-01-23 09:50:33 -05:00
Matthew Taylor	6d1f2fbccd	initial es6 commit	2018-01-19 14:06:26 -05:00
LiFaytheGoblin	6341ff4085	Whoops, I somehow deleted the free line at the end, so here, I put it back again...	2018-01-17 13:58:58 +01:00
chrisgarrity	83f0cc1e18	Add a closing paren ... Translators can’t translate a string with unbalanced paren’s.	2018-01-16 10:52:07 -05:00
LiFaytheGoblin	10fb7e032a	up to date	2018-01-15 20:23:24 +01:00
Ken	df070935a3	Move period and migrate to FormattedMessage (#1757) ... * Move period * update l10n with new msg format * update jsx to use FormattedMessage instead of FormattedHTMLMessage	2018-01-13 12:05:29 -05:00
Florrie	9e487c8527	Fix CSS rule order	2018-01-12 11:51:11 -04:00
Strudy	14e29c547d	Add Changes to scratch conf website (#1746) (#1748) ... * Update l10n.json	2018-01-11 08:37:17 -05:00
Matthew Taylor	ade9ccef81	Add back in FPC and recently shared rows ... There appears to have been a merge issue between the hotfixes around CSEdWeek and the implementation of the splash refactor, so this rectifies that error.	2018-01-10 17:43:14 -05:00
Matthew Taylor	380be6b5c1	copy state before assigning values ... otherwise, redux won’t recognize a change in values	2018-01-09 16:44:32 -05:00
Matthew Taylor	080df8673b	fix typo in become curator import	2018-01-09 14:58:08 -05:00
Matthew Taylor	3e7bb349ba	match props to rows, rather than object ... this was not detecting row updates well on re-render	2018-01-09 14:47:45 -05:00
Matthew Taylor	c7d4a70878	handle spacing for list items	2018-01-09 13:06:20 -05:00
Matthew Taylor	e4611088ff	extract faq from published page ... after review from @thisandagain – thanks!	2018-01-09 12:55:36 -05:00
Matthew Taylor	85d6636c28	remove superfluous import	2018-01-08 13:42:25 -05:00
Matthew Taylor	3e7ccc6207	Add preview faq page ... Implements #1711	2018-01-08 13:39:29 -05:00
Florrie	ab107f865c	Hide Firefox focus ring ... See this StackOverflow answer: https://stackoverflow.com/a/18853002/4633828 This isn't a perfect fix - we have to set `color` explicitly, rather than use `inherit`, because we want the text color to be the same when the select element is focused. That means both `color` and `text-shadow`'s color have to be explicitly set to the same thing (otherwise they might not match). Yay, hacks!	2018-01-05 13:37:06 -04:00
Florrie	870b916db3	Only transition border property ... ..since it's the only property which actually animates. (The background image also changes on hover/focus, but that isn't visually effected by transition, so we ignore it.) This is for the next commit. Without this, the focus ring slowly disappears, and the text slowly becomes the color it's meant to be; neither of those are good.	2018-01-05 13:34:57 -04:00
Matthew Taylor	53acea2112	Merge pull request #1670 from mewtaylor/issue/whats-happening ... Implement GH-1628: Use new activity endpoint	2017-12-18 14:59:10 -05:00
Ray Schamp	7a00acf737	Merge pull request #1744 from LLK/hotfix/conference-route ... [Develop] Ignore querystring when routing conference page	2017-12-18 12:42:19 -05:00
Ray Schamp	6c39953c5b	Ignore querystring when routing conference page ... There should be a generalized solution for this, but my attempts have failed thus far.	2017-12-18 11:50:04 -05:00
chrisgarrity	e0461ca77a	Merge pull request #1738 from LLK/hotfix/revert-HOC-banners ... [DEVELOP] Hotfix/revert hoc banners	2017-12-15 15:51:10 -05:00
Sheshank Shankar	240606b3d0	Fixes #1702: Scratch Conference site - small edits (#1727) ... Update the conference page with new banner image and small copy edits.	2017-12-13 15:25:12 -05:00
chrisgarrity	04e1e36978	revert 2017 HoC top and middle banners	2017-12-12 11:21:35 -05:00
Sheshank Shankar	cc0451ec7b	Fixes #1702: Scratch Conference site - small edits (#1727) ... Update the conference page with new banner image and small copy edits.	2017-12-12 10:27:24 -05:00
Andrew Sliwinski	3c9d7eb57a	Clarify licensing of trademarks in FAQ (#1735) ... * Clarify logo licensing in FAQ	2017-12-11 17:02:11 -05:00
Kerr Travers	d3b8acbb56	Fixes #1700 | Update about page (#1714) ... Fixes #1700 adds 'Siegel Family Endowment' to the credits. Also changes all uses of `FormattedHTMLMessage` to `FormattedMessage` with placeholders.	2017-12-11 15:16:06 -05:00
Carl-Myer R. Flor	36b90980a6	Adds button behavior for various search result state	2017-12-11 23:24:02 +08:00
Matthew Taylor	24e65e707f	Revert "[Master] temporarily take out curator row and recently shared row"	2017-12-11 08:40:16 -05:00
Kerr Travers	34093e6aa9	Fixes #1728 | Add new member to credits (#1729)	2017-12-07 13:02:00 -05:00
Ray Schamp	21c73e92e2	Merge pull request #1715 from mewtaylor/hotfix/temp-row-remove ... [Master] temporarily take out curator row and recently shared row	2017-12-03 14:32:46 -05:00
Matthew Taylor	67dec709a0	Merge pull request #1716 from mewtaylor/hotfix/temp-row-remove ... [Develop] temporarily take out curator row and recently shared row	2017-12-03 13:26:48 -05:00
The_Grits	d0f365ffde	[develop] hoc2014 redirect hotfix	2017-12-02 12:20:50 -05:00
The_Grits	8f830c2a04	[master] hotfix hoc2014 redirect	2017-12-02 12:19:45 -05:00
Matthew Taylor	9fbd5b691c	temporarily take out curator row and recently shared row	2017-12-01 15:12:49 -05:00
chrisgarrity	ec507b73c5	Merge pull request #1654 from chrisgarrity/feature/hoc-2017 ... Top and middle banners for HoC 2017	2017-12-01 13:22:31 -05:00
Kerr	8722a1d374	Update jobs.jsx	2017-11-29 22:12:24 +00:00
Matthew Taylor	bfff01f024	Merge branch 'hotfix/avatar-endpoint' into develop ... * hotfix/avatar-endpoint: fall back to default image if thumb not found	2017-11-29 08:04:17 -05:00
Matthew Taylor	02da6f62a6	fall back to default image if thumb not found ... This incorporates a fallback image into the thumbnail component for all of project, studio and avatar thumbnails using the `onerror` property of img elements (which is supported across all browsers). /cc @thisandagain @rschamp	2017-11-29 08:03:48 -05:00
Matthew Taylor	ea90dc9309	Merge pull request #1699 from mewtaylor/hotfix/avatar-endpoint ... [Develop] Hotfix: Change avatar to use `uploads` endpoint	2017-11-28 15:33:14 -05:00
Matthew Taylor	be7e83db78	Change avatar to use uploads endpoint	2017-11-28 14:01:55 -05:00
Matthew Taylor	6524856bf1	use parentheses around message values ... for readability. thanks @rschamp!	2017-11-27 16:25:57 -05:00
Matthew Taylor	8ea1f621ef	use mapDispatchToProps ... thanks @rschamp!	2017-11-27 16:25:19 -05:00
Sheshank Shankar	3e52bc7fc5	Make Conference logo button link to homepage.	2017-11-21 16:51:11 -08:00
Matthew Taylor	87146c3193	Merge branch 'hotfix/dec-1' of https://github.com/LLK/scratch-www into develop ... * 'hotfix/dec-1' of https://github.com/LLK/scratch-www: update transifex config to reflect new conference page fix lint update translations to just use `FormattedMessage` Change back routeAlias for conference pages Add Learning Resource designer (#1676) Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673) Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) (#1663) # Conflicts: # src/routes.json # src/views/conference/2018/index/index.jsx # src/views/conference/2018/index/l10n.json	2017-11-21 17:14:19 -05:00
Matthew Taylor	666a893dad	fix lint ... whoops!	2017-11-21 14:19:18 -05:00
Matthew Taylor	d55caf7e96	update translations to just use FormattedMessage	2017-11-21 11:17:35 -05:00
Matthew Taylor	2acf90ba41	Change back routeAlias for conference pages ... These are needed to ensure that fastly doesn’t 404 on the 2016 and 2017 sites.	2017-11-21 09:25:42 -05:00
Sheshank Shankar	3283904bb9	Add Learning Resource designer (#1676)	2017-11-21 09:19:45 -05:00
Sheshank Shankar	4f14dfcbe3	Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673) ... * add 2018 conference page (new subdirectory and index page) * Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences. * Update mailto link in the footer	2017-11-21 09:19:37 -05:00
Sheshank Shankar	4ae8edd193	Add Learning Resource designer (#1676)	2017-11-20 09:13:11 -05:00
Sheshank Shankar	2ba03708c3	Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673) ... * add 2018 conference page (new subdirectory and index page) * Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences. * Update mailto link in the footer	2017-11-20 09:12:12 -05:00
Matthew Taylor	91a0e865ad	Use new activity endpoint ... This also moves homepage row retrieval into redux to further move towards using redux to handle functionality. This implements #1628.	2017-11-15 12:49:23 -05:00
Kerr	f2f51453bf	Update l10n.json	2017-11-14 17:48:47 +00:00
chrisgarrity	ef4f851e6d	Switch CTA button based on logged in state ... Invite logged-out users to ‘Get Started with Coding!’, and make the whole Scratch animation clickable (goes to the Animate a Name tutorial). See #1664	2017-11-08 16:53:42 -05:00
chrisgarrity	048d5c1383	Switch CTA button based on logged in state ... Invite logged-out users to ‘Get Started with Coding!’, and make the whole Scratch animation clickable (goes to the Animate a Name tutorial). See #1664	2017-11-08 16:50:14 -05:00
chrisgarrity	3de61d092f	Merge pull request #1662 from chrisgarrity/feature/hoc-2017 ... Feature/hoc 2017	2017-11-08 14:36:03 -05:00
Matthew Taylor	081e3c5327	Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) (#1663) ... * Adds fix to #1644 * Update l10n.json * Add files via upload * Add files via upload * Delete index.jsx * Delete index.scss * Delete l10n.json * Update index.jsx * Update l10n.json * Update l10n.json * Update index.jsx	2017-11-08 13:30:16 -05:00
chrisgarrity	60a2a51bb5	minor formatting changes for consistency	2017-11-08 09:04:33 -05:00
Sheshank Shankar	c143d6c706	Fixes #1645 and #1644 (#1646) ... * Fixes #1645 * Fixes #1644 as well * hopefully this should fix it * Update download.jsx * Update download.jsx	2017-11-07 17:31:52 -05:00
The_Grits	39c6915884	Fix gh-1634: Fix Localization on Developers Page (#1636) ... * Add ScratchJr Section Localization * Add Localization for ScratchJr and "Projects" * Update ScratchJr String / Remove ScratchJr Title * Readd "ScratchJr"	2017-11-07 17:30:11 -05:00
Sheshank Shankar	58ddff4001	Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) ... * Adds fix to #1644 * Update l10n.json * Add files via upload * Add files via upload * Delete index.jsx * Delete index.scss * Delete l10n.json * Update index.jsx * Update l10n.json * Update l10n.json * Update index.jsx	2017-11-07 16:42:53 -05:00
chrisgarrity	4fe3997df4	Top and middle banners for HoC 2017 ... Css animated top banner Middle banner of activities - responsive https://github.com/LLK/scratchr2/issues/4869 Also updated ttt see-more/open- modal link to be consistent with the new icon from Carl.	2017-11-03 16:50:26 -04:00
Matthew Taylor	8489918805	resolve typo ... I think this happened when I was resolving a merge conflict, and I confused the naming from previous/new along the way. Thanks @jwzimmer! Fixes #1652	2017-11-03 10:16:01 -04:00
Matthew Taylor	a1da26b0c9	Point at @GulpTea’s avatar	2017-10-30 08:39:42 -04:00
Matthew Taylor	18f82fce3f	Merge branch 'issue/gh-1546' into develop ... * issue/gh-1546: Make api request on filter change render load more even if messages not there # Conflicts: # src/views/messages/container.jsx # src/views/messages/presentation.jsx	2017-10-26 08:41:54 -04:00
Matthew Taylor	361afaa937	Make api request on filter change ... This fixes #1546 by using an updated api endpoint that accepts filter arguments.	2017-10-24 13:10:32 -04:00
The_Grits	cfa55d98e8	Fix gh-1588: Localize "it's free!" String (#1594) ... * Add it's free string * Add it's free string into page * Update presentation.jsx	2017-10-23 11:11:33 -04:00
KT	16f312b0fa	Fix #1612 (#1616) ... * Adding new mods and moving others to "Previous MIT Scratch Team Members" maintaining alphabetical order	2017-10-12 08:26:47 -04:00
Ken	b2e7d57f5a	Resolves #1614 (#1615) ... Email Settings -> Email	2017-10-11 17:07:48 -04:00
Matthew Taylor	a1675cbb7d	hide overflow on comment component (#1611) ... fixes #1568 by imposing a hidden state on overflow text.	2017-10-11 10:09:02 -04:00
Sheshank Shankar	5321712a25	Fix typos in Teacher Accounts FAQ. Resolves GH-1608	2017-10-09 13:49:19 -04:00
Sheshank Shankar	ce7bcd3409	Fix typos in FAQ. Resolves GH-1604	2017-10-08 11:00:31 -04:00
Sheshank Shankar	d99f503002	Fix typo in FAQ. Resolves GH-1601	2017-10-08 10:13:31 -04:00
KT	0301618b9c	Updates to community moderation listing. Resolves GH-1442 Resolves GH-1596 ... * Removing moderator job listing * Update moderator.jsx	2017-10-08 10:00:09 -04:00
Ken	36cb865f89	Fix TOS and messages typos. Resolves GH-1593 Resolves GH-1595 ... * fix typo "many not" -> "may not" * Fix typo in l10n.json while I'm at it	2017-10-08 09:58:06 -04:00
Sheshank Shankar	5f4256e7d7	Add Link to profile pic (#1576) ... * Add Link to profile pic * Update comment-message.jsx * Double-Quotes to Single-Quotes * fix indentation * Update comment-message.jsx * Update comment-message.jsx * Update comment-message.jsx	2017-10-04 15:58:24 -04:00
Matthew Taylor	161f50611c	Merge pull request #1590 from mewtaylor/hotfix/message-count-endpoint ... [Develop] Hotfix: change message count endpoint	2017-10-03 16:49:07 -04:00
Matthew Taylor	75217978c1	Switch message count to new endpoint	2017-10-03 16:37:00 -04:00
Matthew Taylor	2830257b17	Merge pull request #1589 from LLK/release/2.2.25 ... [Develop] Release 2.2.25	2017-10-03 15:14:26 -04:00
Matthew Taylor	37131df008	Handle message count split in container ... Fixes issue where admin messages caused social messages to display as unread when they weren’t	2017-10-03 12:53:49 -04:00
Matthew Taylor	d272a2e4e6	Handle case of messages length being less than unreadcount ... this fixes #1561 by making sure that if the count is retrieved before the messages themselves, there is no error in the console.	2017-10-02 10:33:53 -04:00
Sheshank Shankar	e8671c1727	Add Tina Quach to Credits. Resolves GH-1572 ... * Add Tina Quach to Credits * Update credits.jsx * Update credits.jsx	2017-09-26 11:10:58 -04:00
chrisgarrity	1d08a9e201	Rename AnimateYourNameGuide to NameGuide ... remove obsolete static URL so localizations get picked up correctly. git-ignore localized-urls.json as it’s pulled from scratch-resources now.	2017-09-25 17:16:58 -04:00
Andrew Sliwinski	d542f18e74	Merge pull request #1552 from VutonDesign/patch-1 ... Rewording | 10n.json	2017-09-20 07:57:38 -04:00
Matthew Taylor	c9eacf4ac3	Merge pull request #1559 from mewtaylor/issue/gh-1545 ... Fix GH-1545: add `unread` as a key/value on each message	2017-09-19 17:18:42 -04:00
Matthew Taylor	129042fce6	Merge pull request #1553 from mewtaylor/issue/gh-1455 ... GH-1455: apply path explicitly rather than in `defaults`	2017-09-19 17:14:00 -04:00
Matthew Taylor	a9cb7bbd99	don’t iterate over list if no filter applied ... thanks @chrisgarrity !	2017-09-19 17:11:46 -04:00
chrisgarrity	5f48fc13e8	Link to pt-br downloads if locale is pt-br (#1558) ... * Link to pt-br downloads if locale is pt-br	2017-09-19 11:56:30 -04:00
Matthew Taylor	9b3b1a2623	render load more even if messages not there ... This handles #1546 by still checking about whether to display the loadMore button even if messages are not present (i.e. if a subfilter has no messages present).	2017-09-19 10:30:14 -04:00
Matthew Taylor	4fa3c0f761	Merge pull request #1551 from mewtaylor/issue/gh-1540 ... Fix GH-1540: Direct studio activity link to the activity tab	2017-09-19 10:18:18 -04:00
Matthew Taylor	8c631b40d9	add unread as a key/value on each message ... This fixes #1545 by adding unread as a key/value on each message during the filtering process. This means the unread count is always applied to the list of full messages, and never to a subset (as was happening before to cause #1545).	2017-09-19 10:13:52 -04:00
Matthew Taylor	9a3358b35c	provide a default opts if it’s undefined	2017-09-18 14:40:52 -04:00
Ray Schamp	5245123a4c	Merge pull request #1555 from rschamp/hotfix/qa-engineer ... [Develop] Add QA Engineer posting	2017-09-18 14:16:19 -04:00
Ray Schamp	62ad6ff51f	Add QA Engineer posting	2017-09-18 11:48:01 -04:00
Matthew Taylor	4175c119d2	apply path explicitly rather than in defaults ... This should fix #1455 by preventing the path from being changes via opts passed in, even though we don’t pass in a `path` anywhere.	2017-09-18 11:44:06 -04:00
Vuton Design	20ce38e8d0	Update l10n.json	2017-09-16 09:30:34 +01:00
Linda	e119cea627	Fixes GH-1435/Reduce work for translators on credits page (#1514) ... * Fixes GH-1435/Make as many names as possible on credits page non-translate * fixed the travis error that occured before	2017-09-15 17:24:41 -04:00
Matthew Taylor	1335de9b57	Direct studio activity link to the activity tab ... Fixes #1540 by ensuring that the anchor link for studio activity is directed to the activity tab of the studio	2017-09-15 15:49:57 -04:00
LiFaytheGoblin	aa8efd0bc9	fixed the travis errors that occured earlier	2017-09-15 14:34:21 +02:00
Matthew Taylor	426259fbe8	Merge pull request #1542 from mewtaylor/issue/manager-thumbnail-activity ... [Develop] Hotfix: use recipient thumbnail, not actor for manager activity	2017-09-13 14:11:50 -04:00
Matthew Taylor	d4b0207bb0	clean up stuff	2017-09-13 13:51:17 -04:00
Matthew Taylor	98cbfd638f	use recipient thumbnail, not actor for manager activity ... Fixes an issue where the thumbnail mismatches the username presented	2017-09-13 13:47:27 -04:00
Matthew Taylor	16a5208624	Merge pull request #1477 from Petroochio/IS-1195-radio-button-tabbing ... Fix issue 1195 registration gender tabbing	2017-09-13 08:26:37 -04:00
Matthew Taylor	556b527dc3	Merge pull request #1529 from towerofnix/fix-class-typo ... Fix CSS class of forum post message row	2017-09-13 08:18:43 -04:00
Matthew Taylor	94ce746f9b	Merge pull request #1533 from mewtaylor/hotfix/highlight-unread-rows ... [Develop] Hotfix: highlight unread message row in light blue	2017-09-11 10:16:04 -04:00
Matthew Taylor	057f741f89	highlight unread message row in light blue ... This addresses issues with seeing unread notifications by highlighting them as light blue, along with more opaque icons	2017-09-11 09:59:24 -04:00
Florrie	14fd4e9a5b	Change CSS class .mod-studio-activity to .mod-forum-activity in forum post message row	2017-09-10 10:11:27 -03:00
Matthew Taylor	9f3b0c903e	Merge branch 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www into develop ... * 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www: remove debug message	2017-09-09 17:00:39 -04:00
Matthew Taylor	a90dd6e296	remove debug message	2017-09-09 16:59:39 -04:00
Matthew Taylor	88ea667f8c	Merge branch 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www into develop ... * 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www: call as anonymous method	2017-09-09 16:56:05 -04:00
Matthew Taylor	ffa6b7d376	call as anonymous method	2017-09-09 16:55:43 -04:00
Matthew Taylor	35ab2ebe48	Merge pull request #1525 from mewtaylor/hotfix/fix-interval ... [Develop] fix parentheses around interval	2017-09-09 16:03:53 -04:00
Matthew Taylor	7917f15874	fix parentheses around interval	2017-09-09 15:56:01 -04:00
Matthew Taylor	2a48f8a9a2	Merge pull request #1523 from LLK/release/messages-page ... [Develop] Release: new notifications page	2017-09-09 01:07:59 -04:00
Matthew Taylor	d18fd0064b	change width to min-width on icon ... fixes #1521 but no idea why **shrug**	2017-09-08 18:09:55 -04:00
Matthew Taylor	026c035af3	adjust line-height for notifications ... this applies to the comments only	2017-09-08 14:24:59 -04:00
Matthew Taylor	9e3823e6e7	add icons to social message notifications	2017-09-08 14:10:46 -04:00
Matthew Taylor	1dffc08445	change the way invites are assigned ... assign invites directly to the state rather than by defaults in order to ensure empty objects can be part of an update	2017-09-08 10:24:39 -04:00
Matthew Taylor	7e85d2c731	fix invite for initial	2017-09-08 09:38:47 -04:00
Matthew Taylor	b82d312dd8	make invite an array instead of an object ... When trying to clear the invite, because invite is currently an object, it’s getting the state’s existing invite re-applied via `defaultsDeep`. Making it an array should solve this issue	2017-09-08 09:29:46 -04:00
Matthew Taylor	7a3290a2ca	show recipient for owner notification	2017-09-07 14:55:48 -04:00
LiFaytheGoblin	b5c44bae96	Fixes GH-1435/Make as many names as possible on credits page non-translate	2017-09-07 17:33:12 +02:00
Andrew Sliwinski	f3ee0443e8	Changed 'Animate a Name' educator guide link. Resolved GH-1509	2017-09-07 08:16:38 -04:00
Matthew Taylor	7945a7eff1	only dispatch count if the user is present ... this prevents a console error	2017-09-06 14:25:44 -04:00
Matthew Taylor	ce88466ee4	tweak formatting for message content ... helps with comment formatting	2017-09-06 11:41:26 -04:00
Matthew Taylor	2bd9b184c5	Fix GH-[1505, 1507]: hide message counter on 0 (#1510) ... * Hide messages counter when at 0 fixes #1507 * check for body before looking at success fixes #1505	2017-09-06 10:05:14 -04:00
Matthew Taylor	b77e278927	handle logout on messages page (#1503) ... Go back to redirecting to splash on logout, and empty messages page too.	2017-09-05 14:31:10 -04:00
Matthew Taylor	432a6240aa	have tab link go to curator tab	2017-09-05 12:38:16 -04:00
Matthew Taylor	5772eed8f7	use lodash instead of assign ... this fixes #1500, since lodash works in ie11 but `assign` does not	2017-09-05 12:28:01 -04:00
Matthew Taylor	b7f1f5e913	fix comment message handling ... add comment message to redux to access the current user, and fix the string	2017-09-05 12:06:06 -04:00
Matthew Taylor	d7fe43fad7	fix commentee assignment	2017-09-05 11:41:56 -04:00
chrisgarrity	c7eabe18c3	Merge pull request #1483 from Petroochio/gh-1470-credits-overflow ... Fix gh-1470 Firefox Overflow on Credits Page	2017-09-05 10:15:31 -04:00
Matthew Taylor	e9f54b3fd3	use border-bottom, not top ... this fixes an issue with comment bubble displays in firefox	2017-09-05 10:06:27 -04:00
Matthew Taylor	74400b0599	add comments to redux methods	2017-09-05 10:03:48 -04:00
Matthew Taylor	23c40c8f5e	if social messages less than 0, display 0 ... handles a caching edge case with admin messages.	2017-09-05 10:03:35 -04:00
chrisgarrity	1311de0a61	Merge pull request #1493 from chrisgarrity/gh1454-teacher-invite ... Revise student invitation string	2017-09-05 09:57:54 -04:00
Matthew Taylor	6493052725	Use username, not user id, for profile link	2017-09-05 09:10:41 -04:00
Matthew Taylor	b62a4db590	Pass to legacy on message routes with ajax ... Currenlty, some legacy endpoints are failing because they’re being directed to www. A similar thing happened with `/explore`, and this is the same fix	2017-09-01 14:39:47 -04:00
Matthew Taylor	71b93cb207	reduce unread count on successful admin message dismiss	2017-09-01 11:07:21 -04:00
Matthew Taylor	630ae5e462	fix formatting for numbers and for dismiss icon ... fixes #1494	2017-09-01 11:05:29 -04:00
Matthew Taylor	3dee0e46d2	continue to use proxy msg count for now	2017-09-01 10:20:18 -04:00
Matthew Taylor	654dafdaee	fix binding for admin message dismissal ... based on https://stackoverflow.com/questions/39009611/react-bindthis-value-in-opposite-order-on-function-declaration	2017-09-01 10:00:20 -04:00
chrisgarrity	b10b8a3d51	Revise student invitation string ... fixes #1454. Changes ‘has invited you to join the class:’ sentence fragment to a complete sentence ‘Your teacher has invited you to join a class:’ to account for languages that reverse the order of subject/object.	2017-09-01 09:20:36 -04:00
Matthew Taylor	779c42717b	I think I misunderstood the xhr docs	2017-08-31 23:39:49 -04:00
Matthew Taylor	3022a565ce	json-encode body	2017-08-31 18:39:03 -04:00
Matthew Taylor	9ace64fda7	add csrf for message clear requests	2017-08-31 18:24:58 -04:00
Matthew Taylor	6dbc4abdc5	subtract admin notifications from social count ... fallout from #1487	2017-08-31 17:48:07 -04:00
Matthew Taylor	3dd768f2f6	GH-1361: Implement Notifications Page (#1487) ... * start work on www page committing out of paranoia. including changing splash page endpoints * updates from feedback thanks @rschamp! This includes: 1. splitting out messages list into a separate component (for clarity) 2. some comment/formatting adjustments for the api calls 3. removal of an extraneous property in emoji-text * remove duplicate string declaration * use object.assign instead of defaults deep we don’t need deep defaults * fix react warnings	2017-08-31 17:05:22 -04:00
Matthew Taylor	a089b664da	Merge pull request #1491 from LLK/release/2.2.24 ... [Develop] Release 2.2.24	2017-08-31 13:41:15 -04:00
Matthew Taylor	38d79df894	Change header for download page ... follow up from https://github.com/LLK/scratch-www/pull/1475#issuecomment-326034683	2017-08-30 12:58:08 -04:00
The_Grits	9942e91175	Add Tracy Tang (#1489)	2017-08-29 22:41:10 -04:00
Peter Gyory	59435d9ec6	Fix gh-1470 Firefox Overflow on Credits Page ... Add specific style on credits page to allow for word wrap	2017-08-23 14:43:18 -06:00
Ken	a5cf7c60d6	Correct “WeDo” case	2017-08-23 10:49:25 +08:00
The_Grits	21210e1fa5	Re-Add Community Moderator (#1480)	2017-08-22 19:25:31 -04:00
Ken	0f1bd3df17	Update text for “learn more” links (#1478) ... * Update text for “learn more” links * Remove “Scratch” from string	2017-08-22 09:51:21 -04:00
St19_Galla	283572ed29	Fix gh-1472 & gh-1473: FAQ Updates (#1475) ... * various updates * adding 2.0	2017-08-21 18:55:56 -04:00
Peter Gyory	69effaac79	Fix issue 1195 registration gender tabbing ... Add focus highlight scss for radio buttons on demographic registration step	2017-08-21 15:13:49 -06:00
St19_Galla	ad25e09980	Add Ellen Daoust	2017-08-16 13:39:17 -04:00
Ken	6dc5bfa788	Update credits (#1451) ... Fixes #1450 Thanks @Kenny2github	2017-08-09 08:36:48 -04:00
chrisgarrity	6743364447	Merge pull request #1446 from St19Galla/patch-5 ... Fix #1444 : Change Things to Try to Tips	2017-08-09 08:28:10 -04:00
St19_Galla	b087874859	Update landing.jsx	2017-08-02 23:43:44 -04:00
St19_Galla	3f0f4d23e7	Update landing.jsx	2017-08-02 23:42:17 -04:00
Matthew Taylor	b13c76e1ea	Merge pull request #1436 from TheGrits/patch-4 ... Fix gh-1433: Fix Gunicorn Link	2017-08-02 08:31:05 -04:00
Matthew Taylor	1cda176c9e	Merge pull request #1434 from LiFaytheGoblin/issue/gh-1432-Addition_to_Credits_Page ... Added JT Galla to the Credits Page under 'Aknowledgements'	2017-07-31 15:15:33 -04:00
Ray Schamp	3e371f5511	Merge branch 'develop' into jobs	2017-07-31 15:15:05 -04:00
Ray Schamp	e369a439e3	Add Senior Backend Engineer job posting	2017-07-31 14:47:56 -04:00
Matthew Taylor	fcb635b5a9	Merge pull request #1443 from St19Galla/patch-4 ... Fix gh-1442: Remove Moderator Position	2017-07-31 14:16:05 -04:00