Commits · 934f2387265e47235722ebb7d549083218adbe3d · xpstem / scratch-www

31 Mar, 2020 4 commits
- Revert "Merge branch 'hotfix/totally-normal-2020' into develop" · 934f2387
  rschamp authored Mar 31, 2020
```
This reverts commit fcd27f62, reversing
changes made to 7548253b.
```
  934f2387
- Merge branch 'master' into develop · 2bbd629b
  rschamp authored Mar 31, 2020
  
  2bbd629b
- Merge branch 'hotfix/totally-normal-2020' into develop · fcd27f62
  rschamp authored Mar 31, 2020
  
  fcd27f62
- Merge branch 'hotfix/totally-normal-2020' · 3d6c16d1
  rschamp authored Mar 31, 2020
  
  3d6c16d1
30 Mar, 2020 9 commits
- Merge pull request #3779 from fsih/updateGui · 0c9b1880
  DD Liu authored Mar 30, 2020
```
Update blocks to turn of mouse following
```
  0c9b1880
- Update blocks to turn of mouse following · c0a8c296
  DD Liu authored Mar 30, 2020
  
  c0a8c296
- Merge pull request #3778 from fsih/updateGui · 19a29c09
  DD Liu authored Mar 30, 2020
```
update blocks to respond to vmLoad
```
  19a29c09
- Resolve merge · fd10b58f
  DD Liu authored Mar 30, 2020
  
  fd10b58f
- update blocks to respond to vmLoad · bbf9b9c5
  DD Liu authored Mar 30, 2020
  
  bbf9b9c5
- Bump gui · f731d425
  rschamp authored Mar 30, 2020
  
  f731d425
- Merge pull request #3777 from fsih/updateGui · 9d0403e3
  DD Liu authored Mar 30, 2020
```
Bring back in wobbly drag
```
  9d0403e3
- update gui · 76fa92ee
  DD Liu authored Mar 30, 2020
  
  76fa92ee
- Bump gui · b01a12ee
  rschamp authored Mar 30, 2020
  
  b01a12ee
27 Mar, 2020 8 commits
- Merge branch 'mystery-footer' into hotfix/totally-normal-2020 · 90333d94
  Karishma Chadha authored Mar 27, 2020
  
  90333d94
- more mysterious · 85b1e79c
  Karishma Chadha authored Mar 27, 2020
  
  85b1e79c
- Merge pull request #3765 from picklesrus/captcha-component · 7548253b
  picklesrus authored Mar 27, 2020
```
Move reCaptcha code to a component
```
  7548253b
- Make props required · 18740693
  picklesrus authored Mar 27, 2020
  
  18740693
- Merge branch 'mystery-footer' into hotfix/totally-normal-2020 · 5670840f
  Karishma Chadha authored Mar 26, 2020
  
  5670840f
- mystery... · 9f5bc965
  Karishma Chadha authored Mar 26, 2020
  
  9f5bc965
- 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 3 commits
- Merge pull request #3771 from LLK/release/2020-03-26 · 54d56b9d
  Karishma Chadha authored Mar 26, 2020
```
[Develop] Release 2020-03-26
```
  54d56b9d
- 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 2 commits
- Move reCaptcha codeto a component so it can be used in another spot later. · f9e48973
  picklesrus authored Mar 24, 2020
  
  f9e48973
- 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 5 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