seotts
010ee42a99
Add a deadend step to report flow
2020-03-27 11:40:30 -04:00
picklesrus
36ef3222c0
Merge remote-tracking branch 'upstream/develop' into captcha-component-ta
2020-03-27 09:50:50 -04:00
picklesrus
7548253b17
Merge pull request #3765 from picklesrus/captcha-component
...
Move reCaptcha code to a component
2020-03-27 09:18:22 -04:00
picklesrus
187406938a
Make props required
2020-03-27 09:03:45 -04:00
Karishma Chadha
5670840f62
Merge branch 'mystery-footer' into hotfix/totally-normal-2020
2020-03-26 22:28:43 -04:00
Karishma Chadha
9f5bc96542
mystery...
2020-03-26 22:13:21 -04:00
rschamp
f32d5a9bb3
Updates
2020-03-26 21:21:33 -04:00
rschamp
b189e04efc
Merge branch 'master' of github.com:LLK/scratch-www into hotfix/totally-normal-2020
...
# Conflicts:
# package-lock.json
# package.json
2020-03-26 20:31:34 -04:00
seotts
cb065e85c4
Merge branch 'develop' of github.com:LLK/scratch-www into report-subcategories
2020-03-26 16:54:46 -04:00
picklesrus
7843ae8d4c
Add Captcha to teacher registration.
2020-03-26 16:21:13 -04:00
Karishma Chadha
54d56b9db9
Merge pull request #3771 from LLK/release/2020-03-26
...
[Develop] Release 2020-03-26
2020-03-26 13:24:34 -04:00
Karishma Chadha
127bfff76d
Merge pull request #3770 from LLK/release/2020-03-26
...
[Master] Release 2020-03-26
2020-03-26 13:08:32 -04:00
rschamp
7a9e24e0b2
Bump gui
2020-03-25 21:43:23 -04:00
Karishma Chadha
f51afa8f5a
Merge pull request #3769 from LLK/develop
...
Prepare latest changes for release
2020-03-25 19:42:30 -04:00
Karishma Chadha
5a9999f9a0
Merge pull request #3767 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200325184934
...
Greenkeeper/scratch gui 0.1.0 prerelease.20200325184934
2020-03-25 17:19:08 -04:00
rschamp
7329dd42d0
Bump gui
2020-03-25 15:59:28 -04:00
greenkeeper[bot]
26b28e89d9
chore(package): update lockfile package-lock.json
2020-03-25 19:41:51 +00:00
greenkeeper[bot]
dc2e53bfc5
chore(package): update scratch-gui to version 0.1.0-prerelease.20200325184934
...
Closes #3766
2020-03-25 19:41:46 +00: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
rschamp
2afc567112
Bump gui
2020-03-24 10:12:40 -04:00
seotts
4fdd3c1ad3
Add subcategory selection if subcategories specified, and submit final report
2020-03-23 11:55:00 -04:00
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
