Commit graph

5663 commits

Author SHA1 Message Date
Ray Schamp
e8d58c6884
Move space out of l10n string and into JSX 2020-04-14 10:56:56 -04:00
Ben Wheeler
d1366360f1 removed lodash.debounce, use onmouseleave instead 2020-04-14 10:33:59 -04:00
apple502j
8ca097fde2 Rename followee to studio 2020-04-14 13:47:07 +09:00
-Accio-
4c0e13a154
Make desc1a bold
Made desc1a bold in order to emphasize it, and added a line break betwwen regestrationDelayed and connectNow
2020-04-13 21:25:03 -04:00
-Accio-
952f95c784
Seperate desc1
Seperate desc1 into desc1 and desc1a so that desc1a can be bolded in order to emphasize it.
2020-04-13 21:19:56 -04:00
Ben Wheeler
5805d8a0fe first take on toggleable open close state for info messages
make info button have large, invisible boundary

fix info button ref setting

WIP: experiment with more sophisticated mouseout handling

add lodash debounce

use lodash debounce to reduce info message flickering

tweak info message position per added padding

remove leftover function

update info button tests, add a bunch more
2020-04-13 17:06:33 -04:00
Benjamin Wheeler
ae04860160
Merge pull request #3788 from benjiwheeler/join-endpoint
added /signup/TOKEN route; handle route alongside existing student signup route
2020-04-13 14:41:19 -04:00
Ben Wheeler
05e61cc842 changed student signup route from /join/TOKEN to /signup/TOKEN 2020-04-13 13:11:11 -04:00
apple502j
3146ee8b83 Remove app flag 2020-04-14 01:40:05 +09:00
-Accio-
6e68eb0ae5
Fix spacing again 2020-04-12 10:00:34 -04:00
-Accio-
9675bfe76e
Fix spacing
Co-Authored-By: apple502j <33279053+apple502j@users.noreply.github.com>
2020-04-12 09:22:38 -04:00
-Accio-
ca2e6fd089
Delay Scratch Conference to 2021 2020-04-11 22:40:14 -04:00
-Accio-
8cf5e09546
Delay Scratch Conference to 2021 2020-04-11 22:39:58 -04:00
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