3767 commits

Author	SHA1	Message	Date
seotts	6617db7c8b	progress on milestones section	2020-10-22 11:50:44 -04:00
seotts	b00110c025	match financial styling to sketch	2020-10-22 11:50:44 -04:00
seotts	6602c93269	finalize financials styling for 12col	2020-10-22 11:50:44 -04:00
Karishma Chadha	61e28278a0	Finish off subnav and more work on financials and donate sections	2020-10-22 11:50:44 -04:00
Karishma Chadha	30eedda2a2	Responsive subnav	2020-10-22 11:50:44 -04:00
Karishma Chadha	2e59359d28	More work on the subnav scroll to section behavior	2020-10-22 11:50:44 -04:00
seotts	17cb454036	work on menu highlighing (not working yet)	2020-10-22 11:50:44 -04:00
seotts	ff24f74fca	continued work on supporters section	2020-10-22 11:50:44 -04:00
seotts	10baf9f7ff	switch financials section to rem	2020-10-22 11:50:44 -04:00
Karishma Chadha	969544da7f	Initial work on milestones section - WIP - needs cleanup	2020-10-22 11:50:44 -04:00
seotts	a70dbce670	progress on supporters styling	2020-10-22 11:50:44 -04:00
seotts	ae3bb5b759	beginning of supporters section	2020-10-22 11:50:43 -04:00
seotts	bc0097cb4a	addition of download icon (alignment incorrect)	2020-10-22 11:50:43 -04:00
seotts	4d4f9e720e	nearly complete financials section	2020-10-22 11:50:43 -04:00
Karishma Chadha	79d0bef2a0	Beginning work on financials section	2020-10-22 11:50:43 -04:00
seotts	32686c8896	more progress on responsive subnavbar	2020-10-22 11:50:43 -04:00
seotts	8838687b96	initial work on subnav responsiveness	2020-10-22 11:50:43 -04:00
seotts	17224c6d37	more progress on subnav	2020-10-22 11:50:43 -04:00
seotts	9812e959d3	work on subnav	2020-10-22 11:50:43 -04:00
Karishma Chadha	98a7841a50	More progress on donate section	2020-10-22 11:50:43 -04:00
seotts	b6dc0365ee	continued work on donate section	2020-10-22 11:50:43 -04:00
seotts	ba8e4705b5	add beginning of a sub-navigation bar	2020-10-22 11:50:43 -04:00
seotts	a4ea33288d	route for annual-report	2020-10-22 11:50:43 -04:00
Karishma Chadha	6bd8aea7b7	Add support for a world map component, and an example page that displays it.	2020-10-22 11:50:43 -04:00
seotts	6d2508041f	add padding on top of people grid on credits page	2020-10-22 09:18:29 -04:00
GrahamSH	5a7cb21ea5	Add "FloralSunset" to Credits Page	2020-10-21 15:03:13 -04:00
GrahamSH	b9a81559d1	Merge pull request #1 from LLK/develop ... Merge	2020-10-21 14:59:08 -04:00
Purple-Hacker	4aa1bd1c25	Update dmca.jsx	2020-10-16 12:28:08 +01:00
Benjamin Wheeler	aa8ac45ec8	Merge pull request #4475 from JeffaloBob/patch-2 ... replace http links with https links on the 1.4 download page	2020-10-15 14:15:58 -04:00
Benjamin Wheeler	cda05817f9	Merge pull request #4473 from mxmou/fix-load-more-scrolling ... Fix "Load more" scrolling	2020-10-15 14:04:07 -04:00
Benjamin Wheeler	11ad1aeac1	Merge pull request #4474 from JeffaloBob/patch-1 ... add missing space to teacher request form	2020-10-15 13:29:23 -04:00
Sarah Otts	7323ef06bd	Merge pull request #4477 from LLK/people-grid-component ... Pull out the credit page's grid of people into a separate component	2020-10-13 11:26:24 -04:00
Benjamin Wheeler	8882840451	Merge pull request #4318 from Nambaseking01/patch-1 ... Minor grammar fix in FAQ	2020-10-13 11:02:08 -04:00
picklesrus	a567a593fe	Merge pull request #4495 from picklesrus/comment-status ... Commenting status component.	2020-10-13 09:03:41 -04:00
picklesrus	966df020f2	Merge pull request #4482 from picklesrus/m-modal-draft ... Initial skeleton of mute modal.	2020-10-13 09:02:47 -04:00
picklesrus	0e6e49759c	Commenting status component.	2020-10-08 15:12:09 -04:00
Chris Willis-Ford	5f6315e6a1	Merge pull request #4263 from LLK/hotfix/rename-scratch-desktop-to-scratch ... [Develop] finish renaming 'Scratch Desktop' to 'Scratch'	2020-10-05 10:29:45 -07:00
picklesrus	405ee52e50	First draft of the mute modal.	2020-10-02 15:59:33 -04:00
seotts	faf5a127d6	remove people grid padding	2020-10-02 15:43:22 -04:00
Karishma Chadha	e2da0b5250	Fix lint issues in people grid component	2020-10-02 15:43:22 -04:00
seotts	b7b3123217	add newline at end of file for linting	2020-10-02 15:43:22 -04:00
seotts	23f6ce281c	remove duplicated css from credits page	2020-10-02 15:43:22 -04:00
seotts	204c532c4e	connect PeopleGrid to css	2020-10-02 15:43:22 -04:00
seotts	74d18822e6	Make PeopleGrid component	2020-10-02 15:43:22 -04:00
Jeffalo	487c3f3dcd	the ubuntu one doesn't actually have http	2020-10-02 11:36:53 +02:00
Jeffalo	fb47e53fb6	make http into https	2020-10-02 11:33:37 +02:00
Jeffalo	03c6335fa5	added semicolon sorry	2020-10-02 08:16:04 +02:00
Jeffalo	c7f2f942d7	add non breaking space to real name warning	2020-10-02 07:14:23 +02:00
Christopher Willis-Ford	4415f4249d	update app name to 'Scratch 3', not 'Scratch'	2020-10-01 11:57:44 -07:00
Maxi-Mouse	6120339d26	Fix Load more scrolling	2020-10-01 20:17:27 +02:00
Benjamin Wheeler	b33bdfa306	Merge pull request #4291 from Accio1/Add-Redirects-for-2-Tutorials ... Add redirects for Animate a Character and Video Sensing Tutorials	2020-09-14 15:42:04 -04:00
Ray Schamp	b1d5246eea	Merge pull request #4216 from R4356th/patch-8 ... Add overflow, white-space and text-overflow CSS elements	2020-08-18 16:26:47 -04:00
Nammy	b454694cd4	Minor grammar fix in FAQ	2020-08-14 17:13:38 +02:00
-Accio-	0752db652c	Fix spelling	2020-08-11 12:11:10 -04:00
picklesrus	597216113b	Merge pull request #4293 from LLK/hotfix/messages ... [Develop] Hotfix/messages	2020-08-10 12:25:45 -04:00
picklesrus	05075712e8	Merge pull request #4292 from picklesrus/backoff-messages ... Exponentially back off the time between message polling.	2020-08-07 14:45:56 -04:00
-Accio-	07898e48cb	Add redirects for Animate a Character and Video Sensing	2020-08-07 11:36:50 -04:00
Radman Siddiki	5b841c4cb7	Replace "Tips Page" with "Ideas Page"	2020-08-07 16:01:52 +06:00
Farhan Yahya	6cc38f51c5	update translation URL ... Changing the translation guide URL from an obsolete one to an updated one	2020-08-07 08:58:08 +00:00
picklesrus	7d470131d7	Add check for existence of messageTimeoutId before clearing the timeout.	2020-08-06 13:22:49 -04:00
picklesrus	25b9bacd0e	Update comment to match code	2020-08-06 13:13:12 -04:00
picklesrus	6078c3653b	Puts back the original change but sets the default to Lax instead of Strict. Scratchr2 needs these cookies sent on top level navigations.	2020-08-05 10:50:06 -04:00
rschamp	01cf9ca5b5	Fix bad variable interpolation/calculation ... This used to work, even though it shouldn’t have. Upgrading node-sass caused our breakpoints to … break	2020-08-04 13:04:25 -04:00
Christopher Willis-Ford	5384ad71b9	finish renaming 'Scratch Desktop' to 'Scratch' ... - adjust macOS installation instructions to mention "Scratch" instead of "Scratch Desktop" - edit the DMG screenshot to fix the app name, DMG title, and DMG icon	2020-08-03 12:08:35 -07:00
picklesrus	62629413a7	Revert "Make the cookie library set the SameSite cookie value to strict by default"	2020-08-03 14:45:34 -04:00
picklesrus	0036550ae8	Move timeout id out of state to a member variable and add some unittests.	2020-07-30 10:55:18 -04:00
picklesrus	34c8652ffb	Fix capitalization: cookie library we use requires sameSite in opts object to have a lowercase s.	2020-07-20 15:32:54 -04:00
picklesrus	10a4e92d21	Make the cookie library set the SamSite cookie value to strict by default. If callers want to set it to something else, they can pass it through the opts object like they can 'exprires'. ... Also added a test file for jar.js so I could test the set method. The other methods remain untested.	2020-07-20 15:18:09 -04:00
R4356th	423c9b7e0c	Add white-space, overflow and text-overflow CSS elements	2020-07-18 18:27:03 +06:00
picklesrus	fac3ccad57	Make all times be in ms.	2020-07-17 14:44:36 -04:00
picklesrus	7eeb63cb3f	rename SetupMessagePolling to pollForMessages	2020-07-16 12:24:13 -04:00
Benjamin Wheeler	9460ccf982	Merge pull request #3799 from apple502j/fix-meta-without-login ... Fix editor title when not logged in	2020-07-09 20:42:08 -04:00
Benjamin Wheeler	21ccd45f9b	Merge pull request #4121 from apple502j/wiki-link ... Set wiki link per user's selected language	2020-07-09 14:20:28 -04:00
Ben Wheeler	7b2cdc73f0	updated blocks new scratcher sees	2020-07-09 14:16:52 -04:00
Ben Wheeler	e46737cbc6	add overflow settings to css for remix credit	2020-07-08 15:55:02 -04:00
picklesrus	5de96c373d	Exponentially back off the time between message polling instead of doing it every two minutes.	2020-07-06 17:44:28 -04:00
picklesrus	7eef29c358	Merge pull request #4156 from picklesrus/redirect-join ... Redirect the old join flow to the new one.	2020-06-30 13:13:49 -04:00
Chris Willis-Ford	996a80d93d	Merge pull request #4145 from LLK/hotfix/scratch-desktop-evergreen ... [Develop] use 'evergreen' URLs for Scratch Desktop downloads	2020-06-29 13:29:14 -07:00
Benjamin Wheeler	5a76d8004b	Merge pull request #4149 from benjiwheeler/fix-safari-fullscreen ... fix Safari fullscreen CSS bugs	2020-06-29 15:50:08 -04:00
picklesrus	c100c3756c	Redirect the old join flow to the new one. ... Once we confirm there are no troubles with the redirect, we can remove the code too.	2020-06-29 14:10:19 -04:00
GrahamSH-LLK	1b58769224	Update l10n.json	2020-06-28 14:08:33 -04:00
Ben Wheeler	374af98b3c	revert guiPlayer switch to max-width	2020-06-26 15:25:10 -04:00
Ben Wheeler	3527e42529	use overflow auto in different place	2020-06-26 15:11:08 -04:00
Christopher Willis-Ford	2088cf2276	use 'evergreen' URLs for Scratch Desktop downloads	2020-06-25 15:00:38 -07:00
Benjamin Wheeler	2a16790cb3	Merge pull request #3776 from apple502j/patch-15 ... Always apply min-height: 0	2020-06-25 16:10:54 -04:00
Benjamin Wheeler	08e8bb043c	Merge pull request #4125 from apple502j/patch-21 ... Fix welcomingcommittee mention link href	2020-06-25 14:45:03 -04:00
Benjamin Wheeler	a5e0fbc1ec	Merge pull request #4065 from GrahamSH-LLK/develop ... Update Credits Page	2020-06-25 14:41:18 -04:00
Benjamin Wheeler	9766d84145	Merge pull request #4101 from BoomerScratch/patch-1 ... Fix text overflow in what's happening	2020-06-25 14:36:38 -04:00
Benjamin Wheeler	03c5f7f02c	Merge pull request #4099 from R4356th/patch-4 ... Update Translators page URL	2020-06-25 14:26:56 -04:00
Ben Wheeler	a635cd932c	make scratchWikiLink prop	2020-06-25 14:09:32 -04:00
Benjamin Wheeler	b6270812a9	Merge pull request #4002 from R4356th/patch-1 ... Change the way usernames are handled	2020-06-25 13:44:17 -04:00
Benjamin Wheeler	75dbbd02bb	Merge pull request #4000 from apple502j/patch-17 ... Add iconAltText	2020-06-25 13:24:03 -04:00
apple502j	927a4b915b	Fix welcomingcommittee mention link href	2020-06-20 16:31:01 +09:00
Benjamin Wheeler	dc79eb54c3	Merge pull request #3974 from benjiwheeler/move-to-country-data-lib ... move country name lookup to library	2020-06-19 10:44:26 -04:00
Ben Wheeler	d388eef59f	renamed lookupCountryInfo and lookupCountryName functions	2020-06-19 10:42:34 -04:00
apple502j	a903e3e9b2	Set wiki link per user's selected language	2020-06-18 20:22:22 +09:00
Boomer001	72d9ba25a9	Update splash.scss	2020-06-15 14:23:42 +02:00
Boomer001	a214ddbbde	Change to overflow-wrap	2020-06-14 12:05:42 +02:00
Boomer001	9b380e9ed4	Fix text overflow in what's happening	2020-06-14 11:18:50 +02:00
R4356th	997806a8a8	Fix Translators page URL	2020-06-13 18:22:24 +06:00
Ben Wheeler	924c862b9e	remove email opt-in from join flow	2020-06-12 12:35:34 -04:00
Benjamin Wheeler	77494f0370	Merge pull request #2518 from benjiwheeler/small-player-project-page ... Fix page width by hiding overflow, letting stage width be flexible	2020-06-08 16:50:37 -04:00
Christopher Willis-Ford	5d7df5c546	update scratch-desktop download links for 3.11.1	2020-06-05 15:52:06 -07:00
GrahamSH-LLK	74032c7a6c	Updated username Harakou's Capitalization	2020-06-04 13:05:20 -04:00
GrahamSH-LLK	40ced63846	Remove Ellen Daoust, add Elizabeth Foster	2020-06-04 10:18:57 -04:00
GrahamSH-LLK	c390e5768a	Update people.json	2020-06-04 10:17:08 -04:00
R4356th	364f6da13d	Remove hasOwnProperty	2020-06-01 12:43:30 +06:00
R4356th	5a46a90564	Update username-step.jsx	2020-05-31 19:26:54 +06:00
R4356th	00a2dcad63	Update username-step.jsx	2020-05-31 14:19:27 +06:00
R4356th	d9d926590a	Update username-step.jsx	2020-05-30 17:09:55 +06:00
R4356th	29558b8468	Update username-step.jsx	2020-05-20 16:38:07 +06:00
apple502j	2f45d32081	Add iconAltText	2020-05-20 10:03:10 +09:00
Sarah Otts	6904f50718	Merge pull request #3973 from seotts/add-disrespectful-report ... Add disrespectful report option, reorder options	2020-05-15 10:43:29 -04:00
Ben Wheeler	665eeff75a	move country name lookup to library	2020-05-13 14:12:50 -04:00
Chris Willis-Ford	1bab2bb59a	Merge pull request #3856 from cwillisf/day1-student-country-default ... default student's country to educator's during reg	2020-05-13 11:11:18 -07:00
Ben Wheeler	4bd813629f	safer referencing of teacher country	2020-05-13 13:20:36 -04:00
seotts	52b8dff59a	Add disrespectful report option, reorder options	2020-05-13 11:41:05 -04:00
Chris Garrity	3c744bed4c	Enable Help widget ... Enable Helpwidget, but keep showing the form for iOS 10 and lower.	2020-05-08 13:02:07 -04:00
Chris Garrity	f600cad373	Put new help widget back behind feature flag	2020-05-07 12:30:50 -04:00
picklesrus	c5e1aa5324	Merge pull request #3857 from picklesrus/educator-faq-2 ... Second, smaller round of updates to the FAQ page.	2020-05-06 15:02:41 -04:00
Benjamin Wheeler	7309dda06b	Merge pull request #3849 from Accio1/issue/gh#3848-Move-People-To-Past-Contributers ... Move Andrew and Abisola to past contributors	2020-05-06 00:40:27 -04:00
picklesrus	9a4b02bd98	Merge pull request #3847 from picklesrus/educator-page-mini-update ... Educator page mini update	2020-05-05 14:15:14 -04:00
Chris Willis-Ford	39a7788c87	Merge pull request #3854 from LLK/hotfix/scratch-desktop-3.10.2 ... [Develop] release Scratch Desktop 3.10.2	2020-05-04 13:28:36 -07:00
Christopher Willis-Ford	1ba7bef8d8	release Scratch Desktop 3.10.2	2020-05-04 11:25:18 -07:00
chrisgarrity	3424d007ee	Merge pull request #3817 from chrisgarrity/helpwidget-update ... Helpwidget update	2020-05-04 12:11:35 -04:00
Christopher Willis-Ford	1408b540e1	default student's country to educator's during reg ... Ideally the classroom info would include the country code, not just the country name. Since it doesn't, this change includes a new function to look up a country code by the country's name (not label).	2020-05-02 00:44:23 -07:00
Chris Garrity	d538d5d053	Localize the widget ... Note that some of the Freshdesk locales don’t match the ones used by Scratch.	2020-05-01 12:09:19 -04:00
-Accio-	629ecb2279	Add Andrew and Abisola to past contributers	2020-05-01 11:19:56 -04:00
-Accio-	db4e32180a	Remove Andrew and Abisola	2020-05-01 11:13:15 -04:00
Chris Garrity	23980e1f23	turn on popup help widget ... leaving the feature flag in place in case we decide to revert to the form.	2020-05-01 10:30:09 -04:00
picklesrus	bcb848d515	Remove now unused FormatedHTMLMessage.	2020-05-01 10:27:31 -04:00
picklesrus	d968ec42bd	Remove unsused message	2020-05-01 10:08:52 -04:00
Chris Garrity	2650c44407	hide inappropriate link field ... disable and hide functions expect argument to be an array.	2020-05-01 09:23:35 -04:00
Chris Garrity	750071b7ae	Adjust form height to avoid form scrolling	2020-05-01 09:23:35 -04:00
Chris Garrity	41c60c62d7	Wording change for Bugs and Glitches	2020-05-01 09:23:35 -04:00
Chris Garrity	3111b72117	Move profile or studio link out of description ... Prefill a new custom field for the inappropriate link instead of prefilling description. In the popup make the link field hidden and disabled so that users don’t change it.	2020-05-01 09:23:35 -04:00
Chris Garrity	09b578bff7	Update copy	2020-05-01 09:23:35 -04:00
Chris Garrity	3f5d34d05f	delay loading freshdesk script ... Question: should script still have `async defer`	2020-05-01 09:23:35 -04:00
picklesrus	c5aaa7cb05	Add probable final link	2020-04-30 17:16:58 -04:00
-Accio-	40aa52e673	Alphabetize the credits page ... Put the credits page in order by first names as opposed to last names which are no longer present.	2020-04-29 10:36:27 -04:00
Benjamin Wheeler	ebbee5e7b7	Merge pull request #3830 from R4356th/patch-1 ... Add new member's name	2020-04-29 09:38:42 -04:00
R4356th	5826058da5	Update people.json	2020-04-27 23:51:26 +06:00
picklesrus	6f1b7d7bef	Add setup guide link. Still needs final link filled in.	2020-04-27 10:38:40 -04:00
R4356th	84d861f299	Update people.json	2020-04-27 16:01:09 +06:00
apple502j	b2544e1cbd	Fix lint	2020-04-26 17:05:42 +09:00
apple502j	b476a1e4b3	Fix invisible actor on FollowStudio	2020-04-26 14:58:21 +09:00
picklesrus	859ce97ab0	Second, smaller round of updates to the FAQ page.	2020-04-23 09:32:51 -04:00
seotts	aca3ef0a0d	Add scary subcategories	2020-04-22 15:38:39 -04:00
chrisgarrity	8d385afa44	Merge pull request #3569 from apple502j/remove-flag ... Remove app flag	2020-04-22 07:28:11 -04:00
picklesrus	01afd414cd	Merge pull request #3807 from picklesrus/student-username-update ... Change up the messaging in student registration.	2020-04-21 14:28:09 -04:00
Benjamin Wheeler	099d5a1007	Merge pull request #3436 from benjiwheeler/join-flow-toggle-info-button ... Join flow info button has larger touch target, can be clicked to toggle	2020-04-21 11:00:27 -04:00
picklesrus	d6fdf90a56	remove unused message.	2020-04-20 17:38:20 -04:00
chrisgarrity	11e6c2ea9f	Merge pull request #3786 from apple502j/following-l10n ... Split follow splash into FollowUser and FollowStudio	2020-04-17 07:12:08 -04:00
chrisgarrity	15990b5876	Merge branch 'develop' into remove-flag	2020-04-16 16:41:31 -04:00
picklesrus	2711bafbcd	Change up the messaging in student registration to make the "don't use your real name" a blue info message and give some suggestions on how to choose a username.	2020-04-15 15:43:24 -04:00
Karishma Chadha	05c96b48da	Merge pull request #3806 from LLK/hotfix/credits ... [Develop] Hotfix/credits	2020-04-15 15:37:13 -04:00
Karishma Chadha	13d8d1b200	Remove last names from credits page.	2020-04-15 12:02:07 -04:00
apple502j	7048e1e5dc	Fix typo ... Co-Authored-By: adroitwhiz <adroitwhiz@protonmail.com>	2020-04-15 23:39:58 +09:00
Ben Wheeler	d1a871baa2	remove extraneous parenthesis from student signup route	2020-04-15 09:17:33 -04:00
chrisgarrity	5cd282ed56	Merge pull request #3800 from chrisgarrity/freshdesk-widget ... Freshdesk widget	2020-04-14 15:43:01 -04:00
chrisgarrity	5e21c58c2a	Merge pull request #3710 from apple502j/localize-activity ... Localize activity messages	2020-04-14 15:42:45 -04:00
chrisgarrity	21cc1a9780	Update src/components/helpwidget/helpwidget.jsx ... initialize widget settings on `window` before adding the script Co-Authored-By: Ray Schamp <rschamp@users.noreply.github.com>	2020-04-14 15:32:57 -04:00
Ray Schamp	5e33c4e37e	Merge pull request #3801 from Accio1/issue/gh-#3781-Delay-Scratch-Conference ... Fix gh-3781: Delay Scratch Conference	2020-04-14 10:57:34 -04:00
Ray Schamp	e8d58c6884	Move space out of l10n string and into JSX	2020-04-14 10:56:56 -04:00
Ben Wheeler	d1366360f1	removed lodash.debounce, use onmouseleave instead	2020-04-14 10:33:59 -04:00
apple502j	8ca097fde2	Rename followee to studio	2020-04-14 13:47:07 +09:00
-Accio-	4c0e13a154	Make desc1a bold ... Made desc1a bold in order to emphasize it, and added a line break betwwen regestrationDelayed and connectNow	2020-04-13 21:25:03 -04:00
-Accio-	952f95c784	Seperate desc1 ... Seperate desc1 into desc1 and desc1a so that desc1a can be bolded in order to emphasize it.	2020-04-13 21:19:56 -04:00
Ben Wheeler	5805d8a0fe	first take on toggleable open close state for info messages ... make info button have large, invisible boundary fix info button ref setting WIP: experiment with more sophisticated mouseout handling add lodash debounce use lodash debounce to reduce info message flickering tweak info message position per added padding remove leftover function update info button tests, add a bunch more	2020-04-13 17:06:33 -04:00
Benjamin Wheeler	ae04860160	Merge pull request #3788 from benjiwheeler/join-endpoint ... added /signup/TOKEN route; handle route alongside existing student signup route	2020-04-13 14:41:19 -04:00
Ben Wheeler	05e61cc842	changed student signup route from /join/TOKEN to /signup/TOKEN	2020-04-13 13:11:11 -04:00
apple502j	3146ee8b83	Remove app flag	2020-04-14 01:40:05 +09:00
-Accio-	6e68eb0ae5	Fix spacing again	2020-04-12 10:00:34 -04:00
-Accio-	9675bfe76e	Fix spacing ... Co-Authored-By: apple502j <33279053+apple502j@users.noreply.github.com>	2020-04-12 09:22:38 -04:00
-Accio-	ca2e6fd089	Delay Scratch Conference to 2021	2020-04-11 22:40:14 -04:00
-Accio-	8cf5e09546	Delay Scratch Conference to 2021	2020-04-11 22:39:58 -04:00
Chris Garrity	23306ff336	remove excess space in the form ... There’s too much space after removing the redundant field.	2020-04-10 16:09:17 -04:00
apple502j	93f9eaf718	Fix editor title when not logged in	2020-04-11 01:30:29 +09:00
Chris Garrity	7d9e6ea8b7	Add pop up Help widget ... Initial version of contact us with the pop up Freshdesk help widget. * adding feature flag `?CONTACT_US_POPUP=true` to the URL allows to switch between current contact-us with form, and new contact-us with popup widget. * new copy for the contact us page (selected based on feature flag) * handles scratchr2 redirects by pre-opening the popup on the contact us form and handles multiple parameters	2020-04-10 12:16:44 -04:00
Chris Garrity	93d7946af7	Remove unnecessary userAgent field ... The Freshdesk form/widget collects Browser and OS meta data so there’s no need to duplicate it.	2020-04-10 12:08:07 -04:00
seotts	907c0a5228	Merge branch 'report-copy' of github.com:seotts/scratch-www into report-copy	2020-04-08 14:18:38 -04:00
seotts	41b87b0958	use exisiting general string for "Community Guidelines"	2020-04-08 14:14:43 -04:00
Sarah Otts	fed2fe0fa1	remove unnecessary curly brackets	2020-04-08 10:29:33 -04:00
seotts	42cfba3199	Update report copy	2020-04-08 10:10:10 -04:00
Ben Wheeler	2972c528f4	use state.classroom.id instead of url param classroomId	2020-04-06 10:36:06 -04:00
Ben Wheeler	81678b70a7	refactored uri pathname parsing to library	2020-04-03 16:11:45 -04:00
Ben Wheeler	75f8c6429a	added join token route; handle route alongside existing student signup uri	2020-04-03 14:40:56 -04:00
seotts	272d96fdba	Lints	2020-04-03 10:41:42 -04:00
seotts	8f4a7643cf	Open Community Guidelines links in new tabs	2020-04-03 10:25:48 -04:00
apple502j	544b1e1d45	Split follow splash into FollowUser and FollowStudio	2020-04-03 09:15:55 +09:00
seotts	fd79507bf5	Move period inside quotation	2020-04-02 16:29:25 -04:00
seotts	091181d387	Refer correctly to the "Send" button in the Face Reveal prompt	2020-04-02 16:29:25 -04:00
seotts	f2dc3719c6	Remove duplicate i10n string	2020-04-02 16:29:25 -04:00
seotts	8933705c76	Fix linting	2020-04-02 16:29:25 -04:00
seotts	ce4c0f09ec	Format report prompts without using FormattedHTMLMessage	2020-04-02 16:29:25 -04:00
seotts	2d6d746922	Format prompts with multiple paragraphs and a list	2020-04-02 16:29:24 -04:00
seotts	035913b954	Subcategories and deadends work	2020-04-02 16:29:24 -04:00
seotts	739cf8117b	Add a deadend step to report flow	2020-04-02 16:29:24 -04:00
seotts	af78e4c05e	Add subcategory selection if subcategories specified, and submit final report	2020-04-02 16:29:24 -04:00
Ben Wheeler	7655a08d7e	improve breaking of long words	2020-03-31 22:08:13 -04:00
apple502j	4b7aaf84f2	Always apply min-height: 0	2020-03-30 15:29:44 +09:00
picklesrus	36ef3222c0	Merge remote-tracking branch 'upstream/develop' into captcha-component-ta	2020-03-27 09:50:50 -04:00
picklesrus	187406938a	Make props required	2020-03-27 09:03:45 -04:00
picklesrus	7843ae8d4c	Add Captcha to teacher registration.	2020-03-26 16:21:13 -04:00
picklesrus	f9e48973bc	Move reCaptcha codeto a component so it can be used in another spot later.	2020-03-24 17:41:22 -04:00
picklesrus	0ca47ec8fb	Merge pull request #3740 from picklesrus/educator-faq ... Educator faq updates	2020-03-20 14:29:08 -04:00
Paul Kaplan	c23805f543	Merge pull request #3753 from LLK/hotfix/multi-step-report ... [Hotfix/Develop] Split project report flow into two steps	2020-03-18 11:58:01 -04:00
Ray Schamp	507023fa96	Merge pull request #3749 from apple502j/images-403 ... Fix image links	2020-03-18 09:18:48 -04:00
Paul Kaplan	5670b4558a	Add modifier class to fix button margin	2020-03-17 10:16:33 -04:00
Paul Kaplan	f796093e79	Revise comments to clarify functionality	2020-03-17 10:03:16 -04:00
Paul Kaplan	bc3a454f4c	Split project report flow into multiple steps	2020-03-17 10:03:16 -04:00
picklesrus	09c50d9dde	Switch message back to FormattedHTMLMessage because the old version has html in it. ... Change the id of a message whose contents changed to not have html.	2020-03-16 09:19:31 -04:00
apple502j	7c7887adc4	Fix image links	2020-03-16 15:48:39 +09:00
Chris Garrity	501a5d8fc0	Fix mistakes ... - take captcha off the helpform url - use encodeUriComponent to make sure semicolons in the agent string don’t mess up the form parameters - take the `$` end matcher off the route to allow for parameters to be passed - fix forum links - fix faq link `/faq` => `/info/faq`	2020-03-13 09:47:31 -04:00
picklesrus	f2ee4ea985	Change answer to student account deletion question.	2020-03-12 13:51:27 -04:00
chrisgarrity	1d80c946f7	Merge pull request #3737 from LLK/hotfix/scratch-desktop-3.9.0 ... [Develop] hotfix/scratch desktop 3.9.0	2020-03-12 09:06:52 -04:00
picklesrus	ae6648f663	Update to data collection question.	2020-03-10 12:07:08 -04:00
chrisgarrity	9335274765	Merge pull request #3719 from chrisgarrity/freshdesk-contactus ... Add new Contact Us information page	2020-03-10 10:58:28 -04:00
picklesrus	3b869c36a2	Replace FormattedHtmlMessage with FormattedMessage where it wasn't necessary.	2020-03-10 09:42:48 -04:00
picklesrus	132db9b362	Fix copy/paste error of links	2020-03-09 10:21:24 -04:00
Chris Garrity	e8197e4ffc	Address review comments ... * With Carl decided to put the sidebar back even with just one item. It’s still one we want to emphasize. * made sure the freshdesk js file would not block loading the form (it doesn’t appear to be needed for the form, it’s probably mainly for the pop-up version) * moved the query processing into a constructor (more idomatic react) * expanded the form so it should not need to scroll - also noted that in incognito mode a captcha is shown, so created enough space for that to be visible.	2020-03-06 08:58:30 -05:00
Christopher Willis-Ford	83112f76b2	update scratch-desktop Windows URL for 3.9.0	2020-03-05 13:28:28 -08:00
Christopher Willis-Ford	ffb0bf86a7	make download URLs easier to find and update	2020-03-05 13:28:28 -08:00
Chris Garrity	ee09ba59a4	Add handling for parameters passed in the query from scratchr2 ... Scratchr2 has links to contact us from the report (profile|studio) dialogs. Looking at the scratchr2 source, there’s also one for confirmations, so this change handles the additional details in the same way - in the subject and description. In the future we could consider pre-filling specific form fields that we define.	2020-03-05 11:51:11 -05:00
picklesrus	badc47f81c	fix typo	2020-03-05 10:32:50 -05:00
picklesrus	d01b3c8b31	Add 250 student question. ... Change formttedhtmlmessage -> formattedmessage	2020-03-05 09:15:44 -05:00
picklesrus	4404f2bbf4	Initial commit for educator FAQ updates.	2020-03-04 18:14:32 -05:00
Chris Garrity	f0bcd9f574	Remove the nav section and make the form full width ... Decided that there is no need for the Nav sidebar since we don’t want the link to the Discussions right now. It could come back if we add the knowledge base.	2020-03-03 11:17:07 -05:00
Ray Schamp	720e2bacba	Merge pull request #3730 from rschamp/hotfix/conference-delay-spacing ... [Develop] Split out message about conference registration delay	2020-03-03 11:12:07 -05:00
Ray Schamp	0c03a6e8b8	Merge pull request #3729 from rschamp/hotfix/conference-delay-spacing ... [Master] Split out message about conference registration delay	2020-03-03 11:11:52 -05:00
Chris Garrity	3dc5155c38	Revised wording	2020-03-03 10:10:20 -05:00
rschamp	f596089d0a	Split out message about conference registration delay	2020-03-03 09:31:24 -05:00
Paul Kaplan	e43cb7ab4e	Reorder and de-red report action on project page	2020-03-03 08:56:25 -05:00
rschamp	3d87f6feed	Make updates in response to COVID-19	2020-03-02 15:53:23 -05:00
Chris Garrity	8fc9b57e7d	Add new Contact Us information page ... Using the Freshdesk Feedback form * adds new component HelpForm for the Freshdesk component * adds new contact-us view * modifies Information page css with style for a header on the right hand nav section * adds new route for the contact-us page (is identical to the old scratchr2 URL)	2020-03-02 11:33:54 -05:00
rschamp	375e525372	Fix dates, be less paranoid about l10n ids ... The strings will get updated, even if the id persists.	2020-03-02 11:26:34 -05:00
rschamp	3c3b29708d	Address various copy-paste errors ... Nice catch @adroitwhiz :)	2020-03-02 10:16:47 -05:00
rschamp	0e83287b37	Update conference page to open registration	2020-02-29 11:02:09 -05:00
apple502j	a3a22a087a	Localize activity messages	2020-02-26 13:52:17 +09:00
Ben Wheeler	049c0b946a	use api instead of scratchr2 to validate usernames	2020-02-05 15:48:15 -05:00
Chris Garrity	d55d18a8e0	Update text	2020-02-05 09:00:44 -05:00
Chris Garrity	4fd69c526a	Add FAQ about updating the app ... Addresses #3104 Added separate answers for the Downloaded vs Play store versions. Also noted that school managed installations would have to be updated by administrators.	2020-02-04 11:02:49 -05:00
Paul Kaplan	345da1e41e	Add comments.isNotPermitted string ... We were missing a string for the case where a user has not confirmed their email address. These string IDs are interpolated directly from the error code, so no other change is needed.	2020-01-30 16:29:08 -05:00
Chris Garrity	70cef7335b	Really delete the cookie ... It appears that setting the domain on the cookie prevents it from actually deleting the cookie.	2020-01-30 09:43:51 -05:00
Chris Garrity	c95d087289	Ensure that the old scratchlanguage cookie is removed if it exists. ... On init, remove the old cookie if it exists. On the project page, make sure `handleSetLanguage` also sets the domain.	2020-01-29 16:11:58 -05:00
Chris Garrity	ad2f0fa4e2	Don’t prefix localhost with . ... Need to special case localhost so that changing language works when running locally.	2020-01-23 16:56:12 -05:00
Chris Garrity	92a729e9c8	Set language cookie domain to allow for cross-domain cookies ... Add leading `.` to the current hostname for the language cookie domain.	2020-01-22 15:54:05 -05:00
Benjamin Wheeler	10f2a0983a	Merge pull request #3640 from benjiwheeler/join-flow-retry-retry-session ... Retry of the change that retries fetching session	2020-01-22 10:35:34 -05:00
Ben Wheeler	2d3158a8f7	Introduce new tx-push-www script to automate string push to transifex	2020-01-16 16:06:55 -05:00
Ben Wheeler	6654362b2c	fix for session promise issue	2020-01-14 22:03:05 -05:00
Ben Wheeler	7b46ddf243	Revert "Merge pull request #3628 from LLK/revert-3618-hotfix/join-retry-session" ... This reverts commit 7c9a098598, reversing changes made to 2c68f2041e.	2020-01-14 21:58:38 -05:00
Benjamin Wheeler	25b01b6df9	Merge pull request #3624 from LLK/hotfix/mandrill-outage-page-banner ... [Develop] Hotfix/mandrill outage page banner	2020-01-09 17:33:29 -05:00
Ben Wheeler	223bed257b	changed wording to be more specific abount time	2020-01-09 17:28:19 -05:00
Ben Wheeler	88e59a5b49	Move warning banner from splash to Page	2020-01-11 00:16:34 -05:00
Benjamin Wheeler	1dbe89f2bc	Revert "[Develop] Hotfix/join retry session"	2020-01-09 08:44:27 -05:00
Ben Wheeler	2c40d8c51e	draft of mandrill outage banner	2020-01-09 00:03:58 -05:00
Benjamin Wheeler	ae96ac7eed	Merge pull request #3618 from LLK/hotfix/join-retry-session ... [Develop] Hotfix/join retry session	2020-01-07 14:36:38 -05:00
Benjamin Wheeler	2797405669	Merge pull request #3590 from benjiwheeler/session-error-string-fix ... corrected error messages that wrongly mentioned session	2020-01-06 18:24:41 -05:00
Benjamin Wheeler	e0c562bfa6	Merge pull request #3484 from benjiwheeler/join-flow-count-unicode ... count unicode characters as single characters	2020-01-02 15:15:29 -05:00
Ben Wheeler	be0617f69a	use max-width to constrain player size	2019-12-30 22:13:03 -05:00
Ben Wheeler	b2d54da8ec	Fix page width by hiding overflow, calculating	2019-12-30 21:46:38 -05:00
Benjamin Wheeler	08386bf427	Merge pull request #3599 from benjiwheeler/instructions-word-break ... break word in project description	2019-12-18 17:31:40 -05:00
Ben Wheeler	ea1fea8b3d	remove work-break: break-word, which is deprecated	2019-12-18 11:32:00 -05:00
chrisgarrity	ca7e766f76	Merge pull request #3609 from LLK/hotfix/chromeos-faq ... [Develop] Hotfix/chromeos faq	2019-12-18 09:54:31 -05:00
Chris Garrity	037443ba5c	Update troubleshooting and FAQ sections for Scratch App and hardware extensions ... Fixes #3570	2019-12-17 15:42:17 -05:00
Ben Wheeler	5ce878abbb	added overflow-wrap	2019-12-17 12:18:16 -05:00
Ben Wheeler	d53fe43241	fix bug, updating session request retry code per rschamp's feedback	2019-12-16 17:53:30 -05:00
Ben Wheeler	69e519286d	session tests mock api response various ways	2019-12-16 13:35:24 -05:00
Ben Wheeler	27a7324da0	treat null body in session response as unsuccessful, without dereferencing body	2019-12-16 09:34:51 -05:00
Ben Wheeler	b8d5799e75	refactor lib/session so that it can be used arbitrary number of times	2019-12-14 22:44:26 -05:00
Benjamin Wheeler	6a97d44978	Merge pull request #3576 from benjiwheeler/join-flow-retry-session ... Retry fetching session until it succeeds, when registering using join flow	2019-12-13 15:03:43 -05:00
picklesrus	e776cb536f	Merge pull request #3598 from LLK/hotfix/conference2020 ... [Develop] Hotfix/conference2020	2019-12-12 16:21:22 -05:00
picklesrus	d16d399b99	Remove stray space	2019-12-12 08:32:48 -05:00
Ben Wheeler	325caf9424	break word in project description	2019-12-11 23:54:20 -05:00
picklesrus	b6d296f88d	Fix some spacing and replace images.	2019-12-11 16:21:13 -05:00
picklesrus	d498ef428a	Fix up spacing and images.	2019-12-11 15:53:20 -05:00
picklesrus	3c67fe83c5	More wording fixes.	2019-12-11 08:46:54 -05:00
picklesrus	b218248ad9	Fix old wording.	2019-12-10 16:07:01 -05:00
picklesrus	166a2dc282	Initial landing page with info about Scratch conference 2020. ... Also switches the /conference redirect to go to conference/2020 instead of /2019.	2019-12-09 16:27:47 -05:00
Ben Wheeler	2b39ca3f64	alphabetized contributors list	2019-12-06 17:02:38 -05:00
Ben Wheeler	827990e703	alphebatized credits	2019-12-06 16:51:13 -05:00
Ben Wheeler	a3c11b5afc	added robyn bosic to credits page	2019-12-06 14:27:47 -05:00
Ben Wheeler	bbf211a106	corrected error messages that wrongly mentioned session	2019-12-05 22:59:13 -05:00
Benjamin Wheeler	7031bc5dfe	Merge pull request #3482 from nandedamana/issue/gh-3182-teacher-reg-form-diff-font-weights ... fixed the issue "Create a Username" has different font weight	2019-12-05 22:52:44 -05:00
picklesrus	8ee41880a2	Merge pull request #3587 from picklesrus/footer-stuff ... Remove an extra comma.	2019-12-05 10:06:16 -05:00
picklesrus	69384cc2ac	Remove an extra comma.	2019-12-05 09:58:15 -05:00
picklesrus	f8f6cce2e6	Merge pull request #3586 from picklesrus/footer-stuff ... add a missing t.	2019-12-05 09:48:58 -05:00
picklesrus	c306b92d78	add a missing t.	2019-12-05 09:47:12 -05:00
picklesrus	5a00faf285	Merge pull request #3584 from picklesrus/footer-stuff ... Add missing . to end of a sentence.	2019-12-05 08:37:07 -05:00
picklesrus	8f01525c32	Add missing .	2019-12-05 08:32:55 -05:00
picklesrus	52ae6f791e	Merge pull request #3583 from picklesrus/footer-stuff ... Add recognition text and links to the bottom of the page.	2019-12-04 17:23:34 -05:00
picklesrus	b89fe1a985	Add recognition text and links to the bottom of the page. ... Adds a prop to the Page component so each page can say whether or not it wants them to appear.	2019-12-04 16:28:23 -05:00
Ben Wheeler	5aa27c31d1	Remove comments	2019-12-03 21:22:52 -05:00
Ben Wheeler	c9cbb4a1e0	have join flow use refreshSessionWithRetry()	2019-12-03 21:19:14 -05:00
Ben Wheeler	39c32e7c5f	Add lib/session.js, add refreshSessionWithRetry()	2019-12-03 21:18:00 -05:00
Ray Schamp	f6de9721a1	Merge pull request #3573 from LLK/hotfix/hoc-2019 ... [Develop] CSEdWeek 2019 homepage banners	2019-11-27 16:23:43 -05:00
rschamp	fdddad3516	Review feedback	2019-11-27 15:45:35 -05:00
rschamp	d83769be71	Set real start date	2019-11-27 12:25:45 -05:00
rschamp	8b79a1406d	Use magenta to contrast with the talking tales bg	2019-11-27 11:34:57 -05:00
rschamp	e5d14ff0c2	Update content for 2019	2019-11-27 11:15:41 -05:00