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
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
picklesrus
a567a593fe
Merge pull request #4495 from picklesrus/comment-status
...
Commenting status component.
2020-10-13 09:03:41 -04:00
picklesrus
0e6e49759c
Commenting status component.
2020-10-08 15:12:09 -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
picklesrus
597216113b
Merge pull request #4293 from LLK/hotfix/messages
...
[Develop] Hotfix/messages
2020-08-10 12:25:45 -04:00
picklesrus
05075712e8
Merge pull request #4292 from picklesrus/backoff-messages
...
Exponentially back off the time between message polling.
2020-08-07 14:45:56 -04:00
picklesrus
6078c3653b
Puts back the original change but sets the default to Lax instead of Strict. Scratchr2 needs these cookies sent on top level navigations.
2020-08-05 10:50:06 -04:00
picklesrus
62629413a7
Revert "Make the cookie library set the SameSite cookie value to strict by default"
2020-08-03 14:45:34 -04:00
picklesrus
a67a34a06c
remove stray debugger
2020-07-30 11:08:34 -04:00
picklesrus
0036550ae8
Move timeout id out of state to a member variable and add some unittests.
2020-07-30 10:55:18 -04:00
picklesrus
34c8652ffb
Fix capitalization: cookie library we use requires sameSite in opts object to have a lowercase s.
2020-07-20 15:32:54 -04:00
picklesrus
10a4e92d21
Make the cookie library set the SamSite cookie value to strict by default. If callers want to set it to something else, they can pass it through the opts object like they can 'exprires'.
...
Also added a test file for jar.js so I could test the set method. The
other methods remain untested.
2020-07-20 15:18:09 -04:00
picklesrus
fac3ccad57
Make all times be in ms.
2020-07-17 14:44:36 -04:00
picklesrus
7eeb63cb3f
rename SetupMessagePolling to pollForMessages
2020-07-16 12:24:13 -04:00
Benjamin Wheeler
21ccd45f9b
Merge pull request #4121 from apple502j/wiki-link
...
Set wiki link per user's selected language
2020-07-09 14:20:28 -04:00
picklesrus
5de96c373d
Exponentially back off the time between message polling instead of doing it every two minutes.
2020-07-06 17:44:28 -04:00
Benjamin Wheeler
dc79eb54c3
Merge pull request #3974 from benjiwheeler/move-to-country-data-lib
...
move country name lookup to library
2020-06-19 10:44:26 -04:00
Ben Wheeler
d388eef59f
renamed lookupCountryInfo and lookupCountryName functions
2020-06-19 10:42:34 -04:00
apple502j
a903e3e9b2
Set wiki link per user's selected language
2020-06-18 20:22:22 +09:00
Ben Wheeler
924c862b9e
remove email opt-in from join flow
2020-06-12 12:35:34 -04:00
Ben Wheeler
d1366360f1
removed lodash.debounce, use onmouseleave instead
2020-04-14 10:33:59 -04:00
Ben Wheeler
5805d8a0fe
first take on toggleable open close state for info messages
...
make info button have large, invisible boundary
fix info button ref setting
WIP: experiment with more sophisticated mouseout handling
add lodash debounce
use lodash debounce to reduce info message flickering
tweak info message position per added padding
remove leftover function
update info button tests, add a bunch more
2020-04-13 17:06:33 -04:00
Ben Wheeler
05e61cc842
changed student signup route from /join/TOKEN to /signup/TOKEN
2020-04-13 13:11:11 -04:00
Ben Wheeler
81678b70a7
refactored uri pathname parsing to library
2020-04-03 16:11:45 -04:00
