picklesrus
bcb848d515
Remove now unused FormatedHTMLMessage.
2020-05-01 10:27:31 -04:00
picklesrus
d968ec42bd
Remove unsused message
2020-05-01 10:08:52 -04:00
Chris Garrity
41c60c62d7
Wording change for Bugs and Glitches
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
09b578bff7
Update copy
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
picklesrus
c5aaa7cb05
Add probable final link
2020-04-30 17:16:58 -04:00
-Accio-
40aa52e673
Alphabetize the credits page
...
Put the credits page in order by first names as opposed to last names which are no longer present.
2020-04-29 10:36:27 -04:00
Benjamin Wheeler
ebbee5e7b7
Merge pull request #3830 from R4356th/patch-1
...
Add new member's name
2020-04-29 09:38:42 -04:00
R4356th
5826058da5
Update people.json
2020-04-27 23:51:26 +06:00
picklesrus
6f1b7d7bef
Add setup guide link. Still needs final link filled in.
2020-04-27 10:38:40 -04:00
R4356th
84d861f299
Update people.json
2020-04-27 16:01:09 +06:00
apple502j
b2544e1cbd
Fix lint
2020-04-26 17:05:42 +09:00
apple502j
b476a1e4b3
Fix invisible actor on FollowStudio
2020-04-26 14:58:21 +09:00
picklesrus
859ce97ab0
Second, smaller round of updates to the FAQ page.
2020-04-23 09:32:51 -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
chrisgarrity
11e6c2ea9f
Merge pull request #3786 from apple502j/following-l10n
...
Split follow splash into FollowUser and FollowStudio
2020-04-17 07:12:08 -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
Karishma Chadha
05c96b48da
Merge pull request #3806 from LLK/hotfix/credits
...
[Develop] Hotfix/credits
2020-04-15 15:37:13 -04:00
Karishma Chadha
13d8d1b200
Remove last names from credits page.
2020-04-15 12:02:07 -04:00
apple502j
7048e1e5dc
Fix typo
...
Co-Authored-By: adroitwhiz <adroitwhiz@protonmail.com>
2020-04-15 23:39:58 +09:00
chrisgarrity
5cd282ed56
Merge pull request #3800 from chrisgarrity/freshdesk-widget
...
Freshdesk widget
2020-04-14 15:43:01 -04:00
chrisgarrity
5e21c58c2a
Merge pull request #3710 from apple502j/localize-activity
...
Localize activity messages
2020-04-14 15:42:45 -04:00
Ray Schamp
5e33c4e37e
Merge pull request #3801 from Accio1/issue/gh-#3781-Delay-Scratch-Conference
...
Fix gh-3781: Delay Scratch Conference
2020-04-14 10:57:34 -04:00
Ray Schamp
e8d58c6884
Move space out of l10n string and into JSX
2020-04-14 10:56:56 -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
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
apple502j
93f9eaf718
Fix editor title when not logged in
2020-04-11 01:30:29 +09: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
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
apple502j
544b1e1d45
Split follow splash into FollowUser and FollowStudio
2020-04-03 09:15:55 +09:00
Ben Wheeler
7655a08d7e
improve breaking of long words
2020-03-31 22:08:13 -04:00
picklesrus
7843ae8d4c
Add Captcha to teacher registration.
2020-03-26 16:21:13 -04:00
picklesrus
0ca47ec8fb
Merge pull request #3740 from picklesrus/educator-faq
...
Educator faq updates
2020-03-20 14:29:08 -04:00
Ray Schamp
507023fa96
Merge pull request #3749 from apple502j/images-403
...
Fix image links
2020-03-18 09:18:48 -04:00
picklesrus
09c50d9dde
Switch message back to FormattedHTMLMessage because the old version has html in it.
...
Change the id of a message whose contents changed to not have html.
2020-03-16 09:19:31 -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
picklesrus
f2ee4ea985
Change answer to student account deletion question.
2020-03-12 13:51:27 -04:00
picklesrus
ae6648f663
Update to data collection question.
2020-03-10 12:07:08 -04:00
chrisgarrity
9335274765
Merge pull request #3719 from chrisgarrity/freshdesk-contactus
...
Add new Contact Us information page
2020-03-10 10:58:28 -04:00
picklesrus
3b869c36a2
Replace FormattedHtmlMessage with FormattedMessage where it wasn't necessary.
2020-03-10 09:42:48 -04:00
picklesrus
132db9b362
Fix copy/paste error of links
2020-03-09 10:21:24 -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
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
picklesrus
badc47f81c
fix typo
2020-03-05 10:32:50 -05:00
picklesrus
d01b3c8b31
Add 250 student question.
...
Change formttedhtmlmessage -> formattedmessage
2020-03-05 09:15:44 -05:00
picklesrus
4404f2bbf4
Initial commit for educator FAQ updates.
2020-03-04 18:14:32 -05:00
Chris Garrity
f0bcd9f574
Remove the nav section and make the form full width
...
Decided that there is no need for the Nav sidebar since we don’t want the link to the Discussions right now. It could come back if we add the knowledge base.
2020-03-03 11:17:07 -05:00
Ray Schamp
720e2bacba
Merge pull request #3730 from rschamp/hotfix/conference-delay-spacing
...
[Develop] Split out message about conference registration delay
2020-03-03 11:12:07 -05:00
Chris Garrity
3dc5155c38
Revised wording
2020-03-03 10:10:20 -05:00
rschamp
f596089d0a
Split out message about conference registration delay
2020-03-03 09:31:24 -05:00
Paul Kaplan
e43cb7ab4e
Reorder and de-red report action on project page
2020-03-03 08:56:25 -05:00
rschamp
3d87f6feed
Make updates in response to COVID-19
2020-03-02 15:53:23 -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
rschamp
375e525372
Fix dates, be less paranoid about l10n ids
...
The strings will get updated, even if the id persists.
2020-03-02 11:26:34 -05:00
rschamp
3c3b29708d
Address various copy-paste errors
...
Nice catch @adroitwhiz :)
2020-03-02 10:16:47 -05:00
rschamp
0e83287b37
Update conference page to open registration
2020-02-29 11:02:09 -05:00
apple502j
a3a22a087a
Localize activity messages
2020-02-26 13:52:17 +09:00
Chris Garrity
d55d18a8e0
Update text
2020-02-05 09:00:44 -05:00
Chris Garrity
4fd69c526a
Add FAQ about updating the app
...
Addresses #3104
Added separate answers for the Downloaded vs Play store versions. Also noted that school managed installations would have to be updated by administrators.
2020-02-04 11:02:49 -05:00
Chris Garrity
c95d087289
Ensure that the old scratchlanguage cookie is removed if it exists.
...
On init, remove the old cookie if it exists.
On the project page, make sure `handleSetLanguage` also sets the domain.
2020-01-29 16:11:58 -05:00
Ben Wheeler
2d3158a8f7
Introduce new tx-push-www script to automate string push to transifex
2020-01-16 16:06:55 -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
88e59a5b49
Move warning banner from splash to Page
2020-01-11 00:16:34 -05:00
Ben Wheeler
2c40d8c51e
draft of mandrill outage banner
2020-01-09 00:03:58 -05:00
Ben Wheeler
be0617f69a
use max-width to constrain player size
2019-12-30 22:13:03 -05:00
Ben Wheeler
b2d54da8ec
Fix page width by hiding overflow, calculating
2019-12-30 21:46:38 -05:00
Benjamin Wheeler
08386bf427
Merge pull request #3599 from benjiwheeler/instructions-word-break
...
break word in project description
2019-12-18 17:31:40 -05:00
Ben Wheeler
ea1fea8b3d
remove work-break: break-word, which is deprecated
2019-12-18 11:32:00 -05:00
chrisgarrity
ca7e766f76
Merge pull request #3609 from LLK/hotfix/chromeos-faq
...
[Develop] Hotfix/chromeos faq
2019-12-18 09:54:31 -05:00
Chris Garrity
037443ba5c
Update troubleshooting and FAQ sections for Scratch App and hardware extensions
...
Fixes #3570
2019-12-17 15:42:17 -05:00
Ben Wheeler
5ce878abbb
added overflow-wrap
2019-12-17 12:18:16 -05:00
picklesrus
e776cb536f
Merge pull request #3598 from LLK/hotfix/conference2020
...
[Develop] Hotfix/conference2020
2019-12-12 16:21:22 -05:00
picklesrus
d16d399b99
Remove stray space
2019-12-12 08:32:48 -05:00
Ben Wheeler
325caf9424
break word in project description
2019-12-11 23:54:20 -05:00
picklesrus
b6d296f88d
Fix some spacing and replace images.
2019-12-11 16:21:13 -05:00
picklesrus
d498ef428a
Fix up spacing and images.
2019-12-11 15:53:20 -05:00
picklesrus
3c67fe83c5
More wording fixes.
2019-12-11 08:46:54 -05:00
picklesrus
b218248ad9
Fix old wording.
2019-12-10 16:07:01 -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
Ben Wheeler
2b39ca3f64
alphabetized contributors list
2019-12-06 17:02:38 -05:00
Ben Wheeler
827990e703
alphebatized credits
2019-12-06 16:51:13 -05:00
Ben Wheeler
a3c11b5afc
added robyn bosic to credits page
2019-12-06 14:27:47 -05:00
picklesrus
52ae6f791e
Merge pull request #3583 from picklesrus/footer-stuff
...
Add recognition text and links to the bottom of the page.
2019-12-04 17:23:34 -05:00
picklesrus
b89fe1a985
Add recognition text and links to the bottom of the page.
...
Adds a prop to the Page component so each page can say whether or not it
wants them to appear.
2019-12-04 16:28:23 -05:00
Ray Schamp
f6de9721a1
Merge pull request #3573 from LLK/hotfix/hoc-2019
...
[Develop] CSEdWeek 2019 homepage banners
2019-11-27 16:23:43 -05:00
rschamp
fdddad3516
Review feedback
2019-11-27 15:45:35 -05:00
rschamp
d83769be71
Set real start date
2019-11-27 12:25:45 -05:00
rschamp
8b79a1406d
Use magenta to contrast with the talking tales bg
2019-11-27 11:34:57 -05:00
rschamp
e5d14ff0c2
Update content for 2019
2019-11-27 11:15:41 -05:00
rschamp
976cfa4acd
Resurrect HOC banners
2019-11-26 18:25:21 -05:00
rschamp
1a172d45e0
Purge old banner
2019-11-26 17:31:47 -05:00
Ray Schamp
b7bdafd34c
Merge pull request #3565 from LLK/hotfix/project-creation-replication-lag
...
[Develop] Work around replication lag problems on project creation
2019-11-22 14:54:58 -05:00
picklesrus
73addf562f
Hack to work around replication lag problems on project creation. This makes sure api can get the project before considering the project create to be complete. We ought to refactor gui and www so that we can use the project data we get back from the project create instead.
2019-11-22 12:15:44 -05:00
Paul Kaplan
86b8dc5f90
Merge pull request #3509 from apple502j/credits-update
...
Credits member update
2019-11-21 13:18:11 -05:00
Paul Kaplan
7129cb2054
Merge pull request #3545 from apple502j/goodbye-jobs-page
...
Goodbye jobs page
2019-11-21 13:13:02 -05:00
zoebentley
a5491db7e5
Merge pull request #3546 from zoebentley/ideas-pong-fly-imagine
...
Add Imagine a World, Make it Fly, & Pong to Ideas Page, and reorder activities
2019-11-19 11:37:58 -05:00
Zoë Bentley
7c194ced62
Add Imagine a World, Make it Fly, and Pong to Ideas Page, and reorder activities
2019-11-18 13:52:00 -05:00
apple502j
6d9a7d20da
Links and test changes
2019-11-19 01:34:19 +09:00
apple502j
3f61b09889
Remove jobs page
2019-11-19 01:33:56 +09:00
apple502j
0bff005162
Member updates with latest info
2019-11-14 01:01:24 +09:00
Chris Garrity
0d93c3faf0
Correct TM capitalization
2019-11-13 09:43:24 -05:00
Chris Garrity
4be41235b5
Additional ChromeOS/Android FAQs for the download page
...
Two more questions related to bluetooth on ChromeOS/Android.
They should only be visible if either Chrome or Android is selected, and the `CHROME_APP_RELEASED` feature flag is true.
2019-11-12 18:17:30 -05:00
apple502j
cb3a979144
Don't link when userName is blank, in credits
2019-11-09 00:38:33 +09:00
apple502j
e391f8ce87
Member updates in Credits
2019-11-09 00:33:06 +09:00
Benjamin Wheeler
f271a4f0c3
Merge pull request #3444 from benjiwheeler/join-flow-sentry-wrap
...
Add Sentry to Join Flow; set Sentry tags on various ErrorBoundaries
2019-10-16 16:34:43 -04:00
Ben Wheeler
226134bc81
renamed ErrorBoundary prop name to componentName
2019-10-11 17:17:50 -04:00
Ben Wheeler
91a05d636f
redo sentry tag key and values, move ErrorBoundary around embed
2019-10-10 13:15:35 -04:00
Chris Garrity
c93dd77aef
Remove reference to Chrome/Android in FAQ
2019-10-10 11:17:35 -04:00
Ben Wheeler
54f30fc944
set errorboundary name tag everywhere ErrorBoundary is used
2019-10-09 22:30:59 -04:00
Benjamin Wheeler
60609dc819
Merge pull request #3430 from benjiwheeler/join-flow-responsive-fixes
...
Join flow responsive fixes
2019-10-07 12:44:30 -04:00
Ben Wheeler
2a57da32a5
rewrite join view scss without changing styles
2019-10-03 12:39:58 -04:00
chrisgarrity
62015b8b2d
Merge pull request #3429 from chrisgarrity/chrome-content
...
Changes to various pages for the Chrome/Android launch
2019-10-02 17:01:43 -07:00
Chris Garrity
916be715c1
Other Scratch app changes
...
* Footer
* ideas page
* FAQ
* parents
2019-10-02 16:38:38 -07:00
Chris Garrity
54c5484263
Copy changes for Download page.
2019-10-02 15:57:06 -07:00
Benjamin Wheeler
18fd960a6a
Merge pull request #3377 from benjiwheeler/embed-view
...
embed view with minimal functionality, route
2019-10-02 17:32:45 -04:00
Ben Wheeler
f9b436182b
Revert "removing Page"
...
This reverts commit 06124331cc
2019-10-01 18:21:14 -04:00
Ben Wheeler
06124331cc
removing Page
2019-10-01 00:46:32 -04:00
Ben Wheeler
309e5a77e1
try adding Page to make build succeed
2019-09-30 23:57:11 -04:00
Ben Wheeler
60ad7e5125
removed unnecessary return statement
2019-09-30 10:56:42 -04:00
Ben Wheeler
6772dc3b6d
refactor project view and embed view to not use shared hoc
2019-09-30 10:49:19 -04:00
Ben Wheeler
10e6685a15
remove console.log statements
2019-09-30 10:07:18 -04:00
Ben Wheeler
afb7957d04
moved Sentry init into ProjectViewHOC wrapper’s code
2019-09-30 10:06:33 -04:00
Ben Wheeler
df95f4f116
refactored getProjectData back into only project-view
2019-09-30 10:06:06 -04:00
Ben Wheeler
ae591857a4
removed unnecessary React.Fragment
2019-09-30 10:04:44 -04:00
Ben Wheeler
a2e045f8ef
removed extra sentry init
2019-09-28 13:59:43 -04:00
Ben Wheeler
01a273b1f8
refactored project view and embed view to use hoc
2019-09-28 10:19:06 -04:00
Ben Wheeler
ca4a4bcbb3
added project view hoc, not hooked up yes
2019-09-28 10:18:19 -04:00
Paul Kaplan
32165c0d31
Merge pull request #3397 from paulkaplan/chromeos-feature-flag
...
Download and initial extension pages for forthcoming ChromeOS app launch
2019-09-25 16:00:06 -04:00
Ben Wheeler
465a87d453
use Scratch3Registration instead of JoinModal in /join
2019-09-24 18:41:24 -04:00
Paul Kaplan
762dc324b8
Update extension pages for new OS picker
2019-09-24 16:25:58 -04:00
Paul Kaplan
5d39e59dd5
Use a feature flag to contain new Scratch Desktop updates
2019-09-24 15:17:11 -04:00
picklesrus
fd131b84c1
Add Logo to join flow standalone page.
...
Will need some css work, especially for small screens.
2019-09-24 14:21:02 -04:00
picklesrus
1a58095782
Put values directly in render props.
2019-09-24 13:43:34 -04:00
picklesrus
0d60b64c39
Add a prop to Modal that allows you to hide the close button. Set it to show by default and have the standalone join flow page set it to hidden.
2019-09-24 13:43:34 -04:00
Eric Rosenbaum
21e9494e1a
Update BOOST troubleshooting to suggest Link update
2019-09-23 11:45:17 -04:00
Ray Schamp
638b4dca5c
Merge pull request #3388 from LLK/hotfix/zalgo
...
[Develop] Contain zalgo text
2019-09-23 10:55:54 -04:00
Paul Kaplan
e2e9bb8db3
Merge pull request #3375 from LLK/canonical-link
...
Include canonical link in project meta tags
2019-09-23 10:21:59 -04:00
