Chris Garrity
23306ff336
remove excess space in the form
...
There’s too much space after removing the redundant field.
2020-04-10 16:09:17 -04:00
Chris Garrity
7d9e6ea8b7
Add pop up Help widget
...
Initial version of contact us with the pop up Freshdesk help widget.
* adding feature flag `?CONTACT_US_POPUP=true` to the URL allows to switch between current contact-us with form, and new contact-us with popup widget.
* new copy for the contact us page (selected based on feature flag)
* handles scratchr2 redirects by pre-opening the popup on the contact us form and handles multiple parameters
2020-04-10 12:16:44 -04:00
Chris Garrity
93d7946af7
Remove unnecessary userAgent field
...
The Freshdesk form/widget collects Browser and OS meta data so there’s no need to duplicate it.
2020-04-10 12:08:07 -04:00
chrisgarrity
d8df31587e
Merge pull request #3794 from LLK/release/2020-04-09
...
[DEVELOP] Release/2020 04 09
2020-04-10 07:38:53 -04:00
chrisgarrity
d4a9a90597
Merge pull request #3793 from LLK/release/2020-04-09
...
[MASTER] Release 2020-04-09
2020-04-09 17:03:02 -04:00
DD Liu
3e4b108dbb
Revert pen change in render
2020-04-09 16:18:56 -04:00
chrisgarrity
315beea775
Merge pull request #3790 from seotts/report-copy
...
Update project report copy
2020-04-09 09:22:10 -04:00
chrisgarrity
52dcecf74b
Merge pull request #3792 from LLK/develop
...
Update release from develop
2020-04-08 16:27:42 -04:00
chrisgarrity
fe8706c644
Merge pull request #3791 from chrisgarrity/update-gui
...
update gui version for releae
2020-04-08 16:20:33 -04:00
Chris Garrity
515a474946
update gui version for releae
2020-04-08 16:19:27 -04:00
seotts
907c0a5228
Merge branch 'report-copy' of github.com:seotts/scratch-www into report-copy
2020-04-08 14:18:38 -04:00
seotts
41b87b0958
use exisiting general string for "Community Guidelines"
2020-04-08 14:14:43 -04:00
Sarah Otts
fed2fe0fa1
remove unnecessary curly brackets
2020-04-08 10:29:33 -04:00
seotts
42cfba3199
Update report copy
2020-04-08 10:10:10 -04:00
Sarah Otts
306e1f302e
Merge pull request #3785 from seotts/report-subcategories
...
[Develop] Add nested categories to project report module
2020-04-06 13:54:39 -04:00
Sarah Otts
f998efcaf3
Merge pull request #3789 from seotts/report-subcategories
...
[Master] Report subcategories
2020-04-06 13:52:00 -04:00
Ben Wheeler
2972c528f4
use state.classroom.id instead of url param classroomId
2020-04-06 10:36:06 -04:00
Ben Wheeler
81678b70a7
refactored uri pathname parsing to library
2020-04-03 16:11:45 -04:00
Ben Wheeler
75f8c6429a
added join token route; handle route alongside existing student signup uri
2020-04-03 14:40:56 -04:00
DD Liu
6a7c56f97e
Merge pull request #3787 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200403000338
...
Update scratch-gui to the latest version 🚀
2020-04-03 12:41:38 -04:00
seotts
272d96fdba
Lints
2020-04-03 10:41:42 -04:00
seotts
8f4a7643cf
Open Community Guidelines links in new tabs
2020-04-03 10:25:48 -04:00
greenkeeper[bot]
d0fa54400f
chore(package): update lockfile package-lock.json
2020-04-03 00:52:59 +00:00
greenkeeper[bot]
3e48115506
chore(package): update scratch-gui to version 0.1.0-prerelease.20200403000338
2020-04-03 00:52:54 +00:00
apple502j
544b1e1d45
Split follow splash into FollowUser and FollowStudio
2020-04-03 09:15:55 +09:00
seotts
b39f416681
Merge branch 'report-subcategories' of github.com:seotts/scratch-www into report-subcategories
2020-04-02 16:40:00 -04:00
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
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 fcd27f621d7548253b17
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
