2370 commits

Author	SHA1	Message	Date
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
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	0353135cc4	Split phone number step to reduce bundle for other registration pages	2021-02-26 10:31:20 -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	56345874e3	Mark deprecated methods with UNSAFE_ prefix	2021-02-19 11:12:00 -05:00
seotts	e23b27abc6	send automod feedback to api	2021-02-10 16:20:58 -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
picklesrus	f7bf204924	Draft: open mute modal from reply button if you're muted.	2021-02-02 11:34:27 -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
Zoë Bentley	e51591620f	Changed text on SEC page (for hotfix)	2021-01-29 14:56:47 -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
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
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	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
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
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