377 commits

Author	SHA1	Message	Date
Eric Rosenbaum	eb3c65d078	Revert "Revert "[master] Release 2021-04-07""	2021-04-14 10:18:08 -04:00
picklesrus	2dcbeb4661	Revert "[master] Release 2021-04-07"	2021-04-09 08:34:55 -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
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
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
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
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
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
Paul Kaplan	6b87429e65	Create a redux module for infinitely loading editable lists	2021-03-16 14:17:52 -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
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
picklesrus	3dfcfa1e9d	Remove unused tests	2021-03-08 17:22:05 -05:00
Ben Wheeler	466684cea3	updated chromedriver using npm install --save	2021-03-08 15:44:55 -05:00
Benjamin Wheeler	4c880895fa	Revert "Bump chromedriver version to 88, increase jest integration timeouts"	2021-03-08 15:22:39 -05:00
Paul Kaplan	27dafac7f0	Move comments out of project reducer	2021-03-08 12:01:22 -05:00
BryceLTaylor	2933fbce94	Bump chromedriver version to 88, increase jest integration timeouts	2021-03-08 10:23:03 -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
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	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
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