chrisgarrity
baba146ffb
Merge pull request #4895 from chrisgarrity/relative-time-polyfill
...
Add @formatjs/relativetimeformat-polyfill
2021-02-02 11:35:52 -05:00
Chris Garrity
ae2bc24ffd
Add @formatjs/relativetimeformat-polyfill
...
Safari < 14 does not support Intl.RelativeTimeFormat which is used in the moderation messaging. Adding this polyfill to support it. RelativeTimeFormat depends on Locale, which is also not available in Safari <14, and PluralRules, not available in Safari < 13.
There is a trade off between adding locale-data for all users that load the page regardless of what browser they’re using and whether they get muted, and only localizing the most common languages.
In the last 30 days only ~3% of users on scratch use a version of Safari (13.x) that doesn’t support Intl. Of that 3%, these 7 locales would cover over 60% of the users. English will be used by default if the locale data is not available.
2021-02-02 09:07:38 -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
e6f056b178
Add message at the top of file mentioning the version in scratchr2
2021-02-01 15:35:02 -05:00
Karishma Chadha
26d3bb73c6
Merge pull request #4932 from LLK/hotfix/sec-text-update
...
[Develop] Hotfix SEC Page Text Update
2021-02-01 10:32:27 -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
Zoë Bentley
e51591620f
Changed text on SEC page (for hotfix)
2021-01-29 14:56:47 -05:00
seotts
42eb195b57
move feedback form to its own component
2021-01-28 15:45:00 -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
64c89b1716
Update to the general moderation message.
2021-01-28 12:11:35 -05:00
Chris Garrity
d639c2d7a9
Fix typo
2021-01-28 11:01:09 -05:00
Sarah Otts
90e0f40886
Merge branch 'develop' into automod-feedback-modal
2021-01-26 15:30:26 -05:00
seotts
a037395689
Merge branch 'automod-feedback-modal' of https://github.com/seotts/scratch-www into seotts-automod-feedback-modal
...
# Conflicts:
# src/components/modal/mute/modal.jsx
# src/components/modal/mute/modal.scss
# src/l10n.json
2021-01-26 15:27:05 -05:00
Chris Garrity
1afa2a3e33
Adjust formatting of the comment status box
...
Reduce the width of the comment status paragraphs to make them easier to read. Ensure that the bottom text is still below all other text by making it 100% width.
2021-01-26 08:58:01 -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
Benjamin Wheeler
0155d28ea5
Merge pull request #4831 from GrahamSH-LLK/develop
...
Update 1.4 Copytext
2021-01-25 13:32:48 -05:00
Ben Wheeler
7810eab73b
slight change to wording about newer versions of scratch
2021-01-25 13:31:59 -05:00
seotts
f2a3dfda1b
Revert "Revert "Use formik for feedback form""
...
This reverts commit c22c2c967b
.
2021-01-22 15:14:21 -05:00
seotts
037f91e76c
Revert "Revert "Add feedback step using a Formsy textarea""
...
This reverts commit 1bc3aaf0ee
.
2021-01-22 15:14:06 -05:00
seotts
1bc3aaf0ee
Revert "Add feedback step using a Formsy textarea"
...
This reverts commit 5e4fc154c6
.
2021-01-22 15:12:14 -05:00
seotts
c22c2c967b
Revert "Use formik for feedback form"
...
This reverts commit 512358e9af
.
2021-01-22 15:12:14 -05:00
seotts
b42966ac6a
Revert "Add feedback step using a Formsy textarea"
...
This reverts commit 5e4fc154c6
.
2021-01-22 12:13:40 -05:00
seotts
af56e2389c
Revert "Use formik for feedback form"
...
This reverts commit 512358e9af
.
2021-01-22 12:13:03 -05:00
seotts
512358e9af
Use formik for feedback form
...
cleanup
2021-01-22 11:58:56 -05:00
seotts
5e4fc154c6
Add feedback step using a Formsy textarea
2021-01-22 11:58:56 -05:00
seotts
9d08b69bed
show correct messaging instead of always General
2021-01-20 13:03:39 -05:00
picklesrus
a5f436a4c0
Update compose-comment.jsx
...
Fix whitespace
2021-01-14 08:05:47 -05:00
picklesrus
6eca07a413
Fix syntax error from merge
2021-01-14 07:55:54 -05:00
picklesrus
1326f71abe
Merge branch 'develop' into timeout-mute
2021-01-14 07:47:47 -05:00
picklesrus
55d69b0e7b
merge
2021-01-14 07:43:53 -05:00
picklesrus
47d63cb529
Reset more of the state when a mute expires.
...
This allows the comment box to show up again in a normal state with no
errors.
2021-01-14 07:42:53 -05:00
Paul Kaplan
e1d0329633
Fix lint issues again
2021-01-13 09:39:36 -05:00
Paul Kaplan
4ca6e52233
Fix formatting
2021-01-13 09:29:40 -05:00
Paul Kaplan
2a0aa3b03e
Add the FAQ
2021-01-13 08:55:22 -05:00
Paul Kaplan
5883070647
Update SEC page content
2021-01-12 15:59:59 -05:00
Benjamin Wheeler
596343048a
Merge pull request #4748 from mxmou/fix-search-loadmore
...
Fix "Load more" scrolling on search results
2021-01-12 14:51:35 -05:00
picklesrus
19ef91d3d0
Merge pull request #4827 from picklesrus/mute-modal-vertical
...
Update vertical spacing on mute modal
2021-01-12 10:31:28 -05:00
Ben Wheeler
07f6639ef3
changed wording of no javascript message per design team input
2021-01-11 14:04:55 -05:00
apple502j
62d4db7796
Add noscript tag
2021-01-11 14:04:55 -05:00
seotts
1aa59edaa3
Remove use of FormattedHTMLMessage
2021-01-08 14:03:29 -05:00
seotts
31016df1f5
Don’t fail if mute_status isn’t available
2021-01-07 14:05:02 -05:00
seotts
c8373ab888
Revert "Revert "Add new mute message types""
...
This reverts commit 1575ed06cf
.
2021-01-07 14:04:48 -05:00
picklesrus
4879570561
Update vertical spacing on mute modal
...
This reduces the vertical padding in the mute modal to better fit on shorter screens.
2021-01-07 11:07:39 -05:00
Sarah Otts
1575ed06cf
Revert "Add new mute message types"
2021-01-06 16:51:03 -05:00
Karishma Chadha
6d8cac4239
Merge pull request #4817 from LLK/hotfix/sec-google-nolink
...
[Develop] Hotfix sec google nolink
2021-01-06 10:56:41 -05:00
Karishma Chadha
3bdb5abdd5
Merge pull request #4814 from kchadha/annual-report-credits
...
Add Tracy to credits page and Annual Report team section.
2021-01-06 10:44:06 -05:00
Karishma Chadha
090312bf56
Merge pull request #4736 from seotts/world-map-fix
...
World map fixes - Border thickness, Eswatini, remove unused css
2021-01-06 10:43:50 -05:00