Chris Garrity
d639c2d7a9
Fix typo
2021-01-28 11:01:09 -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
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
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
Karishma Chadha
edca23f6ce
Add Tracy to credits page and Annual Report team section.
2021-01-05 15:51:38 -05:00
Sarah Otts
78d001e127
Merge pull request #4737 from seotts/team-new-tabs
...
In the Annual Report Team section, open link to Scratch Team members in new tab
2021-01-05 14:38:03 -05:00
Sarah Otts
f3dbe23c5e
Fix syntax error from merge
2021-01-04 11:20:16 -05:00
Sarah Otts
b9892ff6d8
Merge branch 'develop' into automod-new-messaging
2021-01-04 11:09:29 -05:00
picklesrus
664ccc5d36
Update compose-comment.jsx
...
Fix missing comma from bad merge
2020-12-21 10:49:16 -05:00
picklesrus
15a16e5b58
Merge branch 'develop' into timeout-mute
2020-12-21 08:38:37 -05:00
picklesrus
9037f8817a
Merge pull request #4774 from picklesrus/warning-mute
...
Show warning message when user has been muted several times.
2020-12-21 08:36:21 -05:00
Benjamin Wheeler
0c911da463
Merge pull request #4563 from GrahamSH-LLK/patch-1
...
Add "FloralSunset" to Credits Page
2020-12-18 20:54:41 -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
1aca3c0f25
Merge pull request #4768 from picklesrus/fix-prop-warning
...
Fix prop type. muteStepContent is an array not a string.
2020-12-17 10:00:26 -05:00
Benjamin Wheeler
aeaca81fb7
Merge pull request #4686 from benjiwheeler/api-check-username
...
switch educator registration checkusername endpoint from scratchr2 to api
2020-12-16 20:43:19 -05:00
picklesrus
760082d2d7
Fix prop type. muteStepContent is an array not a string.
2020-12-16 07:54:20 -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
a39244ea6c
Merge branch 'develop' into timeout-mute
2020-12-14 13:27:12 -05:00
chrisgarrity
17407f0fcf
Merge pull request #4752 from chrisgarrity/localize-mute
...
Localize mute
2020-12-11 16:19:27 -05:00
Chris Garrity
501147060d
Update generic message copy
...
Updated copy requres two paragraphs in the content. Modified the inputs to pass a content array and output one paragraph per item.
2020-12-11 09:52:30 -05:00
Chris Garrity
929e670d8f
Internationalize the mute messages
...
Add formatted messages for comment status and mute modal
2020-12-11 08:44:17 -05:00
