125 commits

Author	SHA1	Message	Date
Paul Kaplan	810465bfcf	Merge branch 'develop' into no-report-own-comments	2021-06-23 09:49:38 -04:00
Paul Kaplan	cfd52d9369	Pass a customized comment component for studios	2021-06-21 16:06:40 -04:00
Paul Kaplan	d35cee93f1	Fix unneeded variables	2021-06-21 12:34:49 -04:00
Paul Kaplan	1cace60ebd	Fix admin panel space remaining after logging out	2021-06-21 12:25:19 -04:00
picklesrus	740e8c19b6	Add tests for single comment mode.	2021-06-17 16:27:50 -04:00
picklesrus	36516447cc	Fix up tests from refactor and fix bug from refactor.	2021-06-15 17:22:32 -04:00
picklesrus	17307cacd3	Add tests	2021-06-10 16:51:41 -04:00
Paul Kaplan	2c53c70307	Merge pull request #5436 from paulkaplan/fix-admin-studio-comments ... Wait for session to be fetched before loading comments	2021-05-24 15:32:24 -04:00
Paul Kaplan	b38a97adf3	Studio admin panel	2021-05-18 11:41:32 -04:00
Paul Kaplan	53414e11a9	Update tests	2021-05-17 15:31:08 -04:00
Paul Kaplan	ef9318463e	Reset comments when admin logs in	2021-04-29 09:00:50 -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
seotts	d8a802fca2	Test that status gets correctly set in constructor	2021-03-19 15:42:54 -04:00
seotts	1744108570	Add test of shoudShowMuteModal when isReply	2021-03-19 15:29:29 -04:00
seotts	94eb3dc6de	Continued work	2021-03-18 16:15:11 -04:00
seotts	23da1e2781	Continued work	2021-03-17 16:07:30 -04:00
seotts	50f49c28a2	remove commented-out test	2021-03-11 16:31:59 -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	0a8d8ad6c5	Fix and add tests for feedback link	2021-02-11 15:44:25 -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
Sarah Otts	f60a8c71a0	Merge pull request #4901 from seotts/automod-feedback-modal ... Automod feedback modal steps	2021-02-02 08:58:47 -05:00
seotts	ba99d49298	Fix FeedbackForm tests + other small fixes ... Add strings	2021-02-01 15:50:55 -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	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
seotts	14c7a7eae0	temporarily remove failing test	2021-01-22 13:16:44 -05:00
picklesrus	1326f71abe	Merge branch 'develop' into timeout-mute	2021-01-14 07:47:47 -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
Sarah Otts	b9892ff6d8	Merge branch 'develop' into automod-new-messaging	2021-01-04 11:09:29 -05:00
picklesrus	15a16e5b58	Merge branch 'develop' into timeout-mute	2020-12-21 08:38:37 -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	19b260a4a5	Add a timeout to stop displaying the mute status when a mute expires.	2020-12-15 14:49:35 -05:00
picklesrus	90ed44d6a8	Fix lint	2020-12-14 20:07:03 -05:00
picklesrus	2f2e95f3e2	Fix merge conflict.	2020-12-14 16:16:09 -05:00
picklesrus	a39244ea6c	Merge branch 'develop' into timeout-mute	2020-12-14 13:27:12 -05:00
picklesrus	242fedbfe6	Add a test that the constructor properly sets muteExpriresAtMs by converting from seconds to ms.	2020-12-14 08:45:08 -05:00
Chris Garrity	57a094179c	Fix tests again	2020-12-11 14:42:06 -05:00
Chris Garrity	015f036e93	Update tests ... Tests needed to be updated after wrapping the MuteModal component in the Intl HOC.	2020-12-11 08:45:29 -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
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
picklesrus	f4f6b70f2e	Merge branch 'develop' into readable-time	2020-12-07 16:05:02 -05:00
picklesrus	b450d36a64	Redo time based on new requirements.	2020-11-30 16:16:52 -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