scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-21 04:52:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14506 commits 221 branches 1 tag 522 MiB
Commit graph

258 commits

Author SHA1 Message Date
seotts
7f2b756aba Localize email confirmation banner 2021-12-17 13:13:36 -05:00
tomlum
85e5342748 email confirmation modal styling 2021-12-17 13:09:46 -05:00
Karishma Chadha
da231ed3af Change l10n string ID to match server error 2021-06-02 10:48:04 -04:00
Karishma Chadha
e57cd9a111 Introduce comment thread limit on studio comments. When a user clicks reply on a thread that has reached the limit, display a comment status message in place of the comment composer. The user should only see one status box in a message thread. 2021-05-25 23:17:57 -04:00
Karishma Chadha
b065ff86d4 Add l10n file to studios view and replace text with formatted message. 2021-05-07 17:04:14 -04:00
Paul Kaplan
2e029f8966 Move comment mute strings to general l10n file 2021-04-22 09:53:56 -04:00
seotts
ccab9566b8 Show different modal message when muted in the past 2021-03-23 11:00:01 -04:00
seotts
a1759f42b3 Revert "Revert "Content updates march 2021"" 
This reverts commit 65f69d1201.
 2021-03-09 14:38:36 -05:00
Sarah Otts
65f69d1201
Revert "Content updates march 2021" 2021-03-03 15:39:25 -05:00
Zoë Bentley
118ffadb76 Changed images on About page and changed many text strings 2021-02-19 12:04:13 -05:00
picklesrus
fbf3d5a1f3 update feedback mistaake message 2021-02-11 16:20:44 -05:00
seotts
ba99d49298 Fix FeedbackForm tests + other small fixes 
Add strings
 2021-02-01 15:50:55 -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
seotts
9df36b0fcf add tests for feedback form, clean-up form 2021-01-25 17:52:59 -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
b42966ac6a Revert "Add feedback step using a Formsy textarea" 
This reverts commit 5e4fc154c6.
 2021-01-22 12:13:40 -05:00
seotts
5e4fc154c6 Add feedback step using a Formsy textarea 2021-01-22 11:58:56 -05:00
picklesrus
d8ad0c38ea Show warning message when user has been muted several times. 2020-12-17 15:43:07 -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
Ben Wheeler
924c862b9e remove email opt-in from join flow 2020-06-12 12:35:34 -04:00
seotts
52b8dff59a Add disrespectful report option, reorder options 2020-05-13 11:41:05 -04:00
Chris Garrity
d538d5d053 Localize the widget 
Note that some of the Freshdesk locales don’t match the ones used by Scratch.
 2020-05-01 12:09:19 -04:00
seotts
aca3ef0a0d Add scary subcategories 2020-04-22 15:38:39 -04:00
chrisgarrity
8d385afa44
Merge pull request #3569 from apple502j/remove-flag 
Remove app flag
 2020-04-22 07:28:11 -04:00
picklesrus
d6fdf90a56 remove unused message. 2020-04-20 17:38:20 -04:00
chrisgarrity
15990b5876
Merge branch 'develop' into remove-flag 2020-04-16 16:41:31 -04:00
picklesrus
2711bafbcd Change up the messaging in student registration to make the "don't use your real name" a blue info message and give some suggestions on how to choose a username. 2020-04-15 15:43:24 -04:00
apple502j
3146ee8b83 Remove app flag 2020-04-14 01:40:05 +09:00
Chris Garrity
7d9e6ea8b7 Add pop up Help widget 
Initial version of contact us with the pop up Freshdesk help widget.
* adding feature flag `?CONTACT_US_POPUP=true` to the URL allows to switch between current contact-us with form, and new contact-us with popup widget.
* new copy for the contact us page (selected based on feature flag)
* handles scratchr2 redirects by pre-opening the popup on the contact us form and handles multiple parameters
 2020-04-10 12:16:44 -04:00
seotts
41b87b0958 use exisiting general string for "Community Guidelines" 2020-04-08 14:14:43 -04:00
seotts
42cfba3199 Update report copy 2020-04-08 10:10:10 -04:00
seotts
fd79507bf5 Move period inside quotation 2020-04-02 16:29:25 -04:00
seotts
091181d387 Refer correctly to the "Send" button in the Face Reveal prompt 2020-04-02 16:29:25 -04:00
seotts
f2dc3719c6 Remove duplicate i10n string 2020-04-02 16:29:25 -04:00
seotts
8933705c76 Fix linting 2020-04-02 16:29:25 -04:00
seotts
ce4c0f09ec Format report prompts without using FormattedHTMLMessage 2020-04-02 16:29:25 -04:00
seotts
2d6d746922 Format prompts with multiple paragraphs and a list 2020-04-02 16:29:24 -04:00
Paul Kaplan
345da1e41e
Add comments.isNotPermitted string 
We were missing a string for the case where a user has not confirmed their email address. These string IDs are interpolated directly from the error code, so no other change is needed.
 2020-01-30 16:29:08 -05:00
Chris Garrity
037443ba5c Update troubleshooting and FAQ sections for Scratch App and hardware extensions 
Fixes #3570
 2019-12-17 15:42:17 -05:00
picklesrus
69384cc2ac Remove an extra comma. 2019-12-05 09:58:15 -05:00
picklesrus
8f01525c32 Add missing . 2019-12-05 08:32:55 -05:00
picklesrus
b89fe1a985 Add recognition text and links to the bottom of the page. 
Adds a prop to the Page component so each page can say whether or not it 
wants them to appear.
 2019-12-04 16:28:23 -05:00
Ben Wheeler
e915ae1927 if username has spaces, provide validation message specifically mentioning that 2019-11-19 16:21:06 -05:00
picklesrus
3ad17a4572 Add privacy policy and link to the email step. 2019-11-06 12:32:55 -05:00
Ben Wheeler
df6c369e89 Added error strings for particular join flow errors 2019-11-05 12:09:55 -05:00
Ben Wheeler
1c3eca3e06 add start over string, make capitalization consistent in make a project 2019-10-17 22:23:14 -04:00
Chris Garrity
916be715c1 Other Scratch app changes 
* Footer
* ideas page
* FAQ
* parents
 2019-10-02 16:38:38 -07:00
Chris Garrity
54c5484263 Copy changes for Download page. 2019-10-02 15:57:06 -07:00
Paul Kaplan
32165c0d31
Merge pull request #3397 from paulkaplan/chromeos-feature-flag 
Download and initial extension pages for forthcoming ChromeOS app launch
 2019-09-25 16:00:06 -04:00
Ben Wheeler
6fc5705779 revise country placeholder 2019-09-24 20:16:48 -04:00
Ben Wheeler
691faabe28 pass createProjectOnComplete prop through join flow 
…so welcome step can display correct completion text
 2019-09-24 18:41:24 -04:00
Paul Kaplan
762dc324b8 Update extension pages for new OS picker 2019-09-24 16:25:58 -04:00
Paul Kaplan
5d39e59dd5 Use a feature flag to contain new Scratch Desktop updates 2019-09-24 15:17:11 -04:00
picklesrus
5f3d6506c0
Merge pull request #3367 from picklesrus/captcha-error-handling 
Handle errors of captcha loading by setting error state on JoinFlow.
 2019-09-23 23:57:13 -04:00
Ray Schamp
d8ce9555c5
Merge pull request #3365 from LLK/hotfix/footer 
Remove tagline from site footer
 2019-09-18 10:41:30 -04:00
picklesrus
6a45907ded Handle errors of captcha loading by setting error state on JoinFlow. 2019-09-18 10:26:37 -04:00
rschamp
c6d39b7509 Remove tagline from site footer 2019-09-16 12:07:43 -04:00
Ben Wheeler
c26d37442d revised email info string 2019-09-16 11:46:44 -04:00
Ben Wheeler
2421d630e5 update email privacy info string 2019-09-15 21:41:27 -04:00
Ben Wheeler
4341d364d4 adjust email step vertical spacing, redo its footer 2019-09-15 17:22:25 -04:00
Ben Wheeler
31d8189e54 format each join flow title’s padding differently 2019-09-15 17:11:43 -04:00
Ben Wheeler
8bc83fa136 move privacy message to below inputs; format color 2019-09-15 17:08:40 -04:00
Ben Wheeler
5269cf7330 join flow register user function, registration error component 
* add yesno checkbox
* allow checkbox to be hidden
* add registration error, waiting prop to join flow steps
* use redux to dispatch session refresh
* call register function in join flow
* make join flow modal stay showing even when session is refreshed
 2019-09-10 16:34:23 -04:00
Benjamin Wheeler
0a77f62c02
Merge pull request #3263 from benjiwheeler/microbit-add-cards 
Microbit add cards
 2019-08-21 11:30:23 +02:00
Ben Wheeler
4f0a87e25b removed duplicate confirm password string 2019-08-20 01:20:57 +02:00
Ben Wheeler
9eab36af9a consolidate mentions of “Download PDF” 2019-08-20 01:16:48 +02:00
Ben Wheeler
095493a313 add advice tooltip strings for username step 2019-08-19 23:03:07 +02:00
Benjamin Wheeler
2854d9defd
Merge pull request #3267 from benjiwheeler/join-flow-placeholders 
added placeholders to username step
 2019-08-19 16:52:00 +02:00
Ben Wheeler
18605ea047 create your account 2019-08-19 16:10:24 +02:00
Ben Wheeler
5b5ac6a66f added email subscribe checkbox 2019-08-19 16:10:23 +02:00
Ben Wheeler
8f5f89abfd improve email step in several ways 2019-08-19 16:08:55 +02:00
Ben Wheeler
d02184daf3 added placeholders to username step 2019-08-18 18:07:33 +02:00
Benjamin Wheeler
96a7d01cdc
Merge pull request #3261 from benjiwheeler/join-flow-add-nonbinary 
add nonbinary option to gender step of join flow
 2019-08-16 17:48:55 -04:00
Benjamin Wheeler
4e0aaafa01
Merge pull request #3239 from benjiwheeler/join-flow-confirm-text 
Add ToS footer to email step, make next button Create Account
 2019-08-13 17:55:04 -04:00
Benjamin Wheeler
0321929412
Merge pull request #3185 from benjiwheeler/join-flow-more-strings 
Revised and added several join flow strings
 2019-08-13 17:50:59 -04:00
Ben Wheeler
fa6913c346 use info button in birthdate step, gender step 2019-08-13 15:29:44 -04:00
Ben Wheeler
e75b73d6fe revised validation strings 2019-08-13 15:02:25 -04:00
Ben Wheeler
4fa85e5c3b add several missing strings for join flow errors 2019-08-13 15:02:25 -04:00
Ben Wheeler
8469e77622 change Terms of Service to Terms of Use 2019-08-13 12:20:44 -04:00
Ben Wheeler
6b1b4d7f36 Add ToS footer to email step, make next button Create Account 2019-08-13 12:20:44 -04:00
Ben Wheeler
181601dbf5 translate email address placeholder 2019-08-12 17:56:44 -04:00
Ben Wheeler
e64dc60ae6 formatted email step, added input 2019-08-12 17:56:43 -04:00
Ben Wheeler
74c76dedcb add nonbinary option to gender step of join flow 2019-08-09 17:05:21 -04:00
Ray Schamp
6275b516fc
Merge pull request #3199 from benjiwheeler/join-flow-country-data 
Consolidate country lists, fix country field in teacher account registration
 2019-08-07 15:00:50 -04:00
Ben Wheeler
564baf2ebc handle error when teacher country selection fails to resolve to country name 2019-08-06 15:00:18 -04:00
Ben Wheeler
8725cee6a1 replaced gender l10n strings with existing ones 2019-08-03 00:08:18 -04:00
Ben Wheeler
09ff758eee add gender step strings 2019-08-03 00:08:18 -04:00
Benjamin Wheeler
56ce60fe86
Merge pull request #3207 from benjiwheeler/join-flow-welcome-text 
add instructions text to join flow welcome step
 2019-08-03 00:06:00 -04:00
Ben Wheeler
16dd9e0b76 format next button, use correct strings 2019-08-01 22:27:47 -04:00
Ben Wheeler
bef6063373 add instructions text to join flow welcome step 2019-08-01 16:27:54 -04:00
Ben Wheeler
a435626ae1 added stubs for email step, welcome step 2019-07-29 22:29:04 -04:00
Ben Wheeler
1cd0713bb9 added missing strings to join flow 2019-07-26 22:10:21 -04:00
Ben Wheeler
4ef73525c4 Revised modal title to Copy Link, use orig icon 2019-05-08 14:36:00 -04:00
Ben Wheeler
d5e2ed69ad refined colors 2019-05-06 16:22:41 -04:00
Ben Wheeler
08f8e1c546 simplified embed modal to remove social links 2019-05-02 17:18:13 -04:00
Ben Wheeler
fdfa61649f removed copy link button on project page 2019-04-26 16:11:53 -04:00
Ben Wheeler
2289584bbf got copied result text working, closing in on final design 2019-04-24 15:09:39 -04:00
Ben Wheeler
67e7a54413 renamed externalShare to social 2019-04-24 12:09:44 -04:00
Ben Wheeler
5d12f0f781 put social links section, copy project link button inside social share modal 2019-04-22 22:36:26 -04:00