seotts
|
fd79507bf5
|
Move period inside quotation
|
2020-04-02 16:29:25 -04:00 |
|
seotts
|
091181d387
|
Refer correctly to the "Send" button in the Face Reveal prompt
|
2020-04-02 16:29:25 -04:00 |
|
seotts
|
f2dc3719c6
|
Remove duplicate i10n string
|
2020-04-02 16:29:25 -04:00 |
|
seotts
|
8933705c76
|
Fix linting
|
2020-04-02 16:29:25 -04:00 |
|
seotts
|
ce4c0f09ec
|
Format report prompts without using FormattedHTMLMessage
|
2020-04-02 16:29:25 -04:00 |
|
seotts
|
2d6d746922
|
Format prompts with multiple paragraphs and a list
|
2020-04-02 16:29:24 -04:00 |
|
seotts
|
035913b954
|
Subcategories and deadends work
|
2020-04-02 16:29:24 -04:00 |
|
seotts
|
739cf8117b
|
Add a deadend step to report flow
|
2020-04-02 16:29:24 -04:00 |
|
seotts
|
af78e4c05e
|
Add subcategory selection if subcategories specified, and submit final report
|
2020-04-02 16:29:24 -04:00 |
|
Ray Schamp
|
5e76f505e0
|
Adhere to MLA guidelines for punctuation
|
2020-04-02 16:19:36 -04:00 |
|
seotts
|
537332a18d
|
Refer correctly to the "Send" button in the Face Reveal prompt
|
2020-04-02 16:00:35 -04:00 |
|
seotts
|
8b1d35a4c8
|
Remove duplicate i10n string
|
2020-04-02 11:50:45 -04:00 |
|
Eric Rosenbaum
|
aa31c2ed57
|
Merge pull request #3783 from LLK/release/2020-04-02
[Master] Release 2020-04-02
|
2020-04-02 11:42:16 -04:00 |
|
seotts
|
8f936229ce
|
Fix linting
|
2020-04-02 10:43:45 -04:00 |
|
Eric Rosenbaum
|
88d5ad7bc5
|
Merge pull request #3782 from LLK/develop
Update release branch to include develop
|
2020-04-01 16:13:54 -04:00 |
|
seotts
|
ccb5fa444c
|
Format report prompts without using FormattedHTMLMessage
|
2020-04-01 15:49:53 -04:00 |
|
Ben Wheeler
|
7655a08d7e
|
improve breaking of long words
|
2020-03-31 22:08:13 -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 |
|
apple502j
|
4b7aaf84f2
|
Always apply min-height: 0
|
2020-03-30 15:29:44 +09: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 |
|