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
Benjamin Wheeler
ae96ac7eed
Merge pull request #3618 from LLK/hotfix/join-retry-session
...
[Develop] Hotfix/join retry session
2020-01-07 14:36:38 -05:00
Benjamin Wheeler
6a97d44978
Merge pull request #3576 from benjiwheeler/join-flow-retry-session
...
Retry fetching session until it succeeds, when registering using join flow
2019-12-13 15:03:43 -05:00
picklesrus
e776cb536f
Merge pull request #3598 from LLK/hotfix/conference2020
...
[Develop] Hotfix/conference2020
2019-12-12 16:21:22 -05:00
picklesrus
b6d296f88d
Fix some spacing and replace images.
2019-12-11 16:21:13 -05:00
picklesrus
166a2dc282
Initial landing page with info about Scratch conference 2020.
...
Also switches the /conference redirect to go to conference/2020 instead
of /2019.
2019-12-09 16:27:47 -05:00
Benjamin Wheeler
7031bc5dfe
Merge pull request #3482 from nandedamana/issue/gh-3182-teacher-reg-form-diff-font-weights
...
fixed the issue "Create a Username" has different font weight
2019-12-05 22:52:44 -05:00
picklesrus
f8f6cce2e6
Merge pull request #3586 from picklesrus/footer-stuff
...
add a missing t.
2019-12-05 09:48:58 -05:00
picklesrus
c306b92d78
add a missing t.
2019-12-05 09:47:12 -05:00