scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-11 08:11:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5806 commits 221 branches 1 tag 505 MiB
Commit graph

5806 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
chrisgarrity
0ce1d5d5ee
Merge pull request #3745 from LLK/release/2020-03-12 
[Develop] Release/2020 03 12
 2020-03-16 14:37:35 -04:00
chrisgarrity
a2929e5bfe
Merge pull request #3744 from LLK/release/2020-03-12 
[Master] Release/2020 03 12
 2020-03-16 14:17:03 -04:00
chrisgarrity
1dfeacea59
Merge pull request #3750 from chrisgarrity/remove-gui-update 
revert gui to previous version
 2020-03-16 09:28:18 -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
Chris Garrity
4ea75b843a revert gui to previous version 2020-03-16 09:14:53 -04:00
apple502j
7c7887adc4 Fix image links 2020-03-16 15:48:39 +09:00
chrisgarrity
9500376ce7
Merge pull request #3746 from chrisgarrity/fix-contact-us 
Fix contact-us mistakes
 2020-03-13 09:53:56 -04: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
chrisgarrity
5552d08f83
Merge pull request #3738 from LLK/hotfix/scratch-desktop-3.9.0 
[Master] hotfix/scratch desktop 3.9.0
 2020-03-12 15:55:58 -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
bac40d7588
Merge pull request #3743 from LLK/develop 
Merge develop into the release branch.
 2020-03-11 16:28:56 -04:00
picklesrus
54f48c9b13
Merge pull request #3742 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200311195145 
Update scratch-gui to the latest version 🚀
 2020-03-11 16:22:08 -04:00
greenkeeper[bot]
3597d42591
chore(package): update lockfile package-lock.json 2020-03-11 20:17:39 +00:00
greenkeeper[bot]
250e1166c2
chore(package): update scratch-gui to version 0.1.0-prerelease.20200311195145 2020-03-11 20:17:35 +00:00
DD Liu
21f89a86cc
Merge pull request #3741 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200310205953 
Greenkeeper/scratch gui 0.1.0 prerelease.20200310205953
 2020-03-10 18:38:53 -04:00
greenkeeper[bot]
b98b358e0a
chore(package): update lockfile package-lock.json 2020-03-10 21:12:53 +00:00
greenkeeper[bot]
988286261e
chore(package): update scratch-gui to version 0.1.0-prerelease.20200310205953 
Closes #3739
 2020-03-10 21:12:50 +00: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
Ray Schamp
46a733c521
Merge pull request #3734 from LLK/release/2020-03-03 
[Develop] Release for 2020-03-03
 2020-03-05 10:37:39 -05:00
Ray Schamp
da1e608251
Merge pull request #3733 from LLK/release/2020-03-03 
[Master] Release for 2020-03-03
 2020-03-05 10:37:25 -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
Ray Schamp
d164889aed
Merge pull request #3732 from LLK/develop 
Merge develop to release branch
 2020-03-04 17:18:14 -05:00
Ray Schamp
41bb9b6c3e
Merge pull request #3731 from rschamp/bump-gui 
Bump scratch-gui for release
 2020-03-04 17:16:11 -05:00
rschamp
15e456cfaf Bump scratch-gui for release 2020-03-04 17:14:45 -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
Paul Kaplan
1a063ec527
Merge pull request #3727 from LLK/hotfix/reduce-report-vis 
[Develop] Reduce report prominence
 2020-03-03 09:38:24 -05:00
Paul Kaplan
e9586eb5af
Merge pull request #3726 from LLK/hotfix/reduce-report-vis 
[Master] hotfix reduce report prominence
 2020-03-03 09:38:14 -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
Ray Schamp
3c977365ed
Merge pull request #3724 from LLK/hotfix/conference-2020-03-02 
[Develop] Update conference page to open registration
 2020-03-02 16:41:58 -05:00
Ray Schamp
5a47ed9631
Merge pull request #3723 from LLK/hotfix/conference-2020-03-02 
[Master] Update conference page to open registration
 2020-03-02 16:41:34 -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