Commits · f32d5a9bb38d56fb4391be2ec8d1ac9d524ea256 · xpstem / scratch-www

27 Mar, 2020 2 commits
- Updates · f32d5a9b
  rschamp authored Mar 26, 2020
  
  f32d5a9b
- Merge branch 'master' of github.com:LLK/scratch-www into hotfix/totally-normal-2020 · b189e04e
  rschamp authored Mar 26, 2020
```
# Conflicts:
#	package-lock.json
#	package.json
```
  b189e04e
26 Mar, 2020 2 commits
- Merge pull request #3770 from LLK/release/2020-03-26 · 127bfff7
  Karishma Chadha authored Mar 26, 2020
```
[Master] Release 2020-03-26
```
  127bfff7
- Bump gui · 7a9e24e0
  rschamp authored Mar 25, 2020
  
  7a9e24e0
25 Mar, 2020 5 commits
- Merge pull request #3769 from LLK/develop · f51afa8f
  Karishma Chadha authored Mar 25, 2020
```
Prepare latest changes for release
```
  f51afa8f
- Merge pull request #3767 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200325184934 · 5a9999f9
  Karishma Chadha authored Mar 25, 2020
```
Greenkeeper/scratch gui 0.1.0 prerelease.20200325184934
```
  5a9999f9
- Bump gui · 7329dd42
  rschamp authored Mar 25, 2020
  
  7329dd42
- chore(package): update lockfile package-lock.json · 26b28e89
  greenkeeper[bot] authored Mar 25, 2020
  
  26b28e89
- chore(package): update scratch-gui to version 0.1.0-prerelease.20200325184934 · dc2e53bf
  greenkeeper[bot] authored Mar 25, 2020
```
Closes #3766
```
  dc2e53bf
24 Mar, 2020 1 commit
- Bump gui · 2afc5671
  rschamp authored Mar 24, 2020
  
  2afc5671
20 Mar, 2020 1 commit
- Merge pull request #3740 from picklesrus/educator-faq · 0ca47ec8
  picklesrus authored Mar 20, 2020
```
Educator faq updates
```
  0ca47ec8
19 Mar, 2020 3 commits
- Merge pull request #3757 from LLK/release/2020-03-18 · 6e2b0b26
  DD Liu authored Mar 19, 2020
```
[DEVELOP] Release/2020-03-18
```
  6e2b0b26
- Merge pull request #3758 from LLK/release/2020-03-18 · e36caa07
  DD Liu authored Mar 19, 2020
```
[MASTER] Release/2020-03-18
```
  e36caa07
- Update gui · 6cd6da1d
  DD Liu authored Mar 19, 2020
  
  6cd6da1d
18 Mar, 2020 7 commits
- Merge pull request #3756 from LLK/develop · c76ff9bc
  DD Liu authored Mar 18, 2020
```
Release 3-18-2020
```
  c76ff9bc
- Merge pull request #3755 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200318160549 · 70bfb565
  DD Liu authored Mar 18, 2020
```
Update scratch-gui to the latest version 🚀
```
  70bfb565
- chore(package): update lockfile package-lock.json · bae1992e
  greenkeeper[bot] authored Mar 18, 2020
  
  bae1992e
- chore(package): update scratch-gui to version 0.1.0-prerelease.20200318160549 · 4fb874f6
  greenkeeper[bot] authored Mar 18, 2020
  
  4fb874f6
- Merge pull request #3753 from LLK/hotfix/multi-step-report · c23805f5
  Paul Kaplan authored Mar 18, 2020
```
[Hotfix/Develop] Split project report flow into two steps
```
  c23805f5
- Merge pull request #3747 from LLK/hotfix/multi-step-report · fad3968c
  Paul Kaplan authored Mar 18, 2020
```
[Hotfix/Master] Split project report flow into two steps
```
  fad3968c
- Merge pull request #3749 from apple502j/images-403 · 507023fa
  Ray Schamp authored Mar 18, 2020
```
Fix image links
```
  507023fa
17 Mar, 2020 6 commits
- Merge pull request #3754 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200317200959 · b8d59e52
  DD Liu authored Mar 17, 2020
```
Update scratch-gui to the latest version 🚀
```
  b8d59e52
- chore(package): update lockfile package-lock.json · 877e9bd5
  greenkeeper[bot] authored Mar 17, 2020
  
  877e9bd5
- chore(package): update scratch-gui to version 0.1.0-prerelease.20200317200959 · 461450fc
  greenkeeper[bot] authored Mar 17, 2020
  
  461450fc
- Add modifier class to fix button margin · 5670b455
  Paul Kaplan authored Mar 17, 2020
  
  5670b455
- Revise comments to clarify functionality · f796093e
  Paul Kaplan authored Mar 16, 2020
  
  f796093e
- Split project report flow into multiple steps · bc3a454f
  Paul Kaplan authored Mar 12, 2020
  
  bc3a454f
16 Mar, 2020 6 commits
- Merge pull request #3745 from LLK/release/2020-03-12 · 0ce1d5d5
  chrisgarrity authored Mar 16, 2020
```
[Develop] Release/2020 03 12
```
  0ce1d5d5
- Merge pull request #3744 from LLK/release/2020-03-12 · a2929e5b
  chrisgarrity authored Mar 16, 2020
```
[Master] Release/2020 03 12
```
  a2929e5b
- Merge pull request #3750 from chrisgarrity/remove-gui-update · 1dfeacea
  chrisgarrity authored Mar 16, 2020
```
revert gui to previous version
```
  1dfeacea
- Switch message back to FormattedHTMLMessage because the old version has html in it. · 09c50d9d
  picklesrus authored Mar 16, 2020
```
Change the id of a message whose contents changed to not have html.
```
  09c50d9d
- revert gui to previous version · 4ea75b84
  Chris Garrity authored Mar 16, 2020
  
  4ea75b84
- Fix image links · 7c7887ad
  apple502j authored Mar 16, 2020
  
  7c7887ad
13 Mar, 2020 2 commits

Merge pull request #3746 from chrisgarrity/fix-contact-us · 9500376c
chrisgarrity authored Mar 13, 2020
```
Fix contact-us mistakes
```
9500376c

Chris Garrity authored Mar 13, 2020

- 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`

501a5d8f

12 Mar, 2020 3 commits
- Merge pull request #3738 from LLK/hotfix/scratch-desktop-3.9.0 · 5552d08f
  chrisgarrity authored Mar 12, 2020
```
[Master] hotfix/scratch desktop 3.9.0
```
  5552d08f
- Change answer to student account deletion question. · f2ee4ea9
  picklesrus authored Mar 12, 2020
  
  f2ee4ea9
- Merge pull request #3737 from LLK/hotfix/scratch-desktop-3.9.0 · 1d80c946
  chrisgarrity authored Mar 12, 2020
```
[Develop] hotfix/scratch desktop 3.9.0
```
  1d80c946
11 Mar, 2020 2 commits
- Merge pull request #3743 from LLK/develop · bac40d75
  picklesrus authored Mar 11, 2020
```
Merge develop into the release branch.
```
  bac40d75
- Merge pull request #3742 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200311195145 · 54f48c9b
  picklesrus authored Mar 11, 2020
```
Update scratch-gui to the latest version 🚀
```
  54f48c9b