4577 commits

Author	SHA1	Message	Date
Paul Kaplan	ef9318463e	Reset comments when admin logs in	2021-04-29 09:00:50 -04:00
Paul Kaplan	8c104ed351	Remove unused component	2021-04-29 08:50:15 -04:00
Paul Kaplan	1c31d7cf65	Refactor layout and add styling for studio info	2021-04-28 13:44:25 -04:00
Paul Kaplan	129d87642c	Remove unuseable NOT_FETCHED state for studio info	2021-04-28 13:44:24 -04:00
Paul Kaplan	83c896246e	Merge pull request #5274 from paulkaplan/studio-mutations ... Add client-side editing of studio info	2021-04-27 09:45:30 -04:00
Paul Kaplan	26de328bfe	Handle additional error responses	2021-04-27 09:14:34 -04:00
Paul Kaplan	5827aaab8f	Update permissions for editing open_to_all to match current backend	2021-04-27 09:06:40 -04:00
Paul Kaplan	dec9f96eed	Replace loading with fetching in new components	2021-04-27 09:01:19 -04:00
Paul Kaplan	f9419ac8fc	Fix comment toggling and add permissions test	2021-04-26 15:11:06 -04:00
Paul Kaplan	aab4c9aca6	Update proptypes	2021-04-26 14:52:05 -04:00
Paul Kaplan	c9684b52d3	Add actions for studio open to commenting or project adding	2021-04-26 14:34:12 -04:00
Paul Kaplan	430f67c0e1	Include modifying the studio image	2021-04-26 09:58:34 -04:00
Paul Kaplan	2e029f8966	Move comment mute strings to general l10n file	2021-04-22 09:53:56 -04:00
Paul Kaplan	647575e4a8	Move permissions into its own reducer	2021-04-21 14:52:56 -04:00
Paul Kaplan	82da633e61	Add title, description and following editors	2021-04-21 14:52:56 -04:00
Paul Kaplan	c789a27018	Fix logged in selector with test	2021-04-21 14:52:53 -04:00
Ben Wheeler	e80a343211	removed unnecessary Page component	2021-04-12 15:15:17 -04:00
Paul Kaplan	7c4871c19b	Remove unused reference	2021-04-08 10:57:28 -04:00
Paul Kaplan	74a29a62a0	Hook up delete restore and report actions for studio comments	2021-04-08 10:38:34 -04:00
Paul Kaplan	810eadd258	Remove params from studio comment actions that can be retrieved from state	2021-04-08 10:37:45 -04:00
Paul Kaplan	11794d885a	Add permissions selectors and tests for studio comments	2021-04-08 10:36:56 -04:00
BryceLTaylor	7a5bdc0400	Change class for search input wrapper to search-wrapper	2021-04-06 14:19:05 -04:00
BryceLTaylor	0cd1f6e6be	Add class to searchbar for automated tests	2021-04-06 14:19:05 -04:00
Paul Kaplan	bd279fe557	Stop passing around admin/token info in studio comment component. ... Instead of getting data out of redux just to pass it back to a dispatch, use getState in the thunk to get the data we need. This allows the component to not care about admin/token info, since it is not related to rendering.	2021-04-05 10:41:19 -04:00
Paul Kaplan	c6b0493e08	Stop passing around studio id and user info for getting studio data ... Insteaad of passing in the studio id and user data into the component just to have it used for fetching data, get that data directly from the redux store from within the thunk. This simplifies the components and lets them be concerned more with what they render.	2021-04-05 10:32:47 -04:00
Paul Kaplan	f0adda4e3b	Include studio id in the store default data	2021-04-05 10:31:19 -04:00
Paul Kaplan	6ea071e8df	Reorder and add selector for studio id	2021-04-05 10:30:35 -04:00
Paul Kaplan	8267dcf16a	Fix TODO and add selector for studio comment capability	2021-04-02 12:43:32 -04:00
Paul Kaplan	dc460fffde	Merge branch 'develop' into studio-selectors	2021-04-02 12:36:44 -04:00
Paul Kaplan	cd8ae4b197	Use lodash.get to simplify permissions, move test data into fixtures for better testing	2021-04-02 12:33:18 -04:00
apple502j	9a3fc9876c	Add privacy policy and terms of use to allowlist	2021-04-02 04:28:27 +09:00
Paul Kaplan	3a9dde404e	Include onAddComment for studio comments	2021-04-01 14:05:22 -04:00
Benjamin Wheeler	3a62fa3a51	Merge pull request #5017 from JoelGritter/patch-1 ... Fix gh-4913: MacOS version string update	2021-04-01 13:31:57 -04:00
Karishma Chadha	7eb583a867	Merge pull request #5217 from kchadha/studio-comments-fetching ... Studio Comments Fetching & Initial UI	2021-04-01 12:36:55 -04:00
Paul Kaplan	6026ededd3	Only pass explicit props to prepare for better permission selectors	2021-04-01 09:41:52 -04:00
Paul Kaplan	8434a06a90	Remove extra check for logged in	2021-04-01 09:29:52 -04:00
Paul Kaplan	8bc6e4ee77	Remove unneeded debug info	2021-04-01 09:24:13 -04:00
Paul Kaplan	1ad53aeb23	Add postURI which was left off by mistake	2021-04-01 09:23:59 -04:00
Paul Kaplan	ead57013e3	Use useCallback instead of binding anonymous function	2021-04-01 09:23:42 -04:00
Paul Kaplan	b8b56fff61	Destructure props to clean up the code	2021-04-01 09:23:16 -04:00
Karishma Chadha	073c14e6da	Add UI for composing a comment and seeing the list of comments on the studio comments tab. Starting to fill in some additional state information like logged in state	2021-03-31 16:38:44 -04:00
BryceLTaylor	11c773deb4	Move the studio route from routes-dev.json to routes.json	2021-03-31 16:23:00 -04:00
Karishma Chadha	4d5fdf6094	Generalize comment components for use with projects and studios by taking passing in the POST URI as a prop. Update project page to accommodate the new prop.	2021-03-31 16:19:19 -04:00
Karishma Chadha	9c83271af7	Create studio comment action creators. Add comments reducer and initial studio comment actions to studio comments view. Display preliminary data fetching.	2021-03-31 14:41:49 -04:00
Eric Rosenbaum	4a7d909671	Merge pull request #5211 from ericrosenbaum/more-components ... Add more components to the components page	2021-03-31 11:36:56 -04:00
Ben Wheeler	491735b9f0	use smaller svgs instead of pngs	2021-03-30 21:32:54 -04:00
Eric Rosenbaum	542c416ea7	lint	2021-03-30 15:49:33 -04:00
Eric Rosenbaum	ec0f41286d	lint	2021-03-30 15:44:41 -04:00
Eric Rosenbaum	eec9b29516	add text area	2021-03-30 15:41:52 -04:00
Eric Rosenbaum	2ff5e8d8fb	styling	2021-03-30 10:53:06 -04:00
Eric Rosenbaum	33b7d87840	update grid json	2021-03-30 10:52:57 -04:00
Eric Rosenbaum	8b98820495	Add nav bubbles	2021-03-24 16:12:47 -04:00
Eric Rosenbaum	82d759e30a	grid displays “Project Title”	2021-03-24 16:12:37 -04:00
Paul Kaplan	8a33d1c5a5	Re-export missing base comment actions to simplify	2021-03-24 14:48:05 -04:00
Paul Kaplan	9252d56376	Merge branch 'develop' into comments-reducer	2021-03-24 14:35:12 -04:00
Eric Rosenbaum	9466a7b75b	add grid	2021-03-23 16:58:38 -04:00
seotts	f6f1095d93	add justMuted variable, fix linting	2021-03-23 16:33:24 -04:00
seotts	60bf05fbbf	Reuse l10n strings instead of duplicating them	2021-03-23 15:45:16 -04:00
Paul Kaplan	8144b0c2e1	Display permissions selectors in the playground	2021-03-23 15:19:28 -04:00
Paul Kaplan	99195d6df3	Add studio selector and tests	2021-03-23 15:19:01 -04:00
Paul Kaplan	f03fbb503b	Add session selector and tests	2021-03-23 15:18:36 -04:00
Paul Kaplan	2265cd0d90	Add permissions selector and tests	2021-03-23 15:18:17 -04:00
seotts	ccab9566b8	Show different modal message when muted in the past	2021-03-23 11:00:01 -04:00
Eric Rosenbaum	6080facb66	Merge pull request #5171 from ericrosenbaum/fix-components-page ... Fix components page	2021-03-23 10:04:17 -04:00
Zoë Bentley	138ed7339e	Fixed other place where date appears	2021-03-23 09:57:50 -04:00
Eric Rosenbaum	2330553765	re-add the carousel component in a box	2021-03-22 17:27:52 -04:00
Eric Rosenbaum	10f9194f61	fix form and carousel enough to display them	2021-03-22 17:24:18 -04:00
Paul Kaplan	cd0ab5dbc8	Merge pull request #5164 from paulkaplan/studio-roles ... Fetch studio info and roles in redux	2021-03-22 11:09:44 -04:00
Sarah Otts	a087ac4f18	Merge pull request #5165 from zoebentley/conference-update-followup-march-2021 ... Made small updates to Scratch 2021 Conference page	2021-03-22 10:47:53 -04:00
Sarah Otts	059b6bf2c5	Merge pull request #5166 from seotts/message-already-muted ... When a user is already muted, show a different message in the blue box	2021-03-22 10:20:15 -04:00
Zoë Bentley	bb46884667	replaced header image and modified strings	2021-03-19 15:23:12 -04:00
seotts	5d7d1cde3d	Add comments; fix reply logic	2021-03-19 15:18:36 -04:00
Paul Kaplan	57495259cf	Fix lint and remove unused code	2021-03-19 15:12:45 -04:00
Paul Kaplan	a97263cb91	Fetch studio info and roles in redux	2021-03-19 14:56:39 -04:00
seotts	94eb3dc6de	Continued work	2021-03-18 16:15:11 -04:00
Paul Kaplan	fd7b2ce41b	Replace remixes which was removed by mistake	2021-03-18 15:18:55 -04:00
Paul Kaplan	183a31d5ed	Merge pull request #5149 from paulkaplan/studio-redux-modules ... Reusable redux module for fetching paginated data	2021-03-18 11:56:27 -04:00
Paul Kaplan	4029f431b3	Fix linting	2021-03-18 11:42:01 -04:00
Paul Kaplan	96589f4066	Comment the useEffect usage	2021-03-18 11:38:38 -04:00
Paul Kaplan	f40f3fa7c7	Rename variables	2021-03-18 11:31:28 -04:00
Paul Kaplan	ac6b4616ba	Split project specific comment actions	2021-03-18 11:21:41 -04:00
Paul Kaplan	296c04ff99	Merge branch 'develop' into comments-reducer	2021-03-18 11:20:47 -04:00
seotts	23da1e2781	Continued work	2021-03-17 16:07:30 -04:00
Sarah Otts	c3342d9224	Merge pull request #5121 from zoebentley/conference-update-march-2021-fixed-dependencies ... Made changes to conf 2020 page (fixed dependencies)	2021-03-16 15:05:48 -04:00
Paul Kaplan	eb3bdfee56	Fix linting	2021-03-16 14:58:54 -04:00
Zoë Bentley	9e74481db4	Changed the date to be only one day, July 22	2021-03-16 14:57:04 -04:00
Paul Kaplan	acedd550da	Use the infinite loading module for all the data	2021-03-16 14:18:22 -04:00
Paul Kaplan	6b87429e65	Create a redux module for infinitely loading editable lists	2021-03-16 14:17:52 -04:00
Paul Kaplan	560379f9fb	Simple data fetching using react hooks	2021-03-16 14:17:52 -04:00
seotts	cf71b77622	Work on adding messaging for previous mute	2021-03-15 15:42:12 -04:00
Paul Kaplan	7b7266c5b4	Merge pull request #5117 from paulkaplan/studio-route ... Add dev route with very bare studio playground	2021-03-15 12:03:24 -04:00
chrisgarrity	8271bb62bb	Merge pull request #5141 from seotts/prevent-feedback-when-not-just-muted ... Prevent feedback when not just muted	2021-03-15 09:10:48 -04:00
Sarah Otts	da64706b0d	Remove unused FlexRow	2021-03-12 09:10:25 -05:00
seotts	936172d70b	only show feedback link for new mute ... Add variable for isBad string	2021-03-11 13:06:51 -05:00
seotts	f78a683b09	Update link to LLK to new Media Lab url	2021-03-10 16:16:06 -05:00
Paul Kaplan	fb4370b412	Remove dev routes on staging	2021-03-10 15:09:07 -05:00
Zoë Bentley	eabab89bd5	Made changes to conf 2020 page (fixed dependencies)	2021-03-10 11:13:46 -05:00
Paul Kaplan	24cdd291ca	Add staging route for studio playground	2021-03-09 15:32:35 -05:00
Sarah Otts	dc9d079e4b	Merge pull request #5116 from seotts/revert-revert-zoe-content-update ... Revert "Revert "Content updates march 2021""	2021-03-09 15:10:48 -05:00
seotts	a1759f42b3	Revert "Revert "Content updates march 2021"" ... This reverts commit 65f69d1201.	2021-03-09 14:38:36 -05:00
Ben Wheeler	4533c983fd	converted images around splash video to png, smaller file size	2021-03-09 10:15:44 -05:00
Paul Kaplan	49e62afa8b	Fix typo in mapStateToProps	2021-03-08 12:27:32 -05:00
Paul Kaplan	27dafac7f0	Move comments out of project reducer	2021-03-08 12:01:22 -05:00
Sarah Otts	cfb0a00414	Copy update on spam header	2021-03-04 16:19:39 -05:00
seotts	2cb9189b44	Add spam mute message	2021-03-04 13:49:38 -05:00
Sarah Otts	65f69d1201	Revert "Content updates march 2021"	2021-03-03 15:39:25 -05:00
Sarah Otts	4a625a634a	Merge pull request #5078 from zoebentley/content-updates-jan-2021 ... Content updates march 2021	2021-03-02 16:57:26 -05:00
Zoë Bentley	e2c98762fa	Updated people.json	2021-03-02 15:02:23 -05:00
zoebentley	e756d751c6	Update src/views/credits/credits.jsx ... Co-authored-by: Sarah Otts <se0042@gmail.com>	2021-03-02 14:40:57 -05:00
zoebentley	43e2eb22dd	Update src/views/about/about.jsx ... Co-authored-by: Sarah Otts <se0042@gmail.com>	2021-03-02 14:31:46 -05:00
zoebentley	695efb77c0	Update src/views/about/about.jsx ... Co-authored-by: Sarah Otts <se0042@gmail.com>	2021-03-02 14:28:38 -05:00
zoebentley	eb93e2dd9a	Update src/views/about/about.jsx ... Co-authored-by: Sarah Otts <se0042@gmail.com>	2021-03-02 14:28:12 -05:00
zoebentley	d2ec8e804e	Update src/views/credits/credits.scss ... Co-authored-by: Sarah Otts <se0042@gmail.com>	2021-03-02 14:19:29 -05:00
Zoë Bentley	d41a230e83	Added newline at end of file and changed languages count to be rounded down to 60	2021-03-02 14:09:52 -05:00
seotts	ec3a205dea	Create Plotly bundle to load only choropleth ... lint	2021-03-01 16:22:02 -05:00
Zoë Bentley	559f3d412c	Updated list of usernames	2021-03-01 14:48:01 -05:00
Paul Kaplan	dce9b99a62	Merge pull request #5058 from paulkaplan/split-phone-bundle ... Don't require a big phone number validation library on every page	2021-03-01 08:43:43 -05:00
Paul Kaplan	b0390f36a2	Fix lint and missing components	2021-02-26 11:01:13 -05:00
Paul Kaplan	0353135cc4	Split phone number step to reduce bundle for other registration pages	2021-02-26 10:31:20 -05:00
Paul Kaplan	da2ca40ccf	Only require libphonenumber when rendering phone inputs	2021-02-26 10:31:19 -05:00
Sarah Otts	faf9fcd26c	Merge pull request #5022 from zoebentley/sec-update-feb-2021 ... Change wording and image size on SEC page	2021-02-23 09:27:24 -05:00
Zoë Bentley	bc7063a65d	Made updates to wording on SEC page and changed size of image	2021-02-19 14:48:43 -05:00
Zoë Bentley	3fd4337f6e	lint	2021-02-19 12:04:14 -05:00
Zoë Bentley	118ffadb76	Changed images on About page and changed many text strings	2021-02-19 12:04:13 -05:00
Zoë Bentley	1caa1da81f	Began making changes to Credits page	2021-02-19 12:04:13 -05:00
Paul Kaplan	d79ae074b2	Update eslintrc for new UNSAFE_ rule	2021-02-19 11:39:21 -05:00
Paul Kaplan	56345874e3	Mark deprecated methods with UNSAFE_ prefix	2021-02-19 11:12:00 -05:00
Joel Gritter	e0e3a0c342	MacOS version string update ... "Mac OSX 10.4 or later" -> "Mac OSX 10.4 through 10.14" Fixes gh-4913	2021-02-18 13:37:12 -05:00
picklesrus	41f7fcd68d	Update relative-time-polyfill.js	2021-02-16 14:07:26 -05:00
picklesrus	14db1428f1	Update relative-time-polyfill.js	2021-02-16 14:06:10 -05:00
picklesrus	91c256ad75	Fix pluralrules polyfill ... This should hopefully fix the Safari 12 issues we were having.	2021-02-16 14:06:02 -05:00
picklesrus	d22049a22e	update feedback mistaake message	2021-02-16 14:05:12 -05:00
seotts	7bd6c98b0a	Fix proptype of startStep	2021-02-16 14:04:24 -05:00
seotts	e98e90dd4e	send automod feedback to api	2021-02-16 14:04:17 -05:00
Karishma Chadha	ca392e6d5b	Fix lint errors related to eslint-config-scratch update	2021-02-16 10:54:50 -05:00
picklesrus	4e97e7c60e	Merge pull request #4943 from picklesrus/reply-mute ... Open mute modal from reply button if you're muted.	2021-02-08 13:28:21 -05:00
picklesrus	7c382a73fa	Fix double reply button click bug by "cancelling" the reply when you click it and are already muted.	2021-02-08 07:38:39 -05:00
picklesrus	de5a8026c1	Show the blue box on replies that got the user muted.	2021-02-05 08:16:00 -05:00
picklesrus	9a3fe8f222	Show the correct step of the modal based on whether the reply was just a click to try to reply while already muted or whether they replied and got muted.	2021-02-05 08:01:33 -05:00
picklesrus	92667c097d	Add tests and expose steps enum so it can be referenced from outside MuteModal	2021-02-04 11:13:30 -05:00
chrisgarrity	baba146ffb	Merge pull request #4895 from chrisgarrity/relative-time-polyfill ... Add @formatjs/relativetimeformat-polyfill	2021-02-02 11:35:52 -05:00
picklesrus	f7bf204924	Draft: open mute modal from reply button if you're muted.	2021-02-02 11:34:27 -05:00
Chris Garrity	ae2bc24ffd	Add @formatjs/relativetimeformat-polyfill ... Safari < 14 does not support Intl.RelativeTimeFormat which is used in the moderation messaging. Adding this polyfill to support it. RelativeTimeFormat depends on Locale, which is also not available in Safari <14, and PluralRules, not available in Safari < 13. There is a trade off between adding locale-data for all users that load the page regardless of what browser they’re using and whether they get muted, and only localizing the most common languages. In the last 30 days only ~3% of users on scratch use a version of Safari (13.x) that doesn’t support Intl. Of that 3%, these 7 locales would cover over 60% of the users. English will be used by default if the locale data is not available.	2021-02-02 09:07:38 -05:00
Sarah Otts	f60a8c71a0	Merge pull request #4901 from seotts/automod-feedback-modal ... Automod feedback modal steps	2021-02-02 08:58:47 -05:00
picklesrus	6d53018486	Merge pull request #4938 from picklesrus/zero-minutes-fix ... Change time library to default to 1 minute when the time remaining is less than 30 seconds.	2021-02-01 15:56:37 -05:00
seotts	ba99d49298	Fix FeedbackForm tests + other small fixes ... Add strings	2021-02-01 15:50:55 -05:00
picklesrus	e6f056b178	Add message at the top of file mentioning the version in scratchr2	2021-02-01 15:35:02 -05:00
Karishma Chadha	26d3bb73c6	Merge pull request #4932 from LLK/hotfix/sec-text-update ... [Develop] Hotfix SEC Page Text Update	2021-02-01 10:32:27 -05:00
picklesrus	b8cc0b2b83	Change time library to default to 1 minute when the time remaining is less than 30 seconds.	2021-02-01 09:53:46 -05:00
Zoë Bentley	e51591620f	Changed text on SEC page (for hotfix)	2021-01-29 14:56:47 -05:00
seotts	42eb195b57	move feedback form to its own component	2021-01-28 15:45:00 -05:00
picklesrus	259446ed8e	Set buttons to be disabled (and not just look disabled) when the user was just muted. They were clickable before.	2021-01-28 15:07:20 -05:00
Chris Garrity	64c89b1716	Update to the general moderation message.	2021-01-28 12:11:35 -05:00
Chris Garrity	d639c2d7a9	Fix typo	2021-01-28 11:01:09 -05:00
Sarah Otts	90e0f40886	Merge branch 'develop' into automod-feedback-modal	2021-01-26 15:30:26 -05:00
seotts	a037395689	Merge branch 'automod-feedback-modal' of https://github.com/seotts/scratch-www into seotts-automod-feedback-modal ... # Conflicts: # src/components/modal/mute/modal.jsx # src/components/modal/mute/modal.scss # src/l10n.json	2021-01-26 15:27:05 -05:00
Chris Garrity	1afa2a3e33	Adjust formatting of the comment status box ... Reduce the width of the comment status paragraphs to make them easier to read. Ensure that the bottom text is still below all other text by making it 100% width.	2021-01-26 08:58:01 -05:00
Chris Garrity	eac7552841	Revise messaging when scratchers are muted ... We want folks to use comments appropriately, not punish them. Reword the messaging to be more friendly and encourage positive uses of comments.	2021-01-26 08:42:41 -05:00
seotts	9df36b0fcf	add tests for feedback form, clean-up form	2021-01-25 17:52:59 -05:00
Benjamin Wheeler	0155d28ea5	Merge pull request #4831 from GrahamSH-LLK/develop ... Update 1.4 Copytext	2021-01-25 13:32:48 -05:00
Ben Wheeler	7810eab73b	slight change to wording about newer versions of scratch	2021-01-25 13:31:59 -05:00
seotts	f2a3dfda1b	Revert "Revert "Use formik for feedback form"" ... This reverts commit c22c2c967b.	2021-01-22 15:14:21 -05:00
seotts	037f91e76c	Revert "Revert "Add feedback step using a Formsy textarea"" ... This reverts commit 1bc3aaf0ee.	2021-01-22 15:14:06 -05:00
seotts	1bc3aaf0ee	Revert "Add feedback step using a Formsy textarea" ... This reverts commit 5e4fc154c6.	2021-01-22 15:12:14 -05:00
seotts	c22c2c967b	Revert "Use formik for feedback form" ... This reverts commit 512358e9af.	2021-01-22 15:12:14 -05:00
seotts	b42966ac6a	Revert "Add feedback step using a Formsy textarea" ... This reverts commit 5e4fc154c6.	2021-01-22 12:13:40 -05:00
seotts	af56e2389c	Revert "Use formik for feedback form" ... This reverts commit 512358e9af.	2021-01-22 12:13:03 -05:00
seotts	512358e9af	Use formik for feedback form ... cleanup	2021-01-22 11:58:56 -05:00
seotts	5e4fc154c6	Add feedback step using a Formsy textarea	2021-01-22 11:58:56 -05:00
seotts	9d08b69bed	show correct messaging instead of always General	2021-01-20 13:03:39 -05:00
picklesrus	a5f436a4c0	Update compose-comment.jsx ... Fix whitespace	2021-01-14 08:05:47 -05:00
picklesrus	6eca07a413	Fix syntax error from merge	2021-01-14 07:55:54 -05:00
picklesrus	1326f71abe	Merge branch 'develop' into timeout-mute	2021-01-14 07:47:47 -05:00
picklesrus	55d69b0e7b	merge	2021-01-14 07:43:53 -05:00
picklesrus	47d63cb529	Reset more of the state when a mute expires. ... This allows the comment box to show up again in a normal state with no errors.	2021-01-14 07:42:53 -05:00
Paul Kaplan	e1d0329633	Fix lint issues again	2021-01-13 09:39:36 -05:00
Paul Kaplan	4ca6e52233	Fix formatting	2021-01-13 09:29:40 -05:00
Paul Kaplan	2a0aa3b03e	Add the FAQ	2021-01-13 08:55:22 -05:00
Paul Kaplan	5883070647	Update SEC page content	2021-01-12 15:59:59 -05:00
Benjamin Wheeler	596343048a	Merge pull request #4748 from mxmou/fix-search-loadmore ... Fix "Load more" scrolling on search results	2021-01-12 14:51:35 -05:00
picklesrus	19ef91d3d0	Merge pull request #4827 from picklesrus/mute-modal-vertical ... Update vertical spacing on mute modal	2021-01-12 10:31:28 -05:00
Ben Wheeler	07f6639ef3	changed wording of no javascript message per design team input	2021-01-11 14:04:55 -05:00
apple502j	62d4db7796	Add noscript tag	2021-01-11 14:04:55 -05:00
seotts	1aa59edaa3	Remove use of FormattedHTMLMessage	2021-01-08 14:03:29 -05:00
seotts	31016df1f5	Don’t fail if mute_status isn’t available	2021-01-07 14:05:02 -05:00
seotts	c8373ab888	Revert "Revert "Add new mute message types"" ... This reverts commit 1575ed06cf.	2021-01-07 14:04:48 -05:00
picklesrus	4879570561	Update vertical spacing on mute modal ... This reduces the vertical padding in the mute modal to better fit on shorter screens.	2021-01-07 11:07:39 -05:00
Sarah Otts	1575ed06cf	Revert "Add new mute message types"	2021-01-06 16:51:03 -05:00
Karishma Chadha	6d8cac4239	Merge pull request #4817 from LLK/hotfix/sec-google-nolink ... [Develop] Hotfix sec google nolink	2021-01-06 10:56:41 -05:00
Karishma Chadha	3bdb5abdd5	Merge pull request #4814 from kchadha/annual-report-credits ... Add Tracy to credits page and Annual Report team section.	2021-01-06 10:44:06 -05:00
Karishma Chadha	090312bf56	Merge pull request #4736 from seotts/world-map-fix ... World map fixes - Border thickness, Eswatini, remove unused css	2021-01-06 10:43:50 -05:00
Karishma Chadha	edca23f6ce	Add Tracy to credits page and Annual Report team section.	2021-01-05 15:51:38 -05:00
Sarah Otts	78d001e127	Merge pull request #4737 from seotts/team-new-tabs ... In the Annual Report Team section, open link to Scratch Team members in new tab	2021-01-05 14:38:03 -05:00
Sarah Otts	f3dbe23c5e	Fix syntax error from merge	2021-01-04 11:20:16 -05:00
Sarah Otts	b9892ff6d8	Merge branch 'develop' into automod-new-messaging	2021-01-04 11:09:29 -05:00
picklesrus	664ccc5d36	Update compose-comment.jsx ... Fix missing comma from bad merge	2020-12-21 10:49:16 -05:00
picklesrus	15a16e5b58	Merge branch 'develop' into timeout-mute	2020-12-21 08:38:37 -05:00
picklesrus	9037f8817a	Merge pull request #4774 from picklesrus/warning-mute ... Show warning message when user has been muted several times.	2020-12-21 08:36:21 -05:00
Benjamin Wheeler	0c911da463	Merge pull request #4563 from GrahamSH-LLK/patch-1 ... Add "FloralSunset" to Credits Page	2020-12-18 20:54:41 -05:00
seotts	7e140b3832	add new mute messages ... Get correct mute message info for modal remove extra spapce	2020-12-18 10:24:43 -05:00
picklesrus	ad5dc31cc7	Have mute modal always show if you post a comment and showWarning is true.	2020-12-18 09:30:02 -05:00
picklesrus	d8ad0c38ea	Show warning message when user has been muted several times.	2020-12-17 15:43:07 -05:00
picklesrus	1aca3c0f25	Merge pull request #4768 from picklesrus/fix-prop-warning ... Fix prop type. muteStepContent is an array not a string.	2020-12-17 10:00:26 -05:00
Benjamin Wheeler	aeaca81fb7	Merge pull request #4686 from benjiwheeler/api-check-username ... switch educator registration checkusername endpoint from scratchr2 to api	2020-12-16 20:43:19 -05:00
picklesrus	760082d2d7	Fix prop type. muteStepContent is an array not a string.	2020-12-16 07:54:20 -05:00
picklesrus	19b260a4a5	Add a timeout to stop displaying the mute status when a mute expires.	2020-12-15 14:49:35 -05:00
picklesrus	a39244ea6c	Merge branch 'develop' into timeout-mute	2020-12-14 13:27:12 -05:00
chrisgarrity	17407f0fcf	Merge pull request #4752 from chrisgarrity/localize-mute ... Localize mute	2020-12-11 16:19:27 -05:00
Chris Garrity	501147060d	Update generic message copy ... Updated copy requres two paragraphs in the content. Modified the inputs to pass a content array and output one paragraph per item.	2020-12-11 09:52:30 -05:00
Chris Garrity	929e670d8f	Internationalize the mute messages ... Add formatted messages for comment status and mute modal	2020-12-11 08:44:17 -05:00
picklesrus	110077e8e8	Rename state's muteExpiresAt to muteExpiresAtMs so units are explicit. ... Also, fix isMuted so it doesn't do an extra unit conversion.	2020-12-11 08:14:15 -05:00
GrahamSH	88aee16cb7	Move to fix alphabetization	2020-12-10 16:59:07 -05:00
MaxiMouse	8f4c67144a	Fix "Load more" scrolling on search results	2020-12-10 22:12:51 +01:00
Benjamin Wheeler	8d4a5c2f91	Merge pull request #4526 from Purple-Hacker/patch-2 ... Updated addresses on DMCA	2020-12-10 14:21:28 -05:00
Benjamin Wheeler	0aa15b91c9	Merge pull request #2763 from apple502j/patch-10 ... Change min height	2020-12-10 14:15:19 -05:00
picklesrus	2d5e9a6378	Fix merge conflicts and set default object for mute_status if props do not exist.	2020-12-08 08:00:01 -05:00
picklesrus	835a271be4	Show the comment status box on project page loads if the user is muted. ... Don't show the compose box if they're muted, but do show it, but greyed out, if they just posted a comment that resulted in a mute.	2020-12-08 07:28:40 -05:00
seotts	b7cf82494b	Remove unused variable and fix spacing	2020-12-07 16:16:42 -05:00
picklesrus	f4f6b70f2e	Merge branch 'develop' into readable-time	2020-12-07 16:05:02 -05:00
picklesrus	b1d4c6d1b5	Add backup langauges and remove tests that aren't useful.	2020-12-07 15:38:58 -05:00
seotts	1d70ee243c	Make borders smaller, show data for Eswatini	2020-12-07 12:45:01 -05:00
seotts	86650e1ce9	open link to Scratch Team member in new tab	2020-12-07 12:43:43 -05:00
Paul Kaplan	591b3ce6a2	Add Google.org to intro paragraph on SEC	2020-12-04 09:13:02 -05:00
Colby Gutierrez-Kraybill	6dc8d5ec74	Update routes.json	2020-12-02 14:18:47 -05:00
Colby Gutierrez-Kraybill	c92f161fa1	Merge pull request #4717 from LLK/hotfix/gh-4708 ... [release] gh-4708	2020-12-02 13:50:22 -05:00
Colby Gutierrez-Kraybill	f151f8dfeb	Missing end optional parameter regex in annual-report	2020-12-02 13:30:15 -05:00
Colby Gutierrez-Kraybill	4973ff4a5d	Follow the pattern of other routes, like contact-us for parameter ignoring in annual-report route	2020-12-02 12:16:44 -05:00
Colby Gutierrez-Kraybill	fd6018a92f	Allow extra parameters to match annual-report route	2020-12-02 12:07:12 -05:00
Paul Kaplan	f315ea2f15	Update the SeC page wording ... Replace the phrase "historically underrepresented in computing” with “ historically excluded from computing.” Change requested from KO.	2020-12-01 13:32:36 -05:00
picklesrus	b450d36a64	Redo time based on new requirements.	2020-11-30 16:16:52 -05:00
Sarah Otts	fec148ac74	Merge pull request #4682 from LLK/annual-report-video-spinner ... Add loading spinner in Annual Report	2020-11-25 15:29:11 -05:00
picklesrus	0f83b0c7c8	Merge pull request #4655 from picklesrus/use-minutes ... Disable comment box functionality when you've just been muted.	2020-11-25 10:18:41 -05:00
Ben Wheeler	590873c765	switch educator registration checkusername endpoint from scratchr2 to api	2020-11-24 13:54:11 -05:00
seotts	246798b69d	Use “play” event listener; clean-up code	2020-11-23 12:17:12 -05:00
seotts	785386b1c7	add newline to end of file	2020-11-23 11:15:44 -05:00
seotts	f75337dafd	preload spinner image	2020-11-19 10:27:01 -05:00
picklesrus	71521e2aa5	Fix lint and update text.	2020-11-18 14:48:15 -05:00
picklesrus	fe9d9078b2	Fix styling of disabled comment box.	2020-11-18 14:40:11 -05:00
Zoë Bentley	dad5a34fbe	Changed Teacher Accounts Setup Guide link to PDF link on resources server	2020-11-18 12:50:22 -05:00
Zoë Bentley	1bfa0f20a3	Changed Teacher Account Setup Guide link from .doc to .PDF	2020-11-18 12:05:33 -05:00
Ray Schamp	433a5c7100	Merge pull request #4664 from LLK/hotfix/hoc-banner-2020 ... [Develop] HOC banner 2020	2020-11-18 10:23:56 -05:00
Ray Schamp	470620a12a	Merge pull request #4654 from LLK/hotfix/hoc-banner-2020 ... [Release] HOC banner 2020	2020-11-18 10:20:53 -05:00
picklesrus	aed0f024c0	Disable comment box functionality when you've just been muted. ... Also, keep showing the blue comment status box based on when the mute expires rather than basing it on the status of the commet box itself. TODO: css for disabled state. The grey is there as a placeholder/proof of concept.	2020-11-17 17:04:54 -05:00
Ben Wheeler	a4689fc159	Turn off middle banner and set HoC start and end times for 2020	2020-11-17 15:04:29 -05:00
Ben Wheeler	bd3ef208f6	added makeItFly image and text for HoC banner	2020-11-17 15:04:07 -05:00
Paul Kaplan	2292fc039d	Merge pull request #4649 from LLK/hotfix/sec-page ... [Hotfix/Develop] SEC page	2020-11-17 11:17:43 -05:00
Paul Kaplan	b92b98bd19	Fix hyphens	2020-11-16 15:19:42 -05:00
Paul Kaplan	2799bc97f6	Fix lint error	2020-11-16 14:39:37 -05:00
seotts	cf9cbdf392	Hide iframe & show spinner until it begins playing	2020-11-16 14:33:46 -05:00
Paul Kaplan	ee645b250a	Add culturally sustaining link	2020-11-16 14:31:31 -05:00
Christopher Willis-Ford	35839ada12	remove version number from micro:bit firmware URL ... This new URL will be a redirect to the actual file, including the version number. This way we'll be able to deploy firmware updates without needing to change any content in this repository.	2020-11-16 11:04:36 -08:00
seotts	cb01cb9321	use Wistia api to do callback	2020-11-16 12:36:07 -05:00
Paul Kaplan	550a661687	Add SEC page	2020-11-16 10:35:40 -05:00
picklesrus	b1f7a2be10	Merge pull request #4637 from picklesrus/use-minutes ... Convert mute timestamp to always show in minutes.	2020-11-16 10:28:55 -05:00
Karishma Chadha	760e303d30	Merge pull request #4617 from kchadha/annual-report-data-cleanup ... Annual Report - Break out supporters list into separate JSON	2020-11-16 10:15:28 -05:00
Karishma Chadha	4728e3f50e	Merge pull request #4615 from kchadha/annual-report-link ... Add link to annual report from about page	2020-11-16 10:15:02 -05:00
picklesrus	0470e0e56b	Convert timestamp to always show in minutes. ... This is minor step towards correct time formatting. More coming later.	2020-11-13 15:03:49 -05:00
picklesrus	bfc4202d11	Use singular units so the library handles plurals.	2020-11-13 14:14:42 -05:00
Benjamin Wheeler	79d3d07dcc	Merge pull request #4284 from doc-han/patch-1 ... update translation URL	2020-11-13 14:13:16 -05:00
Ben Wheeler	f2111eb5a3	updated number of languages	2020-11-13 14:11:25 -05:00
picklesrus	13369c3809	add spaces	2020-11-13 08:37:18 -05:00
picklesrus	6eb7504442	Initial time formatting pass. Does integer minutes, hours, days. ... TODOS: - set langauge appropriately - do partial hours and days. e.g. 1 hour 5 minutes instead of just 1 hour. Add a time formatting utility that formats a relative time in the future. Use it in the mute modal & comment box.	2020-11-13 08:26:54 -05:00
Ben Wheeler	ccf0e92e98	removed communityblocks-interviews from routeAlias entries	2020-11-12 13:43:33 -05:00
Radman Siddiki	89c5ea324b	Remove Community Blocks Interviews Route	2020-11-12 13:43:33 -05:00
Radman Siddiki	b74d857ad9	Delete communityblocks-interviews.jsx	2020-11-12 13:43:33 -05:00
Karishma Chadha	e14b6d52f3	Add spinner while video is still loading	2020-11-10 14:37:18 -05:00
picklesrus	2005b23777	Merge pull request #4616 from picklesrus/mute-behavior ... Skeleton of code to show mute modal and comment status.	2020-11-10 10:24:04 -05:00
picklesrus	b8b0f5d10c	Merge pull request #4580 from picklesrus/modal-image-updates ... A few small upates to the muting modal	2020-11-10 09:52:41 -05:00
Karishma Chadha	f89d1313e0	Break out supporters lists into json file and dynamically create lists of supporters.	2020-11-09 11:37:31 -05:00
picklesrus	e5f97d1f18	Skeleton of code to show mute modal and comment status. ... Still todo: - l10n - Time needs formatting - Compose box needs to be shown/formatted correctly based on mute status - Blue comment status box need to be sticky	2020-11-09 11:01:42 -05:00
Karishma Chadha	c3accb0111	Add link to annual report from about page	2020-11-09 10:20:11 -05:00
Benjamin Wheeler	69efc1afea	Merge pull request #4287 from R4356th/patch-11 ... Replace "Tips Page" with "Ideas Page"	2020-11-05 09:41:48 -05:00
picklesrus	495edd1820	A few small upates: ... - Add images and update styles to match. - Add timeMuted prop so it can display how long the user is muted for. - Text updates This still needs localization.	2020-10-30 10:07:43 -04:00
Karishma Chadha	4369899813	Fix BLM studio link	2020-10-29 09:43:10 -04:00
Karishma Chadha	4f6828bde8	Update board member section	2020-10-28 18:31:10 -04:00
seotts	b3cdc0ebcd	fix Mahmoud’s image	2020-10-28 18:17:07 -04:00
seotts	729739c222	fix typo in project title	2020-10-28 18:04:51 -04:00
Karishma Chadha	412de9dbda	Fix typos in content	2020-10-28 17:08:36 -04:00
Karishma Chadha	8d722d454f	Update l10n to remove unused strings from financials section	2020-10-28 13:06:44 -04:00
seotts	367ada3452	remove middle of financials section	2020-10-28 12:57:20 -04:00
Karishma Chadha	b673d718d4	Minor content update	2020-10-28 10:34:41 -04:00
Karishma Chadha	9a5560bdf5	Don't show scratch-jr-transition images on small screens. Fix lint issue.	2020-10-27 16:43:21 -04:00
seotts	a8058aa0bf	remove comments; add new lines	2020-10-27 15:29:50 -04:00
seotts	5e075a2feb	make financials button responsive	2020-10-27 14:23:34 -04:00
seotts	23736463f8	make map key even more responsive	2020-10-27 14:16:42 -04:00
seotts	f88fd8279a	make map key responsive	2020-10-27 13:55:10 -04:00
Karishma Chadha	73cf337ac2	Map title update	2020-10-27 12:55:16 -04:00
Karishma Chadha	5771444811	Some content/copy changes.	2020-10-27 12:26:25 -04:00
seotts	90650ff5d8	fix community guidelines bullet points	2020-10-27 12:12:59 -04:00
carljbowman	2db15df51e	Tweaks to the map container ... - Ajust border radius - Remove bottom padding to make the map flush with the bottom, which required adding `overflow: hidden` to maintain the bottom border radius.	2020-10-27 11:51:27 -04:00
seotts	ae16b8638b	un-yoda-fy some country names (eg “Korea, Rep..”)	2020-10-27 11:49:00 -04:00
seotts	96b2627dd0	remove outline on blm project tiles	2020-10-27 11:36:25 -04:00
carljbowman	a028512aa3	Fix overlapping text in Financials key section	2020-10-27 11:27:26 -04:00
carljbowman	d05486d4d1	Adjust layout / spacing of BLM story	2020-10-27 11:19:53 -04:00
carljbowman	3f57ccecfa	Tweak rules and spacing on donor lists	2020-10-27 11:17:55 -04:00
carljbowman	c08230aa45	Fix fallback fonts for buttons ... Removed the narrowly scoped font-family definition on the button elements. Now buttons inherit the site wide font-family specification, which include the appropriate fallbacks.	2020-10-27 11:03:32 -04:00
carljbowman	29d03282d4	Fix Tutorial stats layout	2020-10-27 10:46:26 -04:00
carljbowman	dbae2cbe66	Fix layout issues with CPS grid of 4 photos ... - Reorder images so supporting illustrations do not overlap important photographic content - Tweaked Pizza and Pencils positioning to adjust layout	2020-10-27 10:30:47 -04:00
carljbowman	e2894dd18d	Fix photo credit typographic styles	2020-10-27 10:13:54 -04:00
Karishma Chadha	b689702930	Leadership renamed to Team in subnav. Update content in Supporters and Team sections. Fix board member company attribution. Update Mitch's name in people grid.	2020-10-27 02:08:05 -04:00
Karishma Chadha	e2db5fd562	Minor content update for initiatives description	2020-10-27 01:28:05 -04:00
Karishma Chadha	615aa812c5	Update content/copy from Initiatives - Community through Financials section. Add missing link in Initiatives - Schools section. Add new financials note. Fix financials percentages. Clean up some commented out code from scss file.	2020-10-27 01:26:15 -04:00
Karishma Chadha	da1e8c00c5	Update translation image in reach section. Fix remaining world map prop type warning.	2020-10-27 01:20:04 -04:00
Karishma Chadha	a8c7919f5f	Add Initiatives description.	2020-10-26 22:36:02 -04:00
Karishma Chadha	f284200997	Fix 'languages' typo	2020-10-26 18:46:37 -04:00
Karishma Chadha	5fc610ac87	Update content strings through Initiatives - Creative Tools. Also includes fixes for supporter levels where they were missing a 0. Added the new initiatives description blurb to l10n.json, though it's not yet referenced in the html.	2020-10-26 18:40:51 -04:00
seotts	9956ded2ad	fix conferences spaces, mobile	2020-10-26 17:51:33 -04:00
seotts	f0951af780	fixed abhi section at intermediate size	2020-10-26 17:45:37 -04:00
seotts	d68691de40	add map key	2020-10-26 17:36:23 -04:00
carljbowman	020e9029e9	Fix relatively sized line-height on paragraph styles ... Paragraphs with larger font sizes will now have proportionally sized line-heights based on the font size.	2020-10-26 15:11:32 -04:00
Karishma Chadha	14397625db	Move transition messages from milestones section into reach section. Fix ScratchJr transition messages based on changes made with the milestone-reach transition images. Fix lint issue.	2020-10-26 01:27:00 -04:00
Karishma Chadha	3546be1b12	Make data point numbers in Reach section bold. Make spacing more consistent in mission section of the scss file.	2020-10-25 23:39:24 -04:00
Karishma Chadha	240fd5e53b	Make 4Ps more consistent with design sketch for all screen sizes.	2020-10-25 23:10:11 -04:00
Karishma Chadha	8cf04fe705	Fix incorrect scroll position behavior on Safari by switching to use window.scrollTo. Rename Donate section title to Support Us	2020-10-23 18:48:53 -04:00
seotts	c0fb4970e2	open donate link in new tab	2020-10-23 16:57:53 -04:00
seotts	83263631df	Fix page title (in tab)	2020-10-23 16:51:46 -04:00
seotts	29a81b08c1	fit community guidelines into 2 cols	2020-10-23 16:48:12 -04:00
seotts	497ba5c6f3	fix tutorials spacing and size	2020-10-23 16:45:17 -04:00
seotts	544df10aae	content updates	2020-10-23 11:57:37 -04:00
seotts	c460b4fbad	update financials copy	2020-10-23 09:23:35 -04:00
Karishma Chadha	c6b967a688	Fix 4ps being out of order on smaller screens, fix responsiveness issues, initiatives tools hero images now scale along with page width. Fix #view width at 100% like some other pages do.	2020-10-23 00:17:58 -04:00
Karishma Chadha	99d8997035	Update content for message, covid response, and mission	2020-10-22 22:23:28 -04:00
Karishma Chadha	7904c7c1ca	Fix font size on conferences photo credits and remove LLK from photo credits	2020-10-22 18:38:38 -04:00
Karishma Chadha	c10a805197	Add updated blocks images for reach section, clean up images folder (creating financials and reach subfolders)	2020-10-22 17:39:22 -04:00
seotts	9a0ce3db48	make equity and global strategies taller	2020-10-22 16:01:18 -04:00
rschamp	c3514aeb4c	Finishing touches on responsive map	2020-10-22 15:47:21 -04:00
rschamp	59f0f2c093	Make the map always 100% width with 2:1 aspect ratio	2020-10-22 15:20:31 -04:00
carljbowman	964204c77f	Update paragraph size for one-p ... Change the size of the description with four p’s.	2020-10-22 15:10:35 -04:00
seotts	96fc42c496	formatting extensions statistics	2020-10-22 15:09:38 -04:00
seotts	d9415d6fe4	reduce space between paragraphs	2020-10-22 15:01:47 -04:00
seotts	3329a58da2	fix size of missions illustrations	2020-10-22 14:54:52 -04:00
seotts	9182ab9421	fix sizes of tools hero images	2020-10-22 14:44:35 -04:00
Karishma Chadha	df27950a31	Remove mapHeight and mapWidth prop validation since they're no longer in use	2020-10-22 12:20:26 -04:00
Karishma Chadha	aa25ee9d38	Add final team photo and updated blocks image, fix some responsiveness issues	2020-10-22 11:50:49 -04:00
seotts	3ccd72efec	schools section respnsiveness	2020-10-22 11:50:48 -04:00
Karishma Chadha	44a5394667	More responsiveness updates and replace placeholder image for donate section	2020-10-22 11:50:48 -04:00
rschamp	67ff392776	Start on responsive map	2020-10-22 11:50:48 -04:00
Karishma Chadha	d1285b91ee	Some more responsiveness fixes for intermediate size	2020-10-22 11:50:48 -04:00
rschamp	ed29a391fc	Update translate intro with more context	2020-10-22 11:50:48 -04:00
seotts	dea1362697	make small scratch team grid have two columns	2020-10-22 11:50:48 -04:00
seotts	b931cf9645	fix cut-off bullet points	2020-10-22 11:50:48 -04:00
seotts	67d4090377	add wistia version of cps video	2020-10-22 11:50:48 -04:00
seotts	551eea91b5	Revert "Add CPS video" ... This reverts commit ec97646bf7430e874b0045a61a5f9d39d4c862de.	2020-10-22 11:50:48 -04:00
seotts	be49e209bb	Revert "Add ability to display YouTube in addition to Wistia" ... This reverts commit 8d758f0420b967aa5d3f9e9c14b9f9201c2702a6.	2020-10-22 11:50:48 -04:00
seotts	dd1fa88889	scratchjr transition images	2020-10-22 11:50:48 -04:00
Karishma Chadha	8cec16ca9f	Fix 4-column (mobile) responsiveness for creative tools section	2020-10-22 11:50:48 -04:00
Karishma Chadha	8c8052c052	Fix 4-column (mobile) responsiveness of schools and community sub-sections	2020-10-22 11:50:48 -04:00
Karishma Chadha	64bdc9eb29	Fix lint errors	2020-10-22 11:50:48 -04:00
seotts	ff6a3eb30f	Add CPS video	2020-10-22 11:50:48 -04:00
seotts	79bc95a4c6	Add ability to display YouTube in addition to Wistia	2020-10-22 11:50:48 -04:00
seotts	5e1739f7c5	add leadership content	2020-10-22 11:50:48 -04:00
seotts	79b538dee3	add correct hrefs to links, and open in new tabs	2020-10-22 11:50:48 -04:00
seotts	c08650f2b7	add abhi video and fix thumbnail hover	2020-10-22 11:50:48 -04:00
seotts	e10898a765	Add BLM video	2020-10-22 11:50:48 -04:00
Karishma Chadha	84151dd298	Schools subsection of Initiatives, not fully responsive yet	2020-10-22 11:50:47 -04:00
seotts	0770941845	add padding to top of our team	2020-10-22 11:50:46 -04:00
seotts	88dfdc32ce	localizable pillars	2020-10-22 11:50:46 -04:00
seotts	2f119961ec	work on making reach and tools responsive	2020-10-22 11:50:46 -04:00
seotts	ce6442b337	update content in reach section	2020-10-22 11:50:46 -04:00
seotts	f83df24519	add pillars graphics	2020-10-22 11:50:46 -04:00
rschamp	d113dda808	Mission section - rough in some responsiveness	2020-10-22 11:50:46 -04:00
Karishma Chadha	ece76e090a	Remove transition images between milestones and reach from views that are smaller than desktop width	2020-10-22 11:50:46 -04:00
seotts	4513fd8503	finish tools mobile intermediate	2020-10-22 11:50:46 -04:00
Karishma Chadha	6c7096c314	Link to audited financials pdf in the financials section	2020-10-22 11:50:46 -04:00
seotts	fc7b58364b	finished tools for tablet	2020-10-22 11:50:46 -04:00
seotts	a7a943dff5	finish tools section for desktop	2020-10-22 11:50:46 -04:00
rschamp	51637c250d	Fix mission subheading style	2020-10-22 11:50:46 -04:00
seotts	6360149c96	progress on tools section	2020-10-22 11:50:46 -04:00
seotts	35f20e15f5	tools hero images	2020-10-22 11:50:46 -04:00
rschamp	d6a685d47f	Mission l10n	2020-10-22 11:50:46 -04:00
rschamp	c51d7d55a5	Mission section non-responsive non-localized	2020-10-22 11:50:46 -04:00
seotts	eb6bbb2c96	fix abhi’s name	2020-10-22 11:50:46 -04:00
seotts	78c871541c	start on tools section	2020-10-22 11:50:46 -04:00
seotts	17b658316b	fix video sizing	2020-10-22 11:50:45 -04:00
seotts	cc67b79f00	work on community responsive	2020-10-22 11:50:45 -04:00
rschamp	261313091d	More lint	2020-10-22 11:50:45 -04:00
seotts	a558c23f8c	lint fix	2020-10-22 11:50:45 -04:00
seotts	1648ad25d8	continued work on initiatives	2020-10-22 11:50:45 -04:00
seotts	aea79a7e58	continued work on initiatives section	2020-10-22 11:50:45 -04:00
seotts	438c5ec0b5	create and use video-preview component	2020-10-22 11:50:45 -04:00
seotts	51904492e9	work on blm section	2020-10-22 11:50:45 -04:00
seotts	04b76feea1	work on map responsiveness	2020-10-22 11:50:45 -04:00
seotts	971f19b352	continued work on community section	2020-10-22 11:50:45 -04:00
seotts	712004ff02	work on initiatives section	2020-10-22 11:50:45 -04:00
seotts	c61953e94a	remove reference to deleted css file	2020-10-22 11:50:45 -04:00
Sarah Otts	cf4fbfd98f	add newline	2020-10-22 11:50:45 -04:00
seotts	9434bf67f6	remove unused code	2020-10-22 11:50:45 -04:00
seotts	c1754b33cc	switch to color variables in css	2020-10-22 11:50:45 -04:00
Karishma Chadha	d3e3171efa	Clean up annual report jsx file, add comments for functions and constants	2020-10-22 11:50:45 -04:00
seotts	7b48b50fc1	remove extra css	2020-10-22 11:50:45 -04:00
seotts	9ef0216c28	Made some country names less Yoda-esque	2020-10-22 11:50:45 -04:00
seotts	ed64a1267a	update map data	2020-10-22 11:50:45 -04:00
Karishma Chadha	064877bf82	Fix lint errors by commenting out empty divs	2020-10-22 11:50:44 -04:00
Karishma Chadha	c4d8d443f1	Make world map sizing a little bit bigger and give some control over this to whatever uses the component. Fix styling for transition images between the milestones and reach sections (e.g paint brush)	2020-10-22 11:50:44 -04:00
seotts	50672aec9e	add read content, translation subsection	2020-10-22 11:50:44 -04:00
Karishma Chadha	1558178318	Remove map view from experimentation phase, clean up world map component (getting rid of lint errors)	2020-10-22 11:50:44 -04:00
seotts	4301446af8	continued work on reach section	2020-10-22 11:50:44 -04:00
seotts	6624dfcfa9	finalize leadership section	2020-10-22 11:50:44 -04:00
seotts	d53a8f71c2	reorder donors, finalize supporters section	2020-10-22 11:50:44 -04:00
seotts	dc5461ef55	continued work on reach section	2020-10-22 11:50:44 -04:00
seotts	5ff0e3468b	work on reach section	2020-10-22 11:50:44 -04:00
Karishma Chadha	8b1c008ee2	Added covid response section and fixed responsiveness of message section	2020-10-22 11:50:44 -04:00
seotts	34440308eb	work on leadership section	2020-10-22 11:50:44 -04:00
Karishma Chadha	1b574cc2ab	Changing subnav to fixed position, removing remnants of the ideas page, more updates to the message section	2020-10-22 11:50:44 -04:00
Karishma Chadha	a1b77639de	Beginnings of message section and fixing some subnav behavior	2020-10-22 11:50:44 -04:00
seotts	39ec707cb7	finishing up (?) supporters responsiveness	2020-10-22 11:50:44 -04:00
seotts	90a10bb72e	work on supporters responsiveness	2020-10-22 11:50:44 -04:00
Karishma Chadha	fbea2ad525	Finishing up financials section (except for link to PDF)	2020-10-22 11:50:44 -04:00
Karishma Chadha	cbab000486	Finalizing donate and milestones sections	2020-10-22 11:50:44 -04:00
seotts	2ca47dffae	supporters content	2020-10-22 11:50:44 -04:00
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