scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-22 23:27:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5609 commits 216 branches 1 tag 462 MiB
Commit graph

5609 commits

This branch
This branch
All branches
Author SHA1 Message Date
seotts
ccb5fa444c Format report prompts without using FormattedHTMLMessage 2020-04-01 15:49:53 -04:00
picklesrus
7f9ffada5f
Merge pull request #3774 from picklesrus/captcha-component-ta 
Captcha adjustments to teacher registration
 2020-03-31 14:27:12 -04:00
rschamp
934f238726 Revert "Merge branch 'hotfix/totally-normal-2020' into develop" 
This reverts commit fcd27f621d, reversing
changes made to 7548253b17.
 2020-03-31 08:15:11 -04:00
rschamp
2bbd629b15 Merge branch 'master' into develop 2020-03-31 08:15:00 -04:00
rschamp
fcd27f621d Merge branch 'hotfix/totally-normal-2020' into develop 2020-03-31 08:14:13 -04:00
rschamp
3d6c16d1ab Merge branch 'hotfix/totally-normal-2020' 2020-03-31 08:13:59 -04:00
seotts
ab71f6020a Format prompts with multiple paragraphs and a list 2020-03-30 17:46:21 -04:00
DD Liu
0c9b18808f
Merge pull request #3779 from fsih/updateGui 
Update blocks to turn of mouse following
 2020-03-30 17:34:34 -04:00
DD Liu
c0a8c296ef Update blocks to turn of mouse following 2020-03-30 17:33:50 -04:00
seotts
22bed516f5 Subcategories and deadends work 2020-03-30 16:44:01 -04:00
DD Liu
19a29c09af
Merge pull request #3778 from fsih/updateGui 
update blocks to respond to vmLoad
 2020-03-30 15:56:15 -04:00
DD Liu
fd10b58f4f Resolve merge 2020-03-30 15:54:59 -04:00
DD Liu
bbf9b9c50f update blocks to respond to vmLoad 2020-03-30 15:53:32 -04:00
rschamp
f731d4259b Bump gui 2020-03-30 14:43:52 -04:00
DD Liu
9d0403e39a
Merge pull request #3777 from fsih/updateGui 
Bring back in wobbly drag
 2020-03-30 13:38:33 -04:00
DD Liu
76fa92ee0e update gui 2020-03-30 13:18:14 -04:00
rschamp
b01a12eed9 Bump gui 2020-03-30 10:46:24 -04:00
Karishma Chadha
90333d9459 Merge branch 'mystery-footer' into hotfix/totally-normal-2020 2020-03-27 12:49:34 -04:00
Karishma Chadha
85b1e79c44 more mysterious 2020-03-27 12:47:39 -04:00
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