3867 commits

Author	SHA1	Message	Date
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
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
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
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