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
b1d4c6d1b5
Add backup langauges and remove tests that aren't useful.
2020-12-07 15:38:58 -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
picklesrus
bfc4202d11
Use singular units so the library handles plurals.
2020-11-13 14:14:42 -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
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
Bryce Taylor
9f6faee25b
Merge pull request #4479 from BryceLTaylor/move-footer-tests-to-jest
...
Move footer integration tests to jest
2020-10-16 09:46:13 -04:00
Bryce Taylor
c24dc24d28
Merge pull request #4496 from BryceLTaylor/skip-failing-project-page-test
...
Skip failing project page test
2020-10-13 11:06:25 -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
BryceLTaylor
d504fa3cb3
Skip project page copy link integration test
2020-10-09 11:45:01 -04:00
picklesrus
0e6e49759c
Commenting status component.
2020-10-08 15:12:09 -04:00
Bryce Taylor
c3f59957d7
Merge pull request #4465 from BryceLTaylor/Move-project-page-tests
...
Move project page tests
2020-10-08 11:20:03 -04:00
Bryce Taylor
b5e2ae705b
Note logged out tests in test/integration/project-page.test.js
...
Co-authored-by: Ray Schamp <rschamp@users.noreply.github.com>
2020-10-06 16:52:07 -04:00
Bryce Taylor
60c6bb8d2c
Add default project id to test/integration/project-page.test.js
...
Co-authored-by: Ray Schamp <rschamp@users.noreply.github.com>
2020-10-06 16:51:31 -04:00
BryceLTaylor
530fb1b87c
update match in footer integration tests
2020-10-06 16:42:57 -04:00
BryceLTaylor
8c4303a5b4
match the whole pathname instead of just the end
2020-10-06 15:42:59 -04:00
picklesrus
eccf6be8d2
Add test for mute modal.
2020-10-05 11:09:54 -04:00
picklesrus
6e72f6b4ee
Add mute-step unit test.
2020-10-05 08:49:05 -04:00
BryceLTaylor
3d4f579e3a
Move footer integration tests to jest
2020-10-02 16:53:52 -04:00
BryceLTaylor
7a50c04885
Move join integration tests to Jest, add some tests
2020-09-30 14:30:00 -04:00
BryceLTaylor
02e3657bca
Remove legacy project page tests
2020-09-29 10:57:18 -04:00
BryceLTaylor
2e79da8a1c
Use const instead of let when finding chrome version
2020-09-23 17:06:13 -04:00
BryceLTaylor
a2d2eca54c
change chromedriver version to a const
2020-09-23 17:02:55 -04:00
BryceLTaylor
ebc54bb100
get chromedriver version from the package
2020-09-23 16:59:00 -04:00
BryceLTaylor
a5f0628751
Move project page tests to jest
2020-09-22 16:30:18 -04:00
BryceLTaylor
8d5b139595
Pin chrome version for saucelabs to chromedriver version
2020-09-14 15:25:01 -04:00
BryceLTaylor
e42ceaf78c
Update My-Stuff tests to correctly use ‘expect’ and remove sleeps
2020-08-27 13:42:23 -04:00
BryceLTaylor
78c0720793
Add waits to my-stuff tests so they’ll pass on saucelabs
2020-08-21 10:12:12 -04:00
BryceLTaylor
1aa55ca5a2
Update Chrome version used by sauselabs in tests
2020-08-21 10:11:14 -04:00
Bryce Taylor
25dccfd9a6
Merge pull request #4261 from BryceLTaylor/move-my-stuff-tests-to-jest
...
Move my stuff tests to jest
2020-08-20 10:30:08 -04:00
