scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-22 23:27:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5456 commits 216 branches 1 tag 462 MiB
Commit graph

3314 commits

Author SHA1 Message Date
seotts
739cf8117b Add a deadend step to report flow 2020-04-02 16:29:24 -04:00
seotts
af78e4c05e Add subcategory selection if subcategories specified, and submit final report 2020-04-02 16:29:24 -04:00
picklesrus
36ef3222c0 Merge remote-tracking branch 'upstream/develop' into captcha-component-ta 2020-03-27 09:50:50 -04:00
picklesrus
187406938a Make props required 2020-03-27 09:03:45 -04:00
picklesrus
7843ae8d4c Add Captcha to teacher registration. 2020-03-26 16:21:13 -04:00
picklesrus
f9e48973bc Move reCaptcha codeto a component so it can be used in another spot later. 2020-03-24 17:41:22 -04:00
picklesrus
0ca47ec8fb
Merge pull request #3740 from picklesrus/educator-faq 
Educator faq updates
 2020-03-20 14:29:08 -04:00
Paul Kaplan
c23805f543
Merge pull request #3753 from LLK/hotfix/multi-step-report 
[Hotfix/Develop] Split project report flow into two steps
 2020-03-18 11:58:01 -04:00
Ray Schamp
507023fa96
Merge pull request #3749 from apple502j/images-403 
Fix image links
 2020-03-18 09:18:48 -04:00
Paul Kaplan
5670b4558a Add modifier class to fix button margin 2020-03-17 10:16:33 -04:00
Paul Kaplan
f796093e79 Revise comments to clarify functionality 2020-03-17 10:03:16 -04:00
Paul Kaplan
bc3a454f4c Split project report flow into multiple steps 2020-03-17 10:03:16 -04:00
picklesrus
09c50d9dde Switch message back to FormattedHTMLMessage because the old version has html in it. 
Change the id of a message whose contents changed to not have html.
 2020-03-16 09:19:31 -04:00
apple502j
7c7887adc4 Fix image links 2020-03-16 15:48:39 +09:00
Chris Garrity
501a5d8fc0 Fix mistakes 
- take captcha off the helpform url
- use encodeUriComponent to make sure semicolons in the agent string don’t mess up the form parameters
- take the `$` end matcher off the route to allow for parameters to be passed
- fix forum links
- fix faq link `/faq` => `/info/faq`
 2020-03-13 09:47:31 -04:00
picklesrus
f2ee4ea985 Change answer to student account deletion question. 2020-03-12 13:51:27 -04:00
chrisgarrity
1d80c946f7
Merge pull request #3737 from LLK/hotfix/scratch-desktop-3.9.0 
[Develop] hotfix/scratch desktop 3.9.0
 2020-03-12 09:06:52 -04:00
picklesrus
ae6648f663 Update to data collection question. 2020-03-10 12:07:08 -04:00
chrisgarrity
9335274765
Merge pull request #3719 from chrisgarrity/freshdesk-contactus 
Add new Contact Us information page
 2020-03-10 10:58:28 -04:00
picklesrus
3b869c36a2 Replace FormattedHtmlMessage with FormattedMessage where it wasn't necessary. 2020-03-10 09:42:48 -04:00
picklesrus
132db9b362 Fix copy/paste error of links 2020-03-09 10:21:24 -04:00
Chris Garrity
e8197e4ffc Address review comments 
* With Carl decided to put the sidebar back even with just one item. It’s still one we want to emphasize.
* made sure the freshdesk js file would not block loading the form (it doesn’t appear to be needed for the form, it’s probably mainly for the pop-up version)
* moved the query processing into a constructor (more idomatic react)
* expanded the form so it should not need to scroll - also noted that in incognito mode a captcha is shown, so created enough space for that to be visible.
 2020-03-06 08:58:30 -05:00
Christopher Willis-Ford
83112f76b2 update scratch-desktop Windows URL for 3.9.0 2020-03-05 13:28:28 -08:00
Christopher Willis-Ford
ffb0bf86a7 make download URLs easier to find and update 2020-03-05 13:28:28 -08:00
Chris Garrity
ee09ba59a4 Add handling for parameters passed in the query from scratchr2 
Scratchr2 has links to contact us from the report (profile|studio) dialogs. Looking at the scratchr2 source, there’s also one for confirmations, so this change handles the additional details in the same way - in the subject and description. In the future we could consider pre-filling specific form fields that we define.
 2020-03-05 11:51:11 -05:00
picklesrus
badc47f81c fix typo 2020-03-05 10:32:50 -05:00
picklesrus
d01b3c8b31 Add 250 student question. 
Change formttedhtmlmessage -> formattedmessage
 2020-03-05 09:15:44 -05:00
picklesrus
4404f2bbf4 Initial commit for educator FAQ updates. 2020-03-04 18:14:32 -05:00
Chris Garrity
f0bcd9f574 Remove the nav section and make the form full width 
Decided that there is no need for the Nav sidebar since we don’t want the link to the Discussions right now. It could come back if we add the knowledge base.
 2020-03-03 11:17:07 -05:00
Ray Schamp
720e2bacba
Merge pull request #3730 from rschamp/hotfix/conference-delay-spacing 
[Develop] Split out message about conference registration delay
 2020-03-03 11:12:07 -05:00
Ray Schamp
0c03a6e8b8
Merge pull request #3729 from rschamp/hotfix/conference-delay-spacing 
[Master] Split out message about conference registration delay
 2020-03-03 11:11:52 -05:00
Chris Garrity
3dc5155c38 Revised wording 2020-03-03 10:10:20 -05:00
rschamp
f596089d0a Split out message about conference registration delay 2020-03-03 09:31:24 -05:00
Paul Kaplan
e43cb7ab4e Reorder and de-red report action on project page 2020-03-03 08:56:25 -05:00
rschamp
3d87f6feed Make updates in response to COVID-19 2020-03-02 15:53:23 -05:00
Chris Garrity
8fc9b57e7d Add new Contact Us information page 
Using the Freshdesk Feedback form
* adds new component HelpForm for the Freshdesk component
* adds new contact-us view
* modifies Information page css with style for a header on the right hand nav section
* adds new route for the contact-us page (is identical to the old scratchr2 URL)
 2020-03-02 11:33:54 -05:00
rschamp
375e525372 Fix dates, be less paranoid about l10n ids 
The strings will get updated, even if the id persists.
 2020-03-02 11:26:34 -05:00
rschamp
3c3b29708d Address various copy-paste errors 
Nice catch @adroitwhiz :)
 2020-03-02 10:16:47 -05:00
rschamp
0e83287b37 Update conference page to open registration 2020-02-29 11:02:09 -05:00
Ben Wheeler
049c0b946a use api instead of scratchr2 to validate usernames 2020-02-05 15:48:15 -05:00
Chris Garrity
d55d18a8e0 Update text 2020-02-05 09:00:44 -05:00
Chris Garrity
4fd69c526a Add FAQ about updating the app 
Addresses #3104

Added separate answers for the Downloaded vs Play store versions. Also noted that school managed installations would have to be updated by administrators.
 2020-02-04 11:02:49 -05: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
70cef7335b Really delete the cookie 
It appears that setting the domain on the cookie prevents it from actually deleting the cookie.
 2020-01-30 09:43:51 -05:00
Chris Garrity
c95d087289 Ensure that the old scratchlanguage cookie is removed if it exists. 
On init, remove the old cookie if it exists.
On the project page, make sure `handleSetLanguage` also sets the domain.
 2020-01-29 16:11:58 -05:00
Chris Garrity
ad2f0fa4e2 Don’t prefix localhost with . 
Need to special case localhost so that changing language works when running locally.
 2020-01-23 16:56:12 -05:00
Chris Garrity
92a729e9c8 Set language cookie domain to allow for cross-domain cookies 
Add leading `.` to the current hostname for the language cookie domain.
 2020-01-22 15:54:05 -05:00
Benjamin Wheeler
10f2a0983a
Merge pull request #3640 from benjiwheeler/join-flow-retry-retry-session 
Retry of the change that retries fetching session
 2020-01-22 10:35:34 -05:00
Ben Wheeler
2d3158a8f7 Introduce new tx-push-www script to automate string push to transifex 2020-01-16 16:06:55 -05:00
Ben Wheeler
6654362b2c fix for session promise issue 2020-01-14 22:03:05 -05:00