scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-15 01:52:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6271 commits 220 branches 1 tag 511 MiB
Commit graph

6271 commits

This branch
This branch
All branches
Author SHA1 Message Date
picklesrus
0ca47ec8fb
Merge pull request #3740 from picklesrus/educator-faq 
Educator faq updates
 2020-03-20 14:29:08 -04:00
DD Liu
6e2b0b26bf
Merge pull request #3757 from LLK/release/2020-03-18 
[DEVELOP] Release/2020-03-18
 2020-03-19 15:37:03 -04:00
DD Liu
e36caa078d
Merge pull request #3758 from LLK/release/2020-03-18 
[MASTER] Release/2020-03-18
 2020-03-19 15:36:44 -04:00
DD Liu
6cd6da1dbf Update gui 2020-03-19 15:12:17 -04:00
DD Liu
c76ff9bcb1
Merge pull request #3756 from LLK/develop 
Release 3-18-2020
 2020-03-18 14:51:25 -04:00
DD Liu
70bfb565d4
Merge pull request #3755 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200318160549 
Update scratch-gui to the latest version 🚀
 2020-03-18 14:43:09 -04:00
greenkeeper[bot]
bae1992e5b
chore(package): update lockfile package-lock.json 2020-03-18 16:17:44 +00:00
greenkeeper[bot]
4fb874f65b
chore(package): update scratch-gui to version 0.1.0-prerelease.20200318160549 2020-03-18 16:17:39 +00: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
Paul Kaplan
fad3968cb8
Merge pull request #3747 from LLK/hotfix/multi-step-report 
[Hotfix/Master] Split project report flow into two steps
 2020-03-18 11:50:47 -04:00
Ray Schamp
507023fa96
Merge pull request #3749 from apple502j/images-403 
Fix image links
 2020-03-18 09:18:48 -04:00
DD Liu
b8d59e52ad
Merge pull request #3754 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200317200959 
Update scratch-gui to the latest version 🚀
 2020-03-17 16:35:49 -04:00
greenkeeper[bot]
877e9bd5f5
chore(package): update lockfile package-lock.json 2020-03-17 20:21:51 +00:00
greenkeeper[bot]
461450fc4b
chore(package): update scratch-gui to version 0.1.0-prerelease.20200317200959 2020-03-17 20:21:47 +00: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
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