scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-21 04:52:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14506 commits 221 branches 1 tag 522 MiB
Commit graph

1672 commits

Author SHA1 Message Date
caseymm
60a98a7a92 fix string links and rename splashes 2021-10-22 12:53:33 -07:00
caseymm
f8bdd8948b spinner color and correcting other errors 2021-10-21 16:42:22 -07:00
caseymm
ae4ecca386 i10n changes 2021-10-21 16:12:54 -07:00
caseymm
37dba60b1c links in paragraphs 2021-10-21 15:41:10 -07:00
caseymm
b460e9bb80 replace some images and start adding links to paragraphs 2021-10-21 15:10:47 -07:00
caseymm
fc47304527 finish all alt tags 2021-10-20 12:38:40 -07:00
caseymm
0e32b6c9c3 alts for video previews and country blurb sections 2021-10-20 11:22:52 -07:00
caseymm
2016380b34 add alts for india grid 2021-10-20 10:55:24 -07:00
caseymm
d3aa437444 styling 2021-10-19 16:27:42 -07:00
caseymm
4c29cb5dcc misc styling changes 2021-10-18 15:37:37 -07:00
caseymm
33132818c0 lint 2021-10-18 14:03:38 -07:00
caseymm
be9175aa64 misc timeline fixes 2021-10-18 14:00:11 -07:00
caseymm
0ed82b35c8 video buttons 2021-10-18 13:32:00 -07:00
Sarah Otts
e0a5ae5c68
Merge pull request #5884 from jeffalo/dont-search-empty-strings 
Prevent searches for empty strings
 2021-10-18 16:16:15 -04:00
caseymm
cb67a918d2 force autoplay on videos 2021-10-18 10:15:32 -07:00
caseymm
83760a522e tutorial lines and tile links 2021-10-15 16:39:06 -07:00
caseymm
95b7d13d08 update people.json 2021-10-15 14:45:02 -07:00
caseymm
520bf41968 fix linting 2021-10-15 12:47:58 -07:00
caseymm
7160befa55 update map 2021-10-15 12:06:10 -07:00
caseymm
a56631c267 bg images for year in review 2021-10-14 10:28:05 -07:00
caseymm
6366cbd4b2 spacing and bottom wave 2021-10-13 17:03:28 -07:00
caseymm
7d4621576f year in review cards 2021-10-13 16:33:51 -07:00
caseymm
6f1688d399 embed some projects 2021-10-13 10:55:29 -07:00
caseymm
19e65e9f0e items in for adapation 2021-10-12 15:39:52 -07:00
Sarah Otts
c30252a4ed
Merge pull request #5882 from apple502j/move-faq-url 
Move FAQ page to /faq
 2021-10-12 16:34:41 -04:00
caseymm
a45c1b6700 finish content in connectivity section 2021-10-05 15:27:11 -07:00
caseymm
4dbe0d20f0 country sections 2021-10-05 11:52:50 -07:00
Sarah Otts
23be853cb0
Merge pull request #5114 from benjiwheeler/shrink-splash-image 
converted images around splash video to png, smaller file size
 2021-09-20 14:06:25 -04:00
Eric Rosenbaum
a8b7961f66 alerts default to 6 seconds 2021-08-20 14:04:09 -04:00
jeffalo
feb80afb35 revert 2021-08-06 12:29:00 +02:00
jeffalo
992baf7745 see if returning null will fix errors 2021-08-06 12:26:56 +02:00
jeffalo
dbf68ff9b4 satisfy eslint 2021-08-05 21:33:59 +02:00
jeffalo
e1afa432a2 also don't allow only whitespace 2021-08-05 21:18:36 +02:00
jeffalo
7e1aebf9b4 prevent searches for empty strings 2021-08-05 21:12:22 +02:00
apple502j
9a390eafeb
Move FAQ page to /faq 2021-08-06 02:55:11 +09:00
Ray Schamp
a17919e561
Merge pull request #5496 from rschamp/rearrange-conference-2021 
Bump Conference 2020 to 2021 (Take 2)
 2021-06-14 09:01:51 -04:00
picklesrus
ef801112cd
Merge branch 'develop' into project-comments 2021-06-07 15:38:40 -04:00
picklesrus
993dd36aa5 WIP of being able to turn off project comments. 2021-06-07 11:28:29 -04:00
Paul Kaplan
cb8a869e4f Merge branch 'develop' into muted-users-cant-edit-studios 2021-05-26 10:58:12 -04:00
rschamp
31e6616544 Rename all Conference 2020 folders to 2021 
This is both to reduce confusion in the future, and so that Transifex sees what it expects, with the name of the resource corresponding to the path to the l10n file.
 2021-05-26 10:22:12 -04:00
Paul Kaplan
832324ea83
Merge pull request #5451 from paulkaplan/studio-alerts 
Alert component and studio error and success alerts
 2021-05-24 15:33:10 -04:00
Bryce Taylor
bfe64aa313
Merge pull request #4540 from BryceLTaylor/move-navbar-tests 
Move Navbar integration tests from Tap to Jest
 2021-05-24 10:57:21 -04:00
seotts
19a9997e0f Muted users can’t edit studios 
linting fixes
 2021-05-21 09:46:19 -04:00
Eric Rosenbaum
a7ab994638 use buttons in subnav to make keyboard nav work 2021-05-20 17:12:27 -04:00
Paul Kaplan
e2eb8611b1 Dont catch pointer events in the alert container 2021-05-19 13:46:06 -04:00
Paul Kaplan
5ee1c7c203 Add reusable alert component using context 2021-05-19 13:33:41 -04:00
Paul Kaplan
31655d7f11 Fix issue where multiple overflow menus could be opened at once 2021-05-14 12:25:04 -04:00
Paul Kaplan
8bc026a958
Merge pull request #5381 from paulkaplan/studio-tile-overflow-menu 
Studio tile overflow menu
 2021-05-14 09:30:56 -04:00
Paul Kaplan
e9728b8a13
Merge pull request #5388 from paulkaplan/studio-project-errors 
Add error display for studio curator and project adder inputs
 2021-05-14 09:30:42 -04:00
DD Liu
dffcbebc37 Switch the checkbox to a toggle slider for studio comments allowed 2021-05-13 15:46:34 -04:00
Paul Kaplan
d35c539529 Add validation messages for title, image and description 2021-05-13 10:36:40 -04:00
Ben Wheeler
316f26bed5 rename .close-button style to not conflict 2021-05-12 14:14:34 -04:00
Paul Kaplan
8dddb393a7 Add overflow menu and show example on components page 2021-05-12 10:53:52 -04:00
Ben Wheeler
3dd69c287c Remove stale comments, remove extra space, add padding 2021-05-07 22:23:45 -04:00
Ben Wheeler
23f2135c17 add donate banner, make close button a mode of button component 2021-05-07 11:50:47 -04:00
BryceLTaylor
7a5bdc0400 Change class for search input wrapper to search-wrapper 2021-04-06 14:19:05 -04:00
BryceLTaylor
0cd1f6e6be Add class to searchbar for automated tests 2021-04-06 14:19:05 -04:00
Ben Wheeler
491735b9f0 use smaller svgs instead of pngs 2021-03-30 21:32:54 -04:00
Eric Rosenbaum
33b7d87840 update grid json 2021-03-30 10:52:57 -04:00
Eric Rosenbaum
82d759e30a grid displays “Project Title” 2021-03-24 16:12:37 -04:00
Eric Rosenbaum
9466a7b75b add grid 2021-03-23 16:58:38 -04:00
Eric Rosenbaum
10f9194f61 fix form and carousel enough to display them 2021-03-22 17:24:18 -04:00
chrisgarrity
8271bb62bb
Merge pull request #5141 from seotts/prevent-feedback-when-not-just-muted 
Prevent feedback when not just muted
 2021-03-15 09:10:48 -04:00
seotts
936172d70b only show feedback link for new mute 
Add variable for isBad string
 2021-03-11 13:06:51 -05:00
seotts
a1759f42b3 Revert "Revert "Content updates march 2021"" 
This reverts commit 65f69d1201.
 2021-03-09 14:38:36 -05:00
Ben Wheeler
4533c983fd converted images around splash video to png, smaller file size 2021-03-09 10:15:44 -05:00
Sarah Otts
65f69d1201
Revert "Content updates march 2021" 2021-03-03 15:39:25 -05:00
Sarah Otts
4a625a634a
Merge pull request #5078 from zoebentley/content-updates-jan-2021 
Content updates march 2021
 2021-03-02 16:57:26 -05:00
seotts
ec3a205dea Create Plotly bundle to load only choropleth 
lint
 2021-03-01 16:22:02 -05:00
Paul Kaplan
b0390f36a2 Fix lint and missing components 2021-02-26 11:01:13 -05:00
Paul Kaplan
0353135cc4 Split phone number step to reduce bundle for other registration pages 2021-02-26 10:31:20 -05:00
Paul Kaplan
da2ca40ccf Only require libphonenumber when rendering phone inputs 2021-02-26 10:31:19 -05:00
Zoë Bentley
118ffadb76 Changed images on About page and changed many text strings 2021-02-19 12:04:13 -05:00
Zoë Bentley
1caa1da81f Began making changes to Credits page 2021-02-19 12:04:13 -05:00
Paul Kaplan
56345874e3 Mark deprecated methods with UNSAFE_ prefix 2021-02-19 11:12:00 -05:00
Karishma Chadha
2d932a7979
Merge pull request #5002 from LLK/hotfix/dependency-updates 
[Develop] Hotfix/dependency updates
 2021-02-16 11:34:23 -05:00
Karishma Chadha
ca392e6d5b Fix lint errors related to eslint-config-scratch update 2021-02-16 10:54:50 -05:00
seotts
5a3250edd5 Fix proptype of startStep 2021-02-11 15:14:51 -05:00
seotts
e23b27abc6 send automod feedback to api 2021-02-10 16:20:58 -05:00
picklesrus
92667c097d Add tests and expose steps enum so it can be referenced from outside MuteModal 2021-02-04 11:13:30 -05:00
picklesrus
f7bf204924 Draft: open mute modal from reply button if you're muted. 2021-02-02 11:34:27 -05:00
Sarah Otts
f60a8c71a0
Merge pull request #4901 from seotts/automod-feedback-modal 
Automod feedback modal steps
 2021-02-02 08:58:47 -05:00
seotts
ba99d49298 Fix FeedbackForm tests + other small fixes 
Add strings
 2021-02-01 15:50:55 -05:00
seotts
42eb195b57 move feedback form to its own component 2021-01-28 15:45:00 -05:00
seotts
a037395689 Merge branch 'automod-feedback-modal' of https://github.com/seotts/scratch-www into seotts-automod-feedback-modal 
# Conflicts:
#	src/components/modal/mute/modal.jsx
#	src/components/modal/mute/modal.scss
#	src/l10n.json
 2021-01-26 15:27:05 -05:00
Chris Garrity
1afa2a3e33 Adjust formatting of the comment status box 
Reduce the width of the comment status paragraphs to make them easier to read. Ensure that the bottom text is still below all other text by making it 100% width.
 2021-01-26 08:58:01 -05:00
seotts
9df36b0fcf add tests for feedback form, clean-up form 2021-01-25 17:52:59 -05:00
seotts
f2a3dfda1b Revert "Revert "Use formik for feedback form"" 
This reverts commit c22c2c967b.
 2021-01-22 15:14:21 -05:00
seotts
037f91e76c Revert "Revert "Add feedback step using a Formsy textarea"" 
This reverts commit 1bc3aaf0ee.
 2021-01-22 15:14:06 -05:00
seotts
1bc3aaf0ee Revert "Add feedback step using a Formsy textarea" 
This reverts commit 5e4fc154c6.
 2021-01-22 15:12:14 -05:00
seotts
c22c2c967b Revert "Use formik for feedback form" 
This reverts commit 512358e9af.
 2021-01-22 15:12:14 -05:00
seotts
b42966ac6a Revert "Add feedback step using a Formsy textarea" 
This reverts commit 5e4fc154c6.
 2021-01-22 12:13:40 -05:00
seotts
af56e2389c Revert "Use formik for feedback form" 
This reverts commit 512358e9af.
 2021-01-22 12:13:03 -05:00
seotts
512358e9af Use formik for feedback form 
cleanup
 2021-01-22 11:58:56 -05:00
seotts
5e4fc154c6 Add feedback step using a Formsy textarea 2021-01-22 11:58:56 -05:00
picklesrus
4879570561 Update vertical spacing on mute modal 
This reduces the vertical padding in the mute modal to better fit on shorter screens.
 2021-01-07 11:07:39 -05:00
Karishma Chadha
090312bf56
Merge pull request #4736 from seotts/world-map-fix 
World map fixes - Border thickness, Eswatini, remove unused css
 2021-01-06 10:43:50 -05:00
Sarah Otts
78d001e127
Merge pull request #4737 from seotts/team-new-tabs 
In the Annual Report Team section, open link to Scratch Team members in new tab
 2021-01-05 14:38:03 -05:00
Sarah Otts
b9892ff6d8
Merge branch 'develop' into automod-new-messaging 2021-01-04 11:09:29 -05:00
picklesrus
9037f8817a
Merge pull request #4774 from picklesrus/warning-mute 
Show warning message when user has been muted several times.
 2020-12-21 08:36:21 -05:00
seotts
7e140b3832 add new mute messages 
Get correct mute message info for modal

remove extra spapce
 2020-12-18 10:24:43 -05:00
picklesrus
d8ad0c38ea Show warning message when user has been muted several times. 2020-12-17 15:43:07 -05:00
picklesrus
1aca3c0f25
Merge pull request #4768 from picklesrus/fix-prop-warning 
Fix prop type. muteStepContent is an array not a string.
 2020-12-17 10:00:26 -05:00
Benjamin Wheeler
aeaca81fb7
Merge pull request #4686 from benjiwheeler/api-check-username 
switch educator registration checkusername endpoint from scratchr2 to api
 2020-12-16 20:43:19 -05:00
picklesrus
760082d2d7 Fix prop type. muteStepContent is an array not a string. 2020-12-16 07:54:20 -05:00
Chris Garrity
501147060d Update generic message copy 
Updated copy requres two paragraphs in the content. Modified the inputs to pass a content array and output one paragraph per item.
 2020-12-11 09:52:30 -05:00
Chris Garrity
929e670d8f Internationalize the mute messages 
Add formatted messages for comment status and mute modal
 2020-12-11 08:44:17 -05:00
seotts
b7cf82494b Remove unused variable and fix spacing 2020-12-07 16:16:42 -05:00
picklesrus
f4f6b70f2e
Merge branch 'develop' into readable-time 2020-12-07 16:05:02 -05:00
seotts
1d70ee243c Make borders smaller, show data for Eswatini 2020-12-07 12:45:01 -05:00
seotts
86650e1ce9 open link to Scratch Team member in new tab 2020-12-07 12:43:43 -05:00
picklesrus
b450d36a64 Redo time based on new requirements. 2020-11-30 16:16:52 -05:00
Sarah Otts
fec148ac74
Merge pull request #4682 from LLK/annual-report-video-spinner 
Add loading spinner in Annual Report
 2020-11-25 15:29:11 -05:00
Ben Wheeler
590873c765 switch educator registration checkusername endpoint from scratchr2 to api 2020-11-24 13:54:11 -05:00
seotts
246798b69d Use “play” event listener; clean-up code 2020-11-23 12:17:12 -05:00
seotts
785386b1c7 add newline to end of file 2020-11-23 11:15:44 -05:00
seotts
f75337dafd preload spinner image 2020-11-19 10:27:01 -05:00
seotts
cf9cbdf392 Hide iframe & show spinner until it begins playing 2020-11-16 14:33:46 -05:00
seotts
cb01cb9321 use Wistia api to do callback 2020-11-16 12:36:07 -05:00
Karishma Chadha
e14b6d52f3 Add spinner while video is still loading 2020-11-10 14:37:18 -05:00
picklesrus
b8b0f5d10c
Merge pull request #4580 from picklesrus/modal-image-updates 
A few small upates to the muting modal
 2020-11-10 09:52:41 -05:00
picklesrus
495edd1820 A few small upates: 
- Add images and update styles to match.  
- Add timeMuted prop so it can display how long the user is muted for. 
- Text updates

This still needs localization.
 2020-10-30 10:07:43 -04:00
seotts
a8058aa0bf remove comments; add new lines 2020-10-27 15:29:50 -04:00
Karishma Chadha
da1e8c00c5 Update translation image in reach section. Fix remaining world map prop type warning. 2020-10-27 01:20:04 -04:00
seotts
d68691de40 add map key 2020-10-26 17:36:23 -04:00
rschamp
59f0f2c093 Make the map always 100% width with 2:1 aspect ratio 2020-10-22 15:20:31 -04:00
Karishma Chadha
df27950a31 Remove mapHeight and mapWidth prop validation since they're no longer in use 2020-10-22 12:20:26 -04:00
rschamp
67ff392776 Start on responsive map 2020-10-22 11:50:48 -04:00
seotts
551eea91b5 Revert "Add CPS video" 
This reverts commit ec97646bf7430e874b0045a61a5f9d39d4c862de.
 2020-10-22 11:50:48 -04:00
seotts
be49e209bb Revert "Add ability to display YouTube in addition to Wistia" 
This reverts commit 8d758f0420b967aa5d3f9e9c14b9f9201c2702a6.
 2020-10-22 11:50:48 -04:00
seotts
ff6a3eb30f Add CPS video 2020-10-22 11:50:48 -04:00
seotts
79bc95a4c6 Add ability to display YouTube in addition to Wistia 2020-10-22 11:50:48 -04:00
seotts
c08650f2b7 add abhi video and fix thumbnail hover 2020-10-22 11:50:48 -04:00
rschamp
261313091d More lint 2020-10-22 11:50:45 -04:00
seotts
a558c23f8c lint fix 2020-10-22 11:50:45 -04:00
seotts
aea79a7e58 continued work on initiatives section 2020-10-22 11:50:45 -04:00
seotts
438c5ec0b5 create and use video-preview component 2020-10-22 11:50:45 -04:00
seotts
04b76feea1 work on map responsiveness 2020-10-22 11:50:45 -04:00
seotts
c61953e94a remove reference to deleted css file 2020-10-22 11:50:45 -04:00
seotts
9434bf67f6 remove unused code 2020-10-22 11:50:45 -04:00
Karishma Chadha
c4d8d443f1 Make world map sizing a little bit bigger and give some control over this to whatever uses the component. Fix styling for transition images between the milestones and reach sections (e.g paint brush) 2020-10-22 11:50:44 -04:00
Karishma Chadha
1558178318 Remove map view from experimentation phase, clean up world map component (getting rid of lint errors) 2020-10-22 11:50:44 -04:00
seotts
dc5461ef55 continued work on reach section 2020-10-22 11:50:44 -04:00
Karishma Chadha
6bd8aea7b7 Add support for a world map component, and an example page that displays it. 2020-10-22 11:50:43 -04:00
Benjamin Wheeler
11ad1aeac1
Merge pull request #4474 from JeffaloBob/patch-1 
add missing space to teacher request form
 2020-10-15 13:29:23 -04:00
Sarah Otts
7323ef06bd
Merge pull request #4477 from LLK/people-grid-component 
Pull out the credit page's grid of people into a separate component
 2020-10-13 11:26:24 -04:00
picklesrus
a567a593fe
Merge pull request #4495 from picklesrus/comment-status 
Commenting status component.
 2020-10-13 09:03:41 -04:00
picklesrus
966df020f2
Merge pull request #4482 from picklesrus/m-modal-draft 
Initial skeleton of mute modal.
 2020-10-13 09:02:47 -04:00
picklesrus
0e6e49759c Commenting status component. 2020-10-08 15:12:09 -04:00
Chris Willis-Ford
5f6315e6a1
Merge pull request #4263 from LLK/hotfix/rename-scratch-desktop-to-scratch 
[Develop] finish renaming 'Scratch Desktop' to 'Scratch'
 2020-10-05 10:29:45 -07:00
picklesrus
405ee52e50 First draft of the mute modal. 2020-10-02 15:59:33 -04:00
seotts
faf5a127d6 remove people grid padding 2020-10-02 15:43:22 -04:00
Karishma Chadha
e2da0b5250 Fix lint issues in people grid component 2020-10-02 15:43:22 -04:00
seotts
b7b3123217 add newline at end of file for linting 2020-10-02 15:43:22 -04:00
seotts
23f6ce281c remove duplicated css from credits page 2020-10-02 15:43:22 -04:00
seotts
204c532c4e connect PeopleGrid to css 2020-10-02 15:43:22 -04:00
seotts
74d18822e6 Make PeopleGrid component 2020-10-02 15:43:22 -04:00
Jeffalo
03c6335fa5
added semicolon sorry 2020-10-02 08:16:04 +02:00
Jeffalo
c7f2f942d7
add non breaking space to real name warning 2020-10-02 07:14:23 +02:00
Ray Schamp
b1d5246eea
Merge pull request #4216 from R4356th/patch-8 
Add overflow, white-space and text-overflow CSS elements
 2020-08-18 16:26:47 -04:00
picklesrus
05075712e8
Merge pull request #4292 from picklesrus/backoff-messages 
Exponentially back off the time between message polling.
 2020-08-07 14:45:56 -04:00
picklesrus
7d470131d7 Add check for existence of messageTimeoutId before clearing the timeout. 2020-08-06 13:22:49 -04:00
picklesrus
25b9bacd0e Update comment to match code 2020-08-06 13:13:12 -04:00
Christopher Willis-Ford
5384ad71b9 finish renaming 'Scratch Desktop' to 'Scratch' 
- adjust macOS installation instructions to mention "Scratch" instead of
  "Scratch Desktop"
- edit the DMG screenshot to fix the app name, DMG title, and DMG icon
 2020-08-03 12:08:35 -07:00
picklesrus
0036550ae8 Move timeout id out of state to a member variable and add some unittests. 2020-07-30 10:55:18 -04:00
R4356th
423c9b7e0c
Add white-space, overflow and text-overflow CSS elements 2020-07-18 18:27:03 +06:00
picklesrus
fac3ccad57 Make all times be in ms. 2020-07-17 14:44:36 -04:00
picklesrus
7eeb63cb3f rename SetupMessagePolling to pollForMessages 2020-07-16 12:24:13 -04:00
Benjamin Wheeler
21ccd45f9b
Merge pull request #4121 from apple502j/wiki-link 
Set wiki link per user's selected language
 2020-07-09 14:20:28 -04:00
Ben Wheeler
7b2cdc73f0 updated blocks new scratcher sees 2020-07-09 14:16:52 -04:00
picklesrus
5de96c373d Exponentially back off the time between message polling instead of doing it every two minutes. 2020-07-06 17:44:28 -04:00
Chris Willis-Ford
996a80d93d
Merge pull request #4145 from LLK/hotfix/scratch-desktop-evergreen 
[Develop] use 'evergreen' URLs for Scratch Desktop downloads
 2020-06-29 13:29:14 -07:00
Christopher Willis-Ford
2088cf2276 use 'evergreen' URLs for Scratch Desktop downloads 2020-06-25 15:00:38 -07:00
Benjamin Wheeler
2a16790cb3
Merge pull request #3776 from apple502j/patch-15 
Always apply min-height: 0
 2020-06-25 16:10:54 -04:00
Ben Wheeler
a635cd932c make scratchWikiLink prop 2020-06-25 14:09:32 -04:00
Benjamin Wheeler
b6270812a9
Merge pull request #4002 from R4356th/patch-1 
Change the way usernames are handled
 2020-06-25 13:44:17 -04:00
Benjamin Wheeler
dc79eb54c3
Merge pull request #3974 from benjiwheeler/move-to-country-data-lib 
move country name lookup to library
 2020-06-19 10:44:26 -04:00
Ben Wheeler
d388eef59f renamed lookupCountryInfo and lookupCountryName functions 2020-06-19 10:42:34 -04:00
apple502j
a903e3e9b2 Set wiki link per user's selected language 2020-06-18 20:22:22 +09:00
Ben Wheeler
924c862b9e remove email opt-in from join flow 2020-06-12 12:35:34 -04:00
Christopher Willis-Ford
5d7df5c546 update scratch-desktop download links for 3.11.1 2020-06-05 15:52:06 -07:00
R4356th
364f6da13d
Remove hasOwnProperty 2020-06-01 12:43:30 +06:00
R4356th
5a46a90564
Update username-step.jsx 2020-05-31 19:26:54 +06:00
R4356th
00a2dcad63
Update username-step.jsx 2020-05-31 14:19:27 +06:00
R4356th
d9d926590a
Update username-step.jsx 2020-05-30 17:09:55 +06:00
R4356th
29558b8468
Update username-step.jsx 2020-05-20 16:38:07 +06:00
Sarah Otts
6904f50718
Merge pull request #3973 from seotts/add-disrespectful-report 
Add disrespectful report option, reorder options
 2020-05-15 10:43:29 -04:00
Ben Wheeler
665eeff75a move country name lookup to library 2020-05-13 14:12:50 -04:00
Chris Willis-Ford
1bab2bb59a
Merge pull request #3856 from cwillisf/day1-student-country-default 
default student's country to educator's during reg
 2020-05-13 11:11:18 -07:00
seotts
52b8dff59a Add disrespectful report option, reorder options 2020-05-13 11:41:05 -04:00
Chris Willis-Ford
39a7788c87
Merge pull request #3854 from LLK/hotfix/scratch-desktop-3.10.2 
[Develop] release Scratch Desktop 3.10.2
 2020-05-04 13:28:36 -07:00
Christopher Willis-Ford
1ba7bef8d8 release Scratch Desktop 3.10.2 2020-05-04 11:25:18 -07:00
Christopher Willis-Ford
1408b540e1 default student's country to educator's during reg 
Ideally the classroom info would include the country code, not just the
country name. Since it doesn't, this change includes a new function to
look up a country code by the country's name (not label).
 2020-05-02 00:44:23 -07:00
Chris Garrity
d538d5d053 Localize the widget 
Note that some of the Freshdesk locales don’t match the ones used by Scratch.
 2020-05-01 12:09:19 -04:00
Chris Garrity
2650c44407 hide inappropriate link field 
disable and hide functions expect argument to be an array.
 2020-05-01 09:23:35 -04:00
Chris Garrity
750071b7ae Adjust form height to avoid form scrolling 2020-05-01 09:23:35 -04:00
Chris Garrity
3111b72117 Move profile or studio link out of description 
Prefill a new custom field for the inappropriate link instead of prefilling description.
In the popup make the link field hidden and disabled so that users don’t change it.
 2020-05-01 09:23:35 -04:00
Chris Garrity
3f5d34d05f delay loading freshdesk script 
Question: should script still have `async defer`
 2020-05-01 09:23:35 -04:00
seotts
aca3ef0a0d Add scary subcategories 2020-04-22 15:38:39 -04:00
chrisgarrity
8d385afa44
Merge pull request #3569 from apple502j/remove-flag 
Remove app flag
 2020-04-22 07:28:11 -04:00
picklesrus
01afd414cd
Merge pull request #3807 from picklesrus/student-username-update 
Change up the messaging in student registration.
 2020-04-21 14:28:09 -04:00
Benjamin Wheeler
099d5a1007
Merge pull request #3436 from benjiwheeler/join-flow-toggle-info-button 
Join flow info button has larger touch target, can be clicked to toggle
 2020-04-21 11:00:27 -04:00
chrisgarrity
15990b5876
Merge branch 'develop' into remove-flag 2020-04-16 16:41:31 -04:00
picklesrus
2711bafbcd Change up the messaging in student registration to make the "don't use your real name" a blue info message and give some suggestions on how to choose a username. 2020-04-15 15:43:24 -04:00
chrisgarrity
21cc1a9780
Update src/components/helpwidget/helpwidget.jsx 
initialize widget settings on `window` before adding the script

Co-Authored-By: Ray Schamp <rschamp@users.noreply.github.com>
 2020-04-14 15:32:57 -04:00
Ben Wheeler
d1366360f1 removed lodash.debounce, use onmouseleave instead 2020-04-14 10:33:59 -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
apple502j
3146ee8b83 Remove app flag 2020-04-14 01:40:05 +09: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
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
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
seotts
091181d387 Refer correctly to the "Send" button in the Face Reveal prompt 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
apple502j
4b7aaf84f2
Always apply min-height: 0 2020-03-30 15:29:44 +09:00
picklesrus
36ef3222c0 Merge remote-tracking branch 'upstream/develop' into captcha-component-ta 2020-03-27 09:50:50 -04:00
picklesrus
187406938a Make props required 2020-03-27 09:03:45 -04:00
picklesrus
7843ae8d4c Add Captcha to teacher registration. 2020-03-26 16:21:13 -04: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
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
Ray Schamp
507023fa96
Merge pull request #3749 from apple502j/images-403 
Fix image links
 2020-03-18 09:18:48 -04:00
Paul Kaplan
5670b4558a Add modifier class to fix button margin 2020-03-17 10:16:33 -04:00
Paul Kaplan
f796093e79 Revise comments to clarify functionality 2020-03-17 10:03:16 -04:00
Paul Kaplan
bc3a454f4c Split project report flow into multiple steps 2020-03-17 10:03:16 -04:00
apple502j
7c7887adc4 Fix image links 2020-03-16 15:48:39 +09:00
Chris Garrity
501a5d8fc0 Fix mistakes 
- take captcha off the helpform url
- use encodeUriComponent to make sure semicolons in the agent string don’t mess up the form parameters
- take the `$` end matcher off the route to allow for parameters to be passed
- fix forum links
- fix faq link `/faq` => `/info/faq`
 2020-03-13 09:47:31 -04:00
chrisgarrity
1d80c946f7
Merge pull request #3737 from LLK/hotfix/scratch-desktop-3.9.0 
[Develop] hotfix/scratch desktop 3.9.0
 2020-03-12 09:06:52 -04:00
Chris Garrity
e8197e4ffc Address review comments 
* With Carl decided to put the sidebar back even with just one item. It’s still one we want to emphasize.
* made sure the freshdesk js file would not block loading the form (it doesn’t appear to be needed for the form, it’s probably mainly for the pop-up version)
* moved the query processing into a constructor (more idomatic react)
* expanded the form so it should not need to scroll - also noted that in incognito mode a captcha is shown, so created enough space for that to be visible.
 2020-03-06 08:58:30 -05:00
Christopher Willis-Ford
83112f76b2 update scratch-desktop Windows URL for 3.9.0 2020-03-05 13:28:28 -08:00
Christopher Willis-Ford
ffb0bf86a7 make download URLs easier to find and update 2020-03-05 13:28:28 -08:00
Chris Garrity
ee09ba59a4 Add handling for parameters passed in the query from scratchr2 
Scratchr2 has links to contact us from the report (profile|studio) dialogs. Looking at the scratchr2 source, there’s also one for confirmations, so this change handles the additional details in the same way - in the subject and description. In the future we could consider pre-filling specific form fields that we define.
 2020-03-05 11:51:11 -05:00
Chris Garrity
8fc9b57e7d Add new Contact Us information page 
Using the Freshdesk Feedback form
* adds new component HelpForm for the Freshdesk component
* adds new contact-us view
* modifies Information page css with style for a header on the right hand nav section
* adds new route for the contact-us page (is identical to the old scratchr2 URL)
 2020-03-02 11:33:54 -05:00
Chris Garrity
ad2f0fa4e2 Don’t prefix localhost with . 
Need to special case localhost so that changing language works when running locally.
 2020-01-23 16:56:12 -05:00
Chris Garrity
92a729e9c8 Set language cookie domain to allow for cross-domain cookies 
Add leading `.` to the current hostname for the language cookie domain.
 2020-01-22 15:54:05 -05:00
Ben Wheeler
7b46ddf243 Revert "Merge pull request #3628 from LLK/revert-3618-hotfix/join-retry-session" 
This reverts commit 7c9a098598, reversing
changes made to 2c68f2041e.
 2020-01-14 21:58:38 -05:00
Benjamin Wheeler
25b01b6df9
Merge pull request #3624 from LLK/hotfix/mandrill-outage-page-banner 
[Develop] Hotfix/mandrill outage page banner
 2020-01-09 17:33:29 -05:00
Ben Wheeler
223bed257b changed wording to be more specific abount time 2020-01-09 17:28:19 -05:00
Ben Wheeler
88e59a5b49 Move warning banner from splash to Page 2020-01-11 00:16:34 -05:00
Benjamin Wheeler
1dbe89f2bc
Revert "[Develop] Hotfix/join retry session" 2020-01-09 08:44:27 -05:00
Ben Wheeler
2c40d8c51e draft of mandrill outage banner 2020-01-09 00:03:58 -05:00