scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-04 12:51:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6866 commits 216 branches 1 tag 485 MiB
Commit graph

3765 commits

Author SHA1 Message Date
Ray Schamp
628218571b
Merge pull request #3567 from LLK/hotfix/hoc-redirect-queryparams 
[Develop] Support url parameters for 3 redirects
 2019-11-22 15:21:12 -05:00
Ray Schamp
bd879f59c6
Support url parameters for 3 redirects 2019-11-22 14:58:41 -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
apple502j
af172aee7e Change routes a bit 2019-11-22 01:00:13 +09:00
chrisgarrity
e42fd54ba8
Merge pull request #3550 from LLK/hotfix/chromeos-release 
HOTFIX [develop] Enable feature flag for chrome app download
 2019-11-20 10:44:56 -05:00
Ben Wheeler
e915ae1927 if username has spaces, provide validation message specifically mentioning that 2019-11-19 16:21:06 -05:00
picklesrus
23c799dd3a
Merge pull request #3547 from picklesrus/change-includes 
Use indexOf instead of includes because of old browsers.
 2019-11-19 14:06:07 -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
Paul Kaplan
48b502a347
Enable chrome app feature flag 2019-11-18 15:23:34 -05:00
picklesrus
d1c7829853 Use indexOf instead of includes because of old browsers. 2019-11-18 14:06:19 -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
picklesrus
25620053c8
Merge pull request #3537 from picklesrus/join-flow-launch 
Roll out new Join Flow.
 2019-11-15 13:26:52 -05:00
picklesrus
5b351b6515 Roll out new Join Flow. 2019-11-15 11:28:10 -05:00
picklesrus
378cebe5f4 Take user to the homepage when finishing the join flow (unless they came from the editor). There is replication lag that makes creating a project immediatley a bad experience. We'll fix this in a followup. 2019-11-15 11:23:54 -05:00
apple502j
0bff005162 Member updates with latest info 2019-11-14 01:01:24 +09:00
chrisgarrity
e4c204463e
Merge pull request #3513 from chrisgarrity/download-faq 
Additional ChromeOS/Android FAQs for the download page
 2019-11-13 10:38:07 -05:00
picklesrus
a036d5d13c Put the right value in the password field. This got mixed up in #3512. 2019-11-13 10:10:14 -05: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
Ben Wheeler
4c0026ab41 revised comment explaining character length count 2019-11-12 16:57:49 -05:00
Ben Wheeler
48d7209942 remove truncation of password, passwordConfirm 2019-11-12 11:43:23 -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
be0ae3307b
Merge pull request #3508 from picklesrus/policy-text 
Add privacy policy and link to the email step.
 2019-11-06 13:02:22 -05:00
picklesrus
3ad17a4572 Add privacy policy and link to the email step. 2019-11-06 12:32:55 -05:00
picklesrus
c2004d0f43 Switch to using scratchr2 check_username endpoing instead of api. There are some cleanspeak differences with the api one that need to be resolved. 2019-11-06 11:25:07 -05:00
picklesrus
b845010025
Merge pull request #3503 from picklesrus/join-ga 
Add analytics logging to join flow.
 2019-11-06 11:01:40 -05:00
Benjamin Wheeler
7cea138c46
Merge pull request #3505 from LLK/revert-3495-revert-3468-country-data-name-fix 
Revert "Revert "fixed country options to use full country name string as option value""
 2019-11-06 10:22:31 -05:00
picklesrus
68fc4fe45b Fix merge conflicts :( 2019-11-05 20:01:35 -05:00
picklesrus
c77db39062 Guard calls to componentDidMount with a check for existence. 
Fix tag on username step.
 2019-11-05 19:50:42 -05:00
picklesrus
30967a3056 Set sendAnalytics to be required and send the right props to the error step. Also add a test for the error step. 2019-11-05 19:50:42 -05:00
picklesrus
e4b79c1bd2 Add analytics logging to join flow. Adding page views for each step in the flow. 2019-11-05 19:48:44 -05:00
Ben Wheeler
7b69935d50 in join flow, use country name options 2019-11-05 18:31:05 -05:00
Ben Wheeler
3e7753691f use country code options in regular registration 2019-11-05 18:30:49 -05:00
Ben Wheeler
70d81b85fe made separate functions for country options with name, code 2019-11-05 18:30:20 -05:00
Benjamin Wheeler
2182853dc6
Revert "Revert "fixed country options to use full country name string as option value"" 2019-11-05 18:07:31 -05:00
Benjamin Wheeler
77fca39bbf
Merge pull request #3485 from benjiwheeler/join-flow-cache-ignores-api-failures 
username step and email step caches ignore api failures
 2019-11-05 12:51:33 -05:00
Ben Wheeler
7b2e75821c revise function names and handling of registration errors 2019-11-05 12:12:03 -05:00
Ben Wheeler
e3d3d97c19 change p tags to divs; set isRequired on canTryAgain 2019-11-05 12:12:03 -05:00
Ben Wheeler
510906e538 removed stray onCaptchaError from bind list 2019-11-05 12:12:03 -05:00
Ben Wheeler
f713298d37 use class instead of id for identifying errorMsg in test 2019-11-05 12:11:04 -05:00
Ben Wheeler
d265ad3d44 show errorMsg content, not formatted message with errMsg as id 2019-11-05 12:11:03 -05:00
Ben Wheeler
469db4dc36 simplify canTryAgain function, reset registrationError on retry 2019-11-05 12:11:03 -05:00
Ben Wheeler
9a97285ac6 rename handleRegistrationError to handleCaptchaError 2019-11-05 12:11:03 -05:00
Ben Wheeler
5cc0bfd782 fix password error regex 2019-11-05 12:09:56 -05:00
Ben Wheeler
a95d17f708 refactor error handling in join flow 2019-11-05 12:09:56 -05:00
Ben Wheeler
c6ae2176da added validation functions for error code validation 2019-11-05 12:09:56 -05:00
Ben Wheeler
ceb3af1c58 improve formatting of welcome, error step text 2019-11-05 12:09:56 -05:00
Ben Wheeler
517d8ff7cc registration error step takes different props 2019-11-05 12:09:56 -05:00
Ben Wheeler
df6c369e89 Added error strings for particular join flow errors 2019-11-05 12:09:55 -05:00
Ben Wheeler
b6fcffd6f3 correct misspelled join flow intl id 2019-10-31 23:21:21 -04:00
Benjamin Wheeler
20d9ab64ac
Revert "fixed country options to use full country name string as option value" 2019-10-31 10:56:46 -04:00
kosiecki17
3cd5e9679b
HoC Redirect to Talking Tales and Code a Cartoon 2019-10-30 15:23:20 -04:00
Ben Wheeler
6bf27b7e8a count unicode characters as single characters 2019-10-30 15:06:22 -04:00
Ben Wheeler
652871f0bd removed password length code, moved to separate PR 2019-10-30 14:32:04 -04:00
Nandakumar Edamana
f54cf1a639 fixed a margin issue caused by the previous fix 2019-10-27 17:07:43 +05:30
Nandakumar Edamana
4e3956e1e4 fixed the issue "Create a Username" has different font weight 2019-10-27 16:57:55 +05:30
Ben Wheeler
49fe86ae3c username step and email step caches ignore api failures 2019-10-23 17:02:57 -04:00
Ray Schamp
6631bbafb2
Merge pull request #3469 from rschamp/fix-dev-server 
Fix dev server by splitting up redirect regex
 2019-10-21 16:28:33 -04:00
Benjamin Wheeler
a85c1c3f78
Merge pull request #3468 from benjiwheeler/country-data-name-fix 
fixed country options to use full country name string as option value
 2019-10-21 16:12:25 -04:00
rschamp
21a8f4d5be Fix dev server by splitting up redirect regex 
This pattern works for building/deploying, but not for running locally. Split it up to deal with what express expects a path to look like.
 2019-10-21 13:51:50 -04:00
Ben Wheeler
f26a83423c fixed country options 2019-10-21 12:33:34 -04:00
Benjamin Wheeler
d9bd2baf15
Merge pull request #3424 from benjiwheeler/join-flow-splash-join-button 
splash page join button works with new join flow
 2019-10-21 12:18:01 -04:00
Benjamin Wheeler
fdbbc5e632
Merge pull request #3423 from benjiwheeler/join-flow-select-text 
make text selectable, so users can copy errors
 2019-10-21 11:17:02 -04:00
Benjamin Wheeler
e0658585cc
Merge pull request #3462 from benjiwheeler/join-flow-error-state-limit-one-retry 
Join flow error state limit one retry
 2019-10-21 10:44:18 -04:00
Ben Wheeler
c499624345 make text selectable, so users can copy errors 2019-10-18 13:54:59 -04:00
Ben Wheeler
cd5f3b5437 change method of redirecting user to join flow page 2019-10-18 11:53:31 -04:00
Ben Wheeler
baa4e0e2c3 refactor intro.jsx and navigation.jsx to use new navigation reducer single registration open request action 2019-10-17 23:38:54 -04:00
Ben Wheeler
d4676ec990 redo navigation reducer to handle registration request with single action 2019-10-17 23:38:54 -04:00
Ben Wheeler
ed99e410f5 splash page join button works with new join flow 2019-10-17 23:38:54 -04:00
Ben Wheeler
0dfd1cf9fc added comment about setting initial state 2019-10-17 23:34:31 -04:00
Ben Wheeler
eeb9f03887 use initialState to set, reset state of join-flow component 2019-10-17 23:32:06 -04:00
Ben Wheeler
3469f17bfe error step can show try again, or start over; limits to one retry 2019-10-17 22:25:00 -04:00
Ben Wheeler
1c3eca3e06 add start over string, make capitalization consistent in make a project 2019-10-17 22:23:14 -04:00
Ben Wheeler
8b78fcb8db always load captcha on email step 2019-10-17 22:22:44 -04:00
Ray Schamp
699bd84190
Merge pull request #3459 from LLK/hotfix/hoc-redirects 
[Develop] Add redirects for Make it Fly and Imagine If tutorials
 2019-10-17 16:58:08 -04:00
rschamp
82e6e2c412 Add redirects for Make it Fly and Imagine If tutorials 
Resolves #3390
 2019-10-17 10:49:27 -04:00
Benjamin Wheeler
3e6e87c3a4
Merge pull request #3417 from benjiwheeler/join-flow-cache-remote 
Join flow cache remote
 2019-10-17 08:23:47 -04: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
Benjamin Wheeler
6b6b415069
Merge pull request #3434 from benjiwheeler/join-flow-responsive-more 
Join flow responsive changes for input, button and select widths
 2019-10-16 16:19:50 -04:00
Ben Wheeler
226134bc81 renamed ErrorBoundary prop name to componentName 2019-10-11 17:17:50 -04:00
Benjamin Wheeler
757ac80677
Merge pull request #3427 from benjiwheeler/join-flow-autocomplete-3 
turn off automplete and autocorrect for join-flow inputs
 2019-10-11 16:28:25 -04:00
Benjamin Wheeler
14c6211614
Merge pull request #3435 from benjiwheeler/join-flow-image-bg-color 
Join flow image preview using background color
 2019-10-11 16:27:48 -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
cd73afee1b use ‘scratch-www’ rather than ‘www’ in report to sentry 2019-10-09 23:05:23 -04:00
Ben Wheeler
fbbf467878 set ‘www’ as tag, rather than environment 2019-10-09 22:48:11 -04:00
Ben Wheeler
54f30fc944 set errorboundary name tag everywhere ErrorBoundary is used 2019-10-09 22:30:59 -04:00
Ben Wheeler
0f8eb638cc add support in ErrorBoundary for setting errorboundary tag 2019-10-09 22:30:35 -04:00
Ben Wheeler
46ef423c5d set sentry environment in www 2019-10-09 22:29:12 -04:00
Ben Wheeler
e45397d250 custom birth month and year width for small window sizes 2019-10-07 16:51:00 -04:00
Ben Wheeler
abc85fe3be change calculation for join flow modal inner content width, to be more friedly at small sizes 2019-10-07 16:51:00 -04:00
Ben Wheeler
5b60366985 change how we handle the width of gender custom input 2019-10-07 16:51:00 -04:00
Benjamin Wheeler
3a06ad81b1
Merge pull request #3425 from benjiwheeler/join-flow-truncate-custom-gender 
truncate custom gender, and other inputs
 2019-10-07 12:47:58 -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
Benjamin Wheeler
0985124f8b
Merge pull request #3431 from benjiwheeler/join-flow-adjust-email-centering 
adjust join flow email centering
 2019-10-07 12:43:45 -04:00
Ben Wheeler
868fb0f044 fix join flow header image height, so color background will be completely covered 2019-10-03 19:26:41 -04:00
Ben Wheeler
e27a7cdbbc pass join flow image background classes through to relevant steps 2019-10-03 19:25:56 -04:00
Ben Wheeler
6da150d02e add background styles for join flow images 2019-10-03 19:24:43 -04:00
Ben Wheeler
6430c58478 add colors to use in join flow image loading background 2019-10-03 19:23:35 -04:00
Ben Wheeler
8a35ec4a21 correct comment to identify yellow as Events, not Control 2019-10-03 19:23:13 -04:00
Ben Wheeler
2a57da32a5 rewrite join view scss without changing styles 2019-10-03 12:39:58 -04:00
Ben Wheeler
2b23a41a45 several fixes to join modal responsiveness 2019-10-03 12:35:36 -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
Ben Wheeler
17c1a257aa adjust email centering 2019-10-02 18:29:28 -04: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
644aa272b3 turn off automplete and autocorrect for join-flow inputs 2019-10-01 18:38:47 -04:00
Benjamin Wheeler
28fd111199
Revert "turn off automplete and autocorrect for join-flow inputs" 2019-10-01 18:34:19 -04:00
Ben Wheeler
f9b436182b Revert "removing Page" 
This reverts commit 06124331cc.
 2019-10-01 18:21:14 -04:00
Ben Wheeler
5db507201a truncate username, passwords, and email to their max stored lengths 2019-10-01 18:15:38 -04:00
Ben Wheeler
825c613db8 truncate custom gender to 25 chars long 2019-10-01 18:04:47 -04:00
Ben Wheeler
62fc3457e7 turn off automplete and autocorrect for join-flow inputs 2019-10-01 16:43:33 -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
Benjamin Wheeler
a47e1c9898
Merge pull request #3418 from benjiwheeler/join-flow-move-modal-down 
move join flow modal down in small window widths
 2019-09-30 17:02:46 -04:00
Benjamin Wheeler
d4d4adc9f9
Merge pull request #3362 from benjiwheeler/join-flow-spinner-simple 
format and update timing of join flow spinner
 2019-09-30 16:49:52 -04:00
Benjamin Wheeler
fdeb87fce9
Merge pull request #3383 from benjiwheeler/join-flow-navigate-to-join-page 
scratch3 join flow redirects to /join, outside editor
 2019-09-30 16:44:24 -04:00
Benjamin Wheeler
aabdd128f4
Merge pull request #3416 from benjiwheeler/join-flow-show-password-default 
change password default; remove unused state var
 2019-09-30 16:43:50 -04:00
Ben Wheeler
0656ab6a9e added simple memoizing cache for email step 2019-09-30 13:29:17 -04:00
Ben Wheeler
3bc6e7ff6f revised comments 2019-09-30 13:29:17 -04:00
Ben Wheeler
0d4d6a9adc cache remote username check response 2019-09-30 13:29:17 -04:00
Benjamin Wheeler
3c5313d8ce
Merge pull request #3415 from benjiwheeler/join-flow-validation-semi-bold 
make validations semi-bold
 2019-09-30 13:21:29 -04:00
Ben Wheeler
484cf46b8c move join flow modal down in small window widths 2019-09-30 11:49:04 -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
4a2553e819 create sentry library for initing Sentry 2019-09-30 10:48:10 -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
Ben Wheeler
ae661a48c7 corrected embed route name 2019-09-28 10:17:59 -04:00
Ben Wheeler
3bee3fae4b change password default; remove unused state var 2019-09-26 14:51:33 -04:00
Ben Wheeler
51c816c5cf make validations semi-bold 2019-09-26 14:49:42 -04:00
Ben Wheeler
2efb3a7bfa join flow bold text and related design tweaks 2019-09-26 14:46:42 -04:00
Paul Kaplan
db8cc6f80f Make app store links open in a new tab 2019-09-26 10:43:36 -04:00
Paul Kaplan
a3359a487e Update routes files 2019-09-26 10:39:36 -04:00
Ben Wheeler
6ff1a1c4f1 add navigation test 2019-09-26 09:29:02 -04:00
Paul Kaplan
a9a175b3cb
Merge pull request #3384 from benjiwheeler/join-flow-gender-strings 
gender step uses blank default, lcase values
 2019-09-25 16:04:58 -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
ccffa35037 change gender string defaults 2019-09-25 09:57:40 -04:00
Ben Wheeler
6fc5705779 revise country placeholder 2019-09-24 20:16:48 -04:00
Ben Wheeler
7e86319a36 wired showCloseButton through new join flow 2019-09-24 18:43:29 -04:00
Ben Wheeler
691faabe28 pass createProjectOnComplete prop through join flow 
…so welcome step can display correct completion text
 2019-09-24 18:41:24 -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
Benjamin Wheeler
c609d99e0e
Merge pull request #3386 from benjiwheeler/join-flow-disable-click-outside 
new join flow modal stays open on click outside
 2019-09-24 12:10:56 -04:00
Benjamin Wheeler
0e13c2dd48
Merge pull request #3392 from benjiwheeler/join-flow-validation-positioning 
Join Flow validation positioning/spacing fixes
 2019-09-24 12:10:25 -04:00
Benjamin Wheeler
779520aa2a
Merge pull request #3395 from benjiwheeler/join-flow-responsive-validation 
make validations be the same width as inputs…
 2019-09-24 12:09:43 -04:00
Benjamin Wheeler
117f0cee91
Merge pull request #3394 from benjiwheeler/join-flow-drag 
set modal close icon to draggable false
 2019-09-24 09:29:23 -04:00
picklesrus
5f3d6506c0
Merge pull request #3367 from picklesrus/captcha-error-handling 
Handle errors of captcha loading by setting error state on JoinFlow.
 2019-09-23 23:57:13 -04:00
Ben Wheeler
e901deb398 make validations be the same width as inputs… 
…when window is narrow
 2019-09-23 16:26:34 -04:00
Ben Wheeler
d4c791adfb set modal close icon to draggable false 2019-09-23 15:16:20 -04:00
Ben Wheeler
865e0a09dd give join-flow validations more spacing from inputs they refer to; unset width of Required message 2019-09-23 13:23:38 -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
Ben Wheeler
693c8e11e3 new join flow modal stays open on click outside 2019-09-23 10:36:58 -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
rschamp
cc61683fa3 Contain zalgo text 2019-09-23 10:11:05 -04:00
Benjamin Wheeler
ecdfaeeeec
Merge pull request #3361 from benjiwheeler/join-flow-dropdown-validation 
when select dropdown is focused, clear any validation errors
 2019-09-23 09:56:19 -04:00
Benjamin Wheeler
c683eb9af9
Merge pull request #3381 from benjiwheeler/join-flow-handle-text-overflow 
Join flow handle text overflow more flexibly
 2019-09-23 09:55:55 -04:00
apple502j
f00f11ed4c
Update Code Club Link 2019-09-21 08:25:00 +09:00
Ben Wheeler
d905f624ca gender step uses blank default, lcase values 2019-09-20 18:22:15 -04:00
Ben Wheeler
106ccb34c6 make gender step height more flexible 2019-09-20 17:54:45 -04:00
Ben Wheeler
58baa25d9f scratch3 join flow redirects to /join, outside editor 2019-09-20 17:50:33 -04:00
Ben Wheeler
6bcde6129b shorter description line height 2019-09-20 17:17:53 -04:00
Ben Wheeler
0e7ed0e0fd show info button in a way that does not increase line height 2019-09-20 17:17:38 -04:00
Paul Kaplan
bbbe0f8836
Fix linter issues with prop ordering 2019-09-20 13:48:08 -04:00
Paul Kaplan
aa6e85d863
Include canonical link in project meta tags 
This will tell crawlers that this page and all its exact duplicates (/fullscreen, /editor, /embed, etc...) should be considered the same and use the project page as the canonical crawled page. We had an issue before where by not selected a canonical, google was considering all the project pages duplicates :(
 2019-09-20 08:59:26 -04:00
Ben Wheeler
775173661f embed view with minimal functionality, route 2019-09-19 18:06:52 -04:00
picklesrus
cdd90da423 Rename error function. 2019-09-19 13:40:09 -04:00
Ray Schamp
d8ce9555c5
Merge pull request #3365 from LLK/hotfix/footer 
Remove tagline from site footer
 2019-09-18 10:41:30 -04:00
picklesrus
6a45907ded Handle errors of captcha loading by setting error state on JoinFlow. 2019-09-18 10:26:37 -04:00
Benjamin Wheeler
2e7a687547
Merge pull request #3359 from benjiwheeler/join-flow-placeholder-fixes 
Join flow placeholder fixes
 2019-09-17 21:43:06 -04:00
Ben Wheeler
d2bfa13d0a set size of join flow next step spinner 2019-09-16 22:49:28 -04:00
Ben Wheeler
5d1c46d24f slower spinner animation, with bezier timing 2019-09-16 22:41:28 -04:00
Ben Wheeler
628e00f401 when select dropdown is focused, clear any validation errors 2019-09-16 22:34:32 -04:00
Ben Wheeler
8f45c12b89 fix welcome vertical spacing, make it flexible 2019-09-16 21:49:06 -04:00
Ben Wheeler
87e8b18ab1 comment placeholder option 2019-09-16 21:45:45 -04:00
Ben Wheeler
e9605dcca1 disable birthdate placeholders 2019-09-16 21:45:26 -04:00
Ben Wheeler
c034c6c701 make sure correct input css is used for formik input 2019-09-16 21:45:11 -04:00
Benjamin Wheeler
303481b61d
Merge pull request #3352 from benjiwheeler/join-flow-privacy-under 
Join flow revise descriptions and privacy messages
 2019-09-16 21:06:10 -04:00
Ben Wheeler
e95cd8e3d5 moved validation info box shadow, font weight into info-button-message class 2019-09-16 17:00:32 -04:00
rschamp
c6d39b7509 Remove tagline from site footer 2019-09-16 12:07:43 -04:00
Ben Wheeler
c26d37442d revised email info string 2019-09-16 11:46:44 -04:00
Ben Wheeler
2421d630e5 update email privacy info string 2019-09-15 21:41:27 -04:00
Ben Wheeler
148d1914dd remove unused class 2019-09-15 21:41:05 -04:00
Ben Wheeler
c08c9f8802 country step adjust spacing 2019-09-15 21:38:09 -04:00
Ben Wheeler
4341d364d4 adjust email step vertical spacing, redo its footer 2019-09-15 17:22:25 -04:00
Ben Wheeler
b82787fc6d move info button down, and give its message a shadow 2019-09-15 17:12:57 -04:00
Ben Wheeler
31d8189e54 format each join flow title’s padding differently 2019-09-15 17:11:43 -04:00
Ben Wheeler
ad3940555e remove descriptions from several join flow steps 2019-09-15 17:09:57 -04:00
Ben Wheeler
8bc83fa136 move privacy message to below inputs; format color 2019-09-15 17:08:40 -04:00
Benjamin Wheeler
df2fc74031
Merge pull request #3335 from benjiwheeler/join-flow-reorder 
reorder join flow to put country second
 2019-09-12 16:25:53 -04:00
Ray Schamp
18b2ffe934
Merge pull request #3343 from LLK/hotfix/scratch-desktop-3.6.0 
Release Scratch Desktop 3.6.0
 2019-09-12 13:58:30 -04:00
Christopher Willis-Ford
ab35d1ee64 release Scratch Desktop 3.6.0 2019-09-12 09:46:06 -07:00
Ben Wheeler
cc578109fa put back missing refreshSession() call 2019-09-12 10:45:48 -04:00
picklesrus
b15dcaa2bc Add captcha token to ther request. It was left out of #3291. 2019-09-11 12:36:56 -04:00
Ben Wheeler
70baf75f5e reorder join flow to put country second 2019-09-11 10:39:46 -04:00
Ben Wheeler
7587c68582 include example of failing response 2019-09-10 16:37:10 -04:00
Ben Wheeler
ce3921bec5 update join flow lint exceptions 2019-09-10 16:37:10 -04:00
Ben Wheeler
9ea6cc8d42 use mergeProps to make tests work 2019-09-10 16:37:10 -04:00
Ben Wheeler
1d976c7cdf refactor handleRegistrationResponse 2019-09-10 16:34:23 -04:00
Ben Wheeler
643b4a611b comment preventDefault() 2019-09-10 16:34:23 -04:00
Ben Wheeler
f693728c1c use consistent quotes in object keys 2019-09-10 16:34:23 -04:00
Ben Wheeler
ce5558f8e2 refactor advance step and register functions 2019-09-10 16:34:23 -04:00
Ben Wheeler
3809d83c36 rename RegistrationError to RegistrationErrorStep 2019-09-10 16:34:23 -04:00
Ben Wheeler
f7a70475e2 added explanatory join flow comments 2019-09-10 16:34:23 -04:00
Ben Wheeler
e44d52b735 added placeholder for g-recaptcha-response 2019-09-10 16:34:23 -04:00
Ben Wheeler
5269cf7330 join flow register user function, registration error component 
* add yesno checkbox
* allow checkbox to be hidden
* add registration error, waiting prop to join flow steps
* use redux to dispatch session refresh
* call register function in join flow
* make join flow modal stay showing even when session is refreshed
 2019-09-10 16:34:23 -04:00
Benjamin Wheeler
8f11de675d
Merge pull request #3289 from benjiwheeler/join-flow-validate-email-remotely 
Join flow validate email remotely
 2019-09-10 10:05:27 -04:00
Benjamin Wheeler
8431403322
Merge pull request #3297 from LLK/revert-3296-revert-3295-join-flow-create-project 
on complete join flow, take user to new project
 2019-09-09 10:32:48 -04:00
Ben Wheeler
46351c116d collapse switch cases 2019-09-05 11:53:47 -04:00
Ben Wheeler
55cb112ee9 use params prop instead of inline query params 2019-09-05 11:53:47 -04:00
Ben Wheeler
fa91a57b35 show email validation error until you make a change 2019-09-05 11:53:46 -04:00
Ben Wheeler
d6e5637dbe in email step, use remote validation 2019-09-05 11:53:46 -04:00
Ben Wheeler
020231bb02 add local, remote email validation to validate library 2019-09-05 11:53:46 -04:00
Benjamin Wheeler
f50717d4f9
Merge pull request #3306 from benjiwheeler/join-flow-restyle-next-button 
restyle next button to remove border, add hover color
 2019-09-05 11:28:10 -04:00
Ben Wheeler
c92c0af396 more subtle Next hover state 2019-09-04 12:06:59 -04:00
picklesrus
6e5a2292a6 Requiring the Page component (even though we don't use it) allows www to build without running out of memory. 2019-09-04 10:51:13 -04:00
picklesrus
84be22f335 add in unused Page for testing webpack memory. 2019-09-03 16:57:43 -04:00
picklesrus
49ed43e397 Join flow standalone with no extra stuff. 2019-09-03 16:38:38 -04:00
picklesrus
73c353ba2c
Merge pull request #3276 from picklesrus/captcha-join 
Initial work for captcha in new join flow.
 2019-08-29 16:10:50 -04:00
Ben Wheeler
e3cd4e0628 changed string id to correct one 2019-08-29 11:44:08 -04:00
picklesrus
3c716af744 Fix merge conflicts. 2019-08-29 11:33:50 -04:00
picklesrus
c4d6e3dcef space fixes 2019-08-29 11:26:49 -04:00
picklesrus
f5a44c3458 Only load the captcha js if it hasn't been loaded yet. 2019-08-29 11:26:49 -04:00
picklesrus
350f6e6bab Make it so Create Account button is not clickable until captcha js loads. 2019-08-29 11:26:11 -04:00
picklesrus
b8b76f69ba Make sure the "create account" button is clickable until captcha is actually solved. 2019-08-29 11:24:59 -04:00
picklesrus
f83fa4390c - Undo bad merge changing name of validateEmail function 
- Move loading of capcha js to final step
- add in onload and onerror callbacks for catpcha js loading
 2019-08-29 11:24:59 -04:00
picklesrus
d2cb0818c8 Maybe setup captcha site keys properly? 2019-08-29 11:22:55 -04:00
picklesrus
9d4d2f3c67 Put the captcha badge in the bottom right. 2019-08-29 11:22:55 -04:00
picklesrus
3daba3b907 Initial work for captcha in new join flow. 
TODOS:
- handle error states
- Setup keys for different environments.
- Make sure remote validators are run before captcha.
 2019-08-29 11:22:55 -04:00
Paul Kaplan
ba519e7a0f
Update microbit.jsx 2019-08-29 11:21:10 -04:00
Paul Kaplan
b15229f19f
Update microbit.jsx 2019-08-29 11:01:53 -04:00
Paul Kaplan
1f704a4d4d
Use new tab for PDF download button 2019-08-29 10:58:05 -04:00
Benjamin Wheeler
5ab2bf100b
Merge pull request #3303 from benjiwheeler/join-flow-misc-fixes 
Join flow misc fixes
 2019-08-28 10:28:15 -04:00
Ben Wheeler
2a78723ce4 restyle next button to remove border, add hover color 2019-08-28 10:23:15 -04:00
Benjamin Wheeler
0937b40857
Merge pull request #3302 from benjiwheeler/join-flow-password-font-size 
make password font size large, if password hidden
 2019-08-28 10:10:59 -04:00
Ben Wheeler
b5d71af4c3 restore default orange background color for validation tooltips 2019-08-27 23:01:08 -04:00
Ben Wheeler
9f5dc9928f make password font size large, if password hidden 2019-08-27 16:07:31 -04:00
Ben Wheeler
2c56c8b4cc shift info button down, in alignment with text 2019-08-27 16:06:14 -04:00
Ben Wheeler
81323f755f set validation info box shadow, font weight 2019-08-27 15:25:10 -04:00
Ben Wheeler
606421615a make long strings wrap, so they don’t bleed outside bounds 2019-08-27 15:21:31 -04:00
Ben Wheeler
65b6475ed6 smarter handling of handleCompleteRegistration 2019-08-27 12:15:49 -04:00
Benjamin Wheeler
f8b901844b
Merge pull request #3277 from benjiwheeler/join-flow-gender-validation-positioning 
Join flow birthdate validation positioning
 2019-08-27 11:45:18 -04:00
Ben Wheeler
12631a6c64 also accept error false 2019-08-27 11:44:17 -04:00
Ben Wheeler
425675e760 accept bool as toolTip type 2019-08-27 11:44:02 -04:00
Ben Wheeler
0ebc168f21 comment prop for eslint 
# Conflicts:
#	src/components/registration/scratch3-registration.jsx
 2019-08-26 17:29:33 -04:00
Ben Wheeler
19a15988b2 in email step, auto-focus on first input 2019-08-26 16:02:07 -04:00
Ben Wheeler
ea9d62129a in username step, auto-focus on first input 2019-08-26 16:01:59 -04:00
Ben Wheeler
daeed19dc5 use onSetRef instead of setRef in formik-input 2019-08-26 16:01:42 -04:00
Ben Wheeler
b0bc59f9bd use more user-friendly error message if api call fails 2019-08-26 15:48:16 -04:00
Benjamin Wheeler
110ce59cc7
Revert "Revert "on complete join flow, take user to new project"" 2019-08-26 15:41:32 -04:00
Benjamin Wheeler
607a314189
Revert "on complete join flow, take user to new project" 2019-08-26 15:40:41 -04:00
Ben Wheeler
4270fa4b53 on complete join flow, take user to new project 2019-08-26 15:35:40 -04:00
Benjamin Wheeler
e4d9e72e2c
Merge pull request #3273 from benjiwheeler/join-flow-in-editor 
Able to use scratch3 join flow in editor
 2019-08-26 14:32:07 -04:00
Ben Wheeler
925f2de024 be safer with arrow-border-width 2019-08-26 14:30:52 -04:00
Ben Wheeler
37c2112a3e remove redundant use of redux registrationOpen 2019-08-26 14:19:08 -04:00
Ben Wheeler
8139901973 added website for kenya conference 2019-08-26 14:14:53 -04:00
Ben Wheeler
b5c21cfb92 Update Kenya conference 2019-08-26 11:13:11 -04:00
Ben Wheeler
add30d9d26 don’t close registration window when login status updates 2019-08-25 10:18:08 -04:00
Andrew Sliwinski
0562b43587
Update credits page 2019-08-24 23:45:15 +01:00
Ben Wheeler
4146a7a308 Move flag that controls which join flow we use to redux 2019-08-23 17:30:38 -04:00
Ben Wheeler
98bb0cbb11 make join flow modal stay showing even when session is refreshed 2019-08-23 17:19:12 -04:00
Ben Wheeler
3ac1ef34ae Able to use scratch3 join flow in editor 2019-08-23 17:18:14 -04:00
Benjamin Wheeler
0c9e66c777
Merge pull request #3278 from benjiwheeler/join-flow-center-gender-rows 
make gender radio rows center themselves horizontally within the modal
 2019-08-22 10:46:59 -04:00
Benjamin Wheeler
9aee049250
Merge pull request #3279 from benjiwheeler/join-flow-improve-padding 
improve top and bottom positioning for multiple steps
 2019-08-22 10:46:28 -04:00
Benjamin Wheeler
baa3aded83
Merge pull request #3280 from benjiwheeler/join-flow-select-fail 
formik-select handles fail state with orange border
 2019-08-21 16:57:40 +02:00
picklesrus
433f7ebd2f
Merge pull request #3281 from benjiwheeler/join-flow-email-initial 
add missing initial values, remove unnecessary one
 2019-08-21 10:25:27 -04:00
Ben Wheeler
7b076d74c1 add missing initial values, remove unnecessary one 2019-08-21 14:25:21 +02:00
Ben Wheeler
a600d7fe18 formik-select handles fail state with orange border 2019-08-21 14:07:04 +02:00
Benjamin Wheeler
0a77f62c02
Merge pull request #3263 from benjiwheeler/microbit-add-cards 
Microbit add cards
 2019-08-21 11:30:23 +02:00
Ben Wheeler
01941b16de improve top and bottom positioning for multiple steps 2019-08-21 10:52:43 +02:00
Ben Wheeler
ab4369dc28 make caret svgs taller 2019-08-21 10:20:09 +02:00
Ben Wheeler
6285784cd2 improve logic, appearance of birthdate step select elements 2019-08-21 04:00:22 +02:00
Ben Wheeler
af13ec037c info button message should appear on top of validations 2019-08-21 04:00:13 +02:00
Ben Wheeler
16e1a46997 validation messages can position on the left 2019-08-21 04:00:01 +02:00
Ben Wheeler
8bd1119b65 make gender radio rows center themselves horizontally within the modal 2019-08-21 03:58:49 +02:00
Benjamin Wheeler
ae8f5a1e90
Merge pull request #3274 from benjiwheeler/join-flow-misc 
Join flow misc UI improvements
 2019-08-21 01:40:16 +02:00
Ben Wheeler
1512cdb4df restored radio button label htmlFor 2019-08-21 00:31:49 +02:00
Ben Wheeler
2aa5ea0f02 gender step gets custom input ref, focuses on click 2019-08-21 00:31:49 +02:00
Ben Wheeler
5ec8811427 formik-radio-button can pass custom input ref up 2019-08-21 00:31:49 +02:00
Ben Wheeler
b438eed70d formik-input can set ref to its inner input 2019-08-21 00:31:49 +02:00
Ben Wheeler
e55d2f27d8 simplified formik radio handling, attach label to input 2019-08-21 00:30:27 +02:00
Benjamin Wheeler
a5b9cdc410
Merge pull request #3251 from benjiwheeler/join-flow-highlighting-positive 
Join flow: show positive blue tooltips when you focus an input that is empty
 2019-08-21 00:15:57 +02:00
Ben Wheeler
5c5f571438 hackily fix birthdate description wrapping 2019-08-20 20:34:59 +02:00
Benjamin Wheeler
8f64c8b3f8
Merge pull request #3272 from benjiwheeler/join-flow-various-images 
Join flow various images
 2019-08-20 19:27:23 +02:00
Ben Wheeler
c9b22141af add light hiligthing on hover for gender 2019-08-20 02:48:32 +02:00
Ben Wheeler
512c267449 use Country instead of select country 2019-08-20 02:37:17 +02:00
Ben Wheeler
4f0a87e25b removed duplicate confirm password string 2019-08-20 01:20:57 +02:00
Ben Wheeler
b1534e2156 moved microbit cards url to static l10n file 2019-08-20 01:16:49 +02:00
Ben Wheeler
9e14f2a559 add microbit cards url 2019-08-20 01:16:49 +02:00
Ben Wheeler
5d2b457436 Add microbit cards section, make responsive 2019-08-20 01:16:49 +02:00
Ben Wheeler
9eab36af9a consolidate mentions of “Download PDF” 2019-08-20 01:16:48 +02:00
Ben Wheeler
4740234f29 added custom checkmark svg 2019-08-20 01:01:23 +02:00
Ben Wheeler
ff2cab476d fixed proptypes bug, changed validationmessage to use mode 2019-08-19 23:04:23 +02:00
Ben Wheeler
0998171a67 display username tooltip messages 2019-08-19 23:04:23 +02:00
Ben Wheeler
095493a313 add advice tooltip strings for username step 2019-08-19 23:03:07 +02:00
Ben Wheeler
f8c8dc1663 add support for positive validation messages 2019-08-19 23:03:07 +02:00
Benjamin Wheeler
3f150be19b
Merge pull request #3266 from benjiwheeler/join-flow-info-responsive 
use media queries to make info message responsive
 2019-08-19 18:01:30 +02:00
Ben Wheeler
092d587620 add info button svg 2019-08-19 17:35:36 +02:00
Benjamin Wheeler
2854d9defd
Merge pull request #3267 from benjiwheeler/join-flow-placeholders 
added placeholders to username step
 2019-08-19 16:52:00 +02:00
Benjamin Wheeler
ff3c91f9e0
Merge pull request #3186 from benjiwheeler/join-flow-add-images 
Join flow add images
 2019-08-19 16:23:07 +02:00
Ben Wheeler
aadf087b50 add join flow header images 2019-08-19 16:17:32 +02:00
Ben Wheeler
18605ea047 create your account 2019-08-19 16:10:24 +02:00
Ben Wheeler
a609709f41 ability to pass formik checkbox label classname 2019-08-19 16:10:24 +02:00
Ben Wheeler
5b5ac6a66f added email subscribe checkbox 2019-08-19 16:10:23 +02:00
Ben Wheeler
8f5f89abfd improve email step in several ways 2019-08-19 16:08:55 +02:00
Ben Wheeler
7b53b60cec adjust gender css 2019-08-19 02:13:35 +02:00
Ben Wheeler
a299135260 removed obsolete css 2019-08-19 02:13:23 +02:00
Ben Wheeler
3200d168ea use flex and min-height to force join flow modal heights to be consistent 2019-08-19 01:24:51 +02:00
Ben Wheeler
b7f5d9359c gender step passes a descriptionClassName 2019-08-19 01:24:09 +02:00
Ben Wheeler
69d509fdef join flow step takes a descriptionClassName 2019-08-19 01:23:15 +02:00
Ben Wheeler
d02184daf3 added placeholders to username step 2019-08-18 18:07:33 +02:00
Ben Wheeler
f267af28b3 use media queries to make info message responsive 2019-08-18 04:44:28 +02:00
Ben Wheeler
f2c4a4ade3 trying heights 2019-08-17 00:52:52 -04:00
Benjamin Wheeler
96a7d01cdc
Merge pull request #3261 from benjiwheeler/join-flow-add-nonbinary 
add nonbinary option to gender step of join flow
 2019-08-16 17:48:55 -04:00
Benjamin Wheeler
caa824f2a5
Merge branch 'release/2019-08-15' into develop 2019-08-14 18:28:50 -04:00
Ben Wheeler
8a70529692 removed extra, unused value prop 2019-08-13 17:59:11 -04:00
Ben Wheeler
12c41251c1 Add formik checkbox component, Show password checkbox 2019-08-13 17:59:11 -04:00
Benjamin Wheeler
4e0aaafa01
Merge pull request #3239 from benjiwheeler/join-flow-confirm-text 
Add ToS footer to email step, make next button Create Account
 2019-08-13 17:55:04 -04:00
Benjamin Wheeler
46de5a23e1
Merge pull request #3236 from benjiwheeler/join-flow-highlighting 
handle username validation errors states better
 2019-08-13 17:52:00 -04:00
Benjamin Wheeler
0321929412
Merge pull request #3185 from benjiwheeler/join-flow-more-strings 
Revised and added several join flow strings
 2019-08-13 17:50:59 -04:00
Benjamin Wheeler
2e506de6be
Merge pull request #3241 from benjiwheeler/join-flow-info-button 
Join flow info button
 2019-08-13 17:49:29 -04:00
picklesrus
2165c3f004
Revert "Standalone join flow page." 2019-08-13 17:42:26 -04:00
picklesrus
55e8f2c323 Add in the error boundary. 2019-08-13 16:25:17 -04:00
picklesrus
aa1c4116e0 Standalone join flow page. 2019-08-13 16:25:17 -04:00
Ben Wheeler
fa6913c346 use info button in birthdate step, gender step 2019-08-13 15:29:44 -04:00
Ben Wheeler
3f7681821e info button in join flow: add support for, formatting of 2019-08-13 15:29:44 -04:00
Ben Wheeler
775a5edeaa WIP draft of info button tooltip for join flow 2019-08-13 15:29:44 -04:00
Ben Wheeler
e75b73d6fe revised validation strings 2019-08-13 15:02:25 -04:00
Ben Wheeler
7ead9d0e96 use updated strings in join flow 2019-08-13 15:02:25 -04:00
Ben Wheeler
ca6711e860 switch validation error message to just ‘Required’ 2019-08-13 15:02:25 -04:00
Ben Wheeler
4fa85e5c3b add several missing strings for join flow errors 2019-08-13 15:02:25 -04:00
Ben Wheeler
aa69de39f3 keep showing validation errors on focus, until first keystroke; prioritize vulgarity 2019-08-13 14:22:46 -04:00
Ben Wheeler
11e2b0bf78 removed ie 10 and 11 css case 2019-08-13 14:22:46 -04:00
Ben Wheeler
f7fac2e41c handle username validation errors states better 2019-08-13 14:22:46 -04:00
Ben Wheeler
85bbd88ae4 fixed nonbinary id 2019-08-13 14:16:10 -04:00
Ben Wheeler
d88661113a make terms of use link underlined 2019-08-13 12:21:50 -04:00
Ben Wheeler
30e68db79e make terms of use a link in email footer 2019-08-13 12:21:03 -04:00
Ben Wheeler
7b70612e02 center email terms of use footer 2019-08-13 12:20:44 -04:00
Ben Wheeler
8469e77622 change Terms of Service to Terms of Use 2019-08-13 12:20:44 -04:00
Ben Wheeler
6b1b4d7f36 Add ToS footer to email step, make next button Create Account 2019-08-13 12:20:44 -04:00
Paul Kaplan
d4f5ac7d09
Merge pull request #3244 from LLK/hotfix/no-confirm-admin 
Allow admins to delete comments without confirmation
 2019-08-13 12:02:45 -04:00
Ben Wheeler
181601dbf5 translate email address placeholder 2019-08-12 17:56:44 -04:00
Ben Wheeler
2154fba86c renamed localResult var 2019-08-12 17:56:44 -04:00
Ben Wheeler
3a299cf810 use email-validator library, not isemail 2019-08-12 17:56:44 -04:00
Ben Wheeler
ae706ddb91 added missing comma 2019-08-12 17:56:44 -04:00
Ben Wheeler
e64dc60ae6 formatted email step, added input 2019-08-12 17:56:43 -04:00
Paul Kaplan
3467e96f1d Allow admins to delete comments without confirmation 2019-08-12 15:08:42 -04:00
Paul Kaplan
56a1c5cb29
Merge pull request #3232 from LLK/paulkaplan-patch-2 
Fix click not working on highlighted comment avatar
 2019-08-12 08:46:12 -04:00
Ben Wheeler
74c76dedcb add nonbinary option to gender step of join flow 2019-08-09 17:05:21 -04:00
Paul Kaplan
c2c165d6f2
Fix click not working on highlighted comment avatar 
The absolutely positioned :before highlight was eating clicks from the relatively positioned elements after it, like the avatar image. Disable pointer events to prevent this background element from receiving clicks.

This is due to a subtle issue with element ordering, even elements that are before other elements get automatically promoted above siblings that are relatively positioned. That is why the reply/delete buttons still work on highlighted comments (they are also absolutely positioned) but the avatar user link did not work.
 2019-08-08 16:01:41 -04:00
Ben Wheeler
9639347611 make country listing more efficient; make select wider 2019-08-08 14:52:08 -04:00
Chris Garrity
24f06f275b Use localeData from l10n 
Remove old tech debt.

www had always imported every react-intl defined locale, and then added our custom locales.

scratch-l10n defines localeData based on the currently supported languages, and it includes any necessary custom-locales, so we should use that instead of maintaining two custom locale lists.
 2019-08-08 16:32:40 +01:00
Ben Wheeler
bca11b1191 pass disabled prop to formik-select 2019-08-08 09:56:12 -04:00
Ben Wheeler
7a4925ddba add join flow country step 2019-08-08 00:29:04 -04:00
Ray Schamp
6275b516fc
Merge pull request #3199 from benjiwheeler/join-flow-country-data 
Consolidate country lists, fix country field in teacher account registration
 2019-08-07 15:00:50 -04:00
Ben Wheeler
167a70f437 simplify adding common countries to top of list 2019-08-06 20:42:03 -04:00
Paul Kaplan
9ff3efac00
Merge pull request #3212 from LLK/hotfix/report-project-thumbnails 
[Develop] Hotfix/report project thumbnails
 2019-08-06 15:28:32 -04:00
Ben Wheeler
564baf2ebc handle error when teacher country selection fails to resolve to country name 2019-08-06 15:00:18 -04:00
Ben Wheeler
51aa38fb34 consolidated country-data and contry-list 2019-08-06 00:00:37 -04:00
Paul Kaplan
706ba78879 Fix project thumbnails for reporting 2019-08-05 16:25:41 -04:00
Ben Wheeler
aca45d4032 replaced id with name in formik-radio-button 2019-08-03 00:08:18 -04:00
Ben Wheeler
c4d7ba0350 changed naming of user-provided radio input from other to custom 2019-08-03 00:08:18 -04:00
Ben Wheeler
8725cee6a1 replaced gender l10n strings with existing ones 2019-08-03 00:08:18 -04:00
Ben Wheeler
a2b96e9bac fixed linting errors 2019-08-03 00:08:18 -04:00
Ben Wheeler
0be2f463c3 removed unnecessary validation code 2019-08-03 00:08:18 -04:00
Ben Wheeler
29ea00ab3c correct proptype 2019-08-03 00:08:18 -04:00
Ben Wheeler
150201f8d0 add padding to top of gender step 2019-08-03 00:08:18 -04:00
Ben Wheeler
b7b65ec3ee remove formik input inline prop 2019-08-03 00:08:18 -04:00
Ben Wheeler
09ff758eee add gender step strings 2019-08-03 00:08:18 -04:00
Ben Wheeler
40c90e2d2e formik input can be made to appear inline 2019-08-03 00:08:18 -04:00
Ben Wheeler
bd83a282c5 gender step handles other option 2019-08-03 00:08:18 -04:00
Ben Wheeler
cf42b8b3a1 formik input accepts classname from radio option other 2019-08-03 00:08:17 -04:00
Ben Wheeler
26ab2b1366 validate gender step by defaulting to prefer not to say 2019-08-03 00:08:17 -04:00
Ben Wheeler
e22a848350 add GenderOption component to handle most gender radio options 2019-08-03 00:08:17 -04:00
Ben Wheeler
5de681fd68 remove header image and set height of overall gender step 2019-08-03 00:08:17 -04:00
Ben Wheeler
d70df3c91a add gender step to join flow sequence 2019-08-03 00:07:11 -04:00
Ben Wheeler
9e2a3eb3e3 add gender step draft, formik radio button draft 2019-08-03 00:07:11 -04:00
Benjamin Wheeler
56ce60fe86
Merge pull request #3207 from benjiwheeler/join-flow-welcome-text 
add instructions text to join flow welcome step
 2019-08-03 00:06:00 -04:00
Benjamin Wheeler
ab727a6d06
Merge pull request #3208 from benjiwheeler/join-flow-next-button 
format next button, use correct strings
 2019-08-03 00:05:30 -04:00
Ben Wheeler
16dd9e0b76 format next button, use correct strings 2019-08-01 22:27:47 -04:00
Ben Wheeler
bef6063373 add instructions text to join flow welcome step 2019-08-01 16:27:54 -04:00
Christopher Willis-Ford
f90358e2c7 update download link for Scratch Desktop -> 3.5.0 2019-08-01 12:02:15 -07:00
Ben Wheeler
50e706efa8 country data, functions and tests 2019-07-31 17:21:32 -04:00
Ray Schamp
1da17e4035
Merge pull request #3192 from LLK/hotfix/registration-recaptcha 
[Develop] Adjust height when displaying reCAPTCHA challenge
 2019-07-31 09:03:25 -04:00
Ben Wheeler
db3c73c267 removed errant birth_month and birth_year variables 2019-07-30 14:21:19 -04:00
Ben Wheeler
a435626ae1 added stubs for email step, welcome step 2019-07-29 22:29:04 -04:00
Benjamin Wheeler
099cde71b8
Merge pull request #3131 from benjiwheeler/fix-comment-key 
provide key to comments
 2019-07-29 19:36:37 -04:00
Ben Wheeler
651807438a better validation positioning on birthdate step 2019-07-29 16:32:20 -04:00
Benjamin Wheeler
4d5232bec5
Merge pull request #3179 from benjiwheeler/join-flow-missing-strings 
added missing strings to join flow
 2019-07-29 16:25:34 -04:00
Ray Schamp
fe15a89486 Adjust height when displaying reCAPTCHA challenge 2019-07-29 12:03:59 -04:00
Benjamin Wheeler
986707ccf8
Merge pull request #3180 from benjiwheeler/join-flow-design-tweaks 
Join flow design tweaks
 2019-07-29 10:09:09 -04:00
Ben Wheeler
1cd0713bb9 added missing strings to join flow 2019-07-26 22:10:21 -04:00
Ben Wheeler
e5b80bb8c3 better line spacing for join flow descriptions 2019-07-26 13:39:33 -04:00
Benjamin Wheeler
0ac7cc7ab0
Merge pull request #3136 from benjiwheeler/fix-add-to-studio-height 
fix add-to-studio modal height, gradient interference
 2019-07-23 12:14:27 -04:00
Ben Wheeler
1e9b9a537d correct select padding 2019-07-23 12:09:10 -04:00
Ben Wheeler
9b3c555078 provide key to comments 2019-07-22 21:54:45 -04:00
Ben Wheeler
10cb8512b6 set react version for eslint, to prevent lifecycle method errors 2019-07-22 21:24:37 -04:00
Ben Wheeler
77780bd94c whitespace fixes for linting 2019-07-22 21:24:37 -04:00
Ben Wheeler
1757f28a5e add missing props declarations 2019-07-22 21:24:37 -04:00
Ben Wheeler
87c1bc5858 add noopener noreferrer to fix lint errors 2019-07-22 21:24:37 -04:00
Ben Wheeler
740f1fb466 split join-flow-steps into separate files; simplify birth year options 2019-07-18 21:18:34 -04:00
Ben Wheeler
e33d7dd0ee Simplify birth month option generation 2019-07-18 21:18:34 -04:00
Ben Wheeler
55e7ada760 validate birthdate 2019-07-18 21:18:34 -04:00
Ben Wheeler
9539afd0e2 add birthdate header image 2019-07-18 21:18:33 -04:00
Ben Wheeler
d6c34f83ae add birthdate month and year header labels, initial vals 2019-07-18 21:18:33 -04:00
Ben Wheeler
71baf3e802 birthdate month and year layout 2019-07-18 21:18:33 -04:00
Ben Wheeler
39fd6b07ea added draft of birth date step; localize birth month string 2019-07-18 21:18:33 -04:00
Ben Wheeler
c8800d8663 After rebasing on develop, reintroduce changes 2019-07-17 12:58:50 -04:00
Ben Wheeler
faa37ae270 rename row-relative to row-with-tooltip 2019-07-17 12:52:42 -04:00
Ben Wheeler
911ecc8516 Format validation; redo of PR 3116 2019-07-17 12:52:42 -04:00
Benjamin Wheeler
62f30c7a8b
Merge pull request #3138 from benjiwheeler/join-flow-improve-css 
Improve formatting of join flow title, description, next step button
 2019-07-17 00:02:05 -04:00
Ben Wheeler
681e7d9a74 move next step font size to next-step-button.scss 2019-07-17 00:00:31 -04:00
Ben Wheeler
a85ad87028 Improve formatting of join flow title, description, next step button 2019-07-15 17:29:09 -04:00
Ben Wheeler
27cb6199b5 use padding rather than margin to avoid margin collapse; drop overflow clear approach 2019-07-15 16:07:39 -04:00
Ben Wheeler
2773495878 Format join flow using ModalTitle, ModalInnerContent, NextStepButton components 2019-07-15 09:58:41 -04:00
Benjamin Wheeler
92430584dc
Merge pull request #3121 from benjiwheeler/formik-select 
introduce formik select component
 2019-07-15 09:52:17 -04:00
Ben Wheeler
862bc8000f fix add-to-studio modal height, gradient interference 2019-07-15 06:27:13 -04:00
Ben Wheeler
9084fb8bfd use existing select css 2019-07-12 14:43:22 -04:00
Ben Wheeler
658cb1d61e specify PropTypes format of formik-select options 2019-07-12 13:32:21 -04:00
Ray Schamp
21edd33fc7
Merge pull request #3134 from LLK/hotfix/upgrade-dependencies 
Upgrade file-loader, url-loader and async packages, add package-lock.json
 2019-07-12 13:31:52 -04:00
Ben Wheeler
3d0da891a9 introduce formik select component 2019-07-12 12:47:02 -04:00
Ray Schamp
03e6a49b44 Update for async v2 
async.auto / async.waterfall now take the callback as the last argument in functions with dependencies.

Async is modularized so eachLimit can be required specifically
 2019-07-12 11:44:52 -04:00
Benjamin Wheeler
07419526cd
Merge pull request #3119 from benjiwheeler/join-flow-advance-step 
handle join flow state for tracking, advancing current step
 2019-07-12 11:42:57 -04:00
Ben Wheeler
a1ed49084f add ModalInnerContent component, use it in modals 2019-07-11 16:10:33 -04:00
Benjamin Wheeler
86261ec1ef
Revert "add ModalInnerContent component, use it in modals" 2019-07-11 11:06:02 -04:00
Benjamin Wheeler
5214eeda6e
Revert "Format and position validation error messages in join flow" 2019-07-11 10:54:17 -04:00
Ben Wheeler
dd7a57d866 handle join flow state for tracking, advancing current step 2019-07-10 21:49:04 -04:00
Ben Wheeler
d4c59522bd comment explaining row relative style for validations 2019-07-10 13:57:52 -04:00
Ben Wheeler
c85214815b position/format validations in join flow 2019-07-10 13:56:04 -04:00
Ben Wheeler
ed5ff981c1 Support for formatting and positioning validation error messages 2019-07-10 13:48:31 -04:00
Ben Wheeler
171d5854ff prevent modal-inner-content margins from unexpectedly collapsing with parent 2019-07-09 23:50:11 -04:00
Ben Wheeler
3a685e38fb add ModalInnerContent component, use it in modals 2019-07-09 22:20:59 -04:00
Ben Wheeler
57d9ab6511 Add classname prop to modal title 2019-07-09 19:42:16 -04:00
Ben Wheeler
f02d41f8b5 created ModalTitle component 2019-07-08 17:42:05 -04:00
Benjamin Wheeler
30a17719c6
Merge pull request #3086 from benjiwheeler/simplify-join-flow-step 
use html form instead of formik form
 2019-07-08 11:49:05 -04:00
Benjamin Wheeler
526417f94e
Merge pull request #3082 from benjiwheeler/join-flow-username-working 
working username step of join flow
 2019-07-08 11:48:00 -04:00
Ben Wheeler
a0618b5b4c removed unused css classname, added TODO re: 'hide username' text 2019-07-08 11:47:14 -04:00
Ben Wheeler
b044e973ac simplified export of join flow step 2019-07-02 17:53:10 -04:00
Ben Wheeler
67ad5fc383 added tests for password validations 2019-07-02 17:49:29 -04:00
Ben Wheeler
585340d289 removed commented out code from join flow steps 2019-07-02 17:37:56 -04:00
Ben Wheeler
f6d1ba3194 WIP moving join flow validation functions to library 2019-07-02 17:27:44 -04:00
Eric Rosenbaum
f3fcb32188 Add troubleshooting item for boost firmware update 2019-07-02 16:53:41 -04:00
Ben Wheeler
2602a06fdc fix see all comments and load more replies, by passing author username 2019-06-27 11:29:29 -04:00
Ben Wheeler
7ecbe905f5 cleared up props passed in and out of username step 2019-06-26 14:44:20 -04:00
Ben Wheeler
15ddd0e86c working username step of join flow 2019-06-26 14:44:20 -04:00
Ben Wheeler
469e9a2626 use html form instead of formik form 2019-06-26 13:50:01 -04:00
Chris Willis-Ford
1061c92e62
Merge pull request #3083 from cwillisf/scratch-desktop-3.4.0 
update download links for Scratch Desktop 3.4.0
 2019-06-26 10:39:38 -07:00
Benjamin Wheeler
a445c0ccc1
Merge pull request #3081 from benjiwheeler/fix-formik-validation-message 
fix passing text to validation message
 2019-06-26 11:36:25 -04:00
Christopher Willis-Ford
904879d9e4 update download links for Scratch Desktop 3.4.0 2019-06-25 23:06:30 -07:00
Ben Wheeler
42721a3d6f fix passing text to validation message 2019-06-25 18:14:09 -04:00
Ben Wheeler
2fbaf4af8e moved join-flow-steps to join flow dir 2019-06-25 17:41:12 -04:00
Benjamin Wheeler
b12694fc12
Merge pull request #3077 from benjiwheeler/join-flow-step 
introduce join-flow-step, next-step-button
 2019-06-25 17:15:03 -04:00
Benjamin Wheeler
249d2b2525
Merge pull request #3076 from benjiwheeler/join-flow-formik-input 
added initial formik input component, form validation message component
 2019-06-25 17:13:51 -04:00
Ben Wheeler
c6fc3621d4 added initial formik input component, form validation message component 2019-06-25 17:06:57 -04:00
Ben Wheeler
3ecefebeb4 introduce join-flow-step, next-step-button 2019-06-25 17:03:35 -04:00
Benjamin Wheeler
1eb9d1bf8f
Merge pull request #3075 from benjiwheeler/join-steps-stub 
added formik dependency, join flow steps using it
 2019-06-25 11:01:38 -04:00
Ben Wheeler
a5bb0bddc3 Rename ExampleStep as UsernameStep, clean up props 2019-06-25 09:40:35 -04:00
Benjamin Wheeler
e25f0b82fe
Merge pull request #3069 from benjiwheeler/pass-ownerusername-to-comment-endpoints 
pass owner username and token to comment endpoints
 2019-06-24 15:21:46 -04:00
Ben Wheeler
69164a5f53 added formik dependency, join flow steps using it 2019-06-24 13:35:01 -04:00
Benjamin Wheeler
c09fd1d5bc
Merge pull request #3074 from benjiwheeler/add-join-flow-component 
stub for join-flow component within modal
 2019-06-24 13:23:31 -04:00
Ben Wheeler
0b69eef56d removed unnecessary redux connect 2019-06-24 11:36:18 -04:00
Ben Wheeler
0468c19665 stub for join-flow component within modal 2019-06-24 11:31:16 -04:00
Ben Wheeler
037f1c66d7 Moved validation message css from card to own file 2019-06-24 11:23:32 -04:00
Ben Wheeler
43d1f23b44 pass owner username to comment endpoints 2019-06-20 15:06:24 -04:00
Ben Wheeler
3375d6d3d5 introduced stub components for new scratch3 join modal 2019-06-18 16:50:27 -04:00
Benjamin Wheeler
4fe1bd907e
Merge pull request #2925 from benjiwheeler/retry-studios-for-project-endpoint 
change studios for project API request to use admin status, owner status and token
 2019-06-03 14:24:34 -04:00
Benjamin Wheeler
c16cb25df9
Merge pull request #3014 from benjiwheeler/fix-safari-remix-credit 
set min-height of remix credit to max-content
 2019-05-29 14:43:11 -04:00
Ben Wheeler
975a9c9645 omit token if null or falsy 2019-05-28 15:11:21 -04:00
Ben Wheeler
5a24e9d7d6 change studios for project API request to use admin status, owner status and token 2019-05-28 15:11:21 -04:00
Ben Wheeler
4f7791032c set min-height of remix credit to max-content 2019-05-25 10:08:39 -04:00
Ben Wheeler
6d8441dd03 fix firefox instructions height overflow issue 2019-05-25 09:37:54 -04:00
Ben Wheeler
036af16d58 updated scratch-desktop link 2019-05-23 18:44:19 -04:00
Ben Wheeler
ba3c564801 added missing slash to start of images link, to fix intermittent CDN issue 2019-05-23 06:37:50 -04:00
Benjamin Wheeler
bde167c0a9
Merge pull request #2994 from benjiwheeler/project-notes-last 
fix last instructions notes and credits alignment
 2019-05-22 14:29:48 -04:00
Benjamin Wheeler
d20efcb74b
Merge pull request #2966 from benjiwheeler/search-escape-fix 
make search urls use consistent encoding
 2019-05-22 12:35:47 -04:00
Ben Wheeler
c40422606f fix last instructions notes and credits alignment 2019-05-22 12:30:05 -04:00
Benjamin Wheeler
1af1eec9c0
Merge pull request #2973 from benjiwheeler/align-remix-credit 
fix alignment of remix credit avatar, text
 2019-05-22 10:21:18 -04:00
Ben Wheeler
69eca8ed49 defined player-header and redefined player-height to make project notes correct height 2019-05-21 23:37:10 -04:00
Ben Wheeler
1cb4bb5f7e adjust instructions column padding-top 2019-05-21 00:22:37 -04:00
Paul Kaplan
109549fd8f
Merge pull request #2957 from LLK/release/05-08-2019 
[DEVELOP] Release 05/08/2019
 2019-05-16 08:54:35 -04:00
Ben Wheeler
9afe46622b added comments about form height 2019-05-15 18:08:25 -04:00
Ben Wheeler
974203d325 fix alignment of remix credit avatar, text 2019-05-15 18:00:31 -04:00
Benjamin Wheeler
d12551945d
Merge pull request #2971 from benjiwheeler/story-link-correct 
change /story redirect from tutorial=story to tutorial=tell-a-story
 2019-05-15 10:56:27 -04:00
Benjamin Wheeler
4ec21913dc
Merge pull request #2965 from benjiwheeler/admin-markedbyfilter 
for admins, handle markedbyfilter comments differently, color them ye…
 2019-05-14 20:10:54 -04:00
Ben Wheeler
d8026a487e change /story redirect from tutorial=story to tutorial=tell-a-story 2019-05-14 13:57:36 -04:00
Benjamin Wheeler
563501778f
Merge pull request #2952 from benjiwheeler/nairobi-revise 
revised conference page to postpone kenya, change sur title, eu desc
 2019-05-13 16:28:54 -04:00
Ben Wheeler
ec6f4c1715 for admins, handle markedbyfilter comments differently, color them yellow 2019-05-13 13:09:27 -04:00
Ben Wheeler
f6cb3d5078 make search urls consistent 
in search urls:
* use %20 for spaces everywhere
* encode search term strings
* hide ‘q’ key if it has no value
 2019-05-10 22:58:33 -04:00
Ben Wheeler
7562b16d8a only show copy link button if project is shared 2019-05-09 13:46:56 -04:00
Benjamin Wheeler
d97f5b9d7a
Merge pull request #2924 from benjiwheeler/embed-modal 
Embed/social sharing modal
 2019-05-08 14:53:19 -04:00
Ben Wheeler
4ef73525c4 Revised modal title to Copy Link, use orig icon 2019-05-08 14:36:00 -04:00
Ben Wheeler
2b2132742d revised conference page to postpone kenya, change sur title, eu desc 2019-05-08 10:45:39 -04:00
Ben Wheeler
73944a34e4 removed unused css for embed modal 2019-05-07 10:54:21 -04:00
Ben Wheeler
4ae4d4232a removed social images and links 2019-05-07 10:54:01 -04:00
Ben Wheeler
6a3110e24e moved and renamed linkUrl to keep url generation in one place 2019-05-06 18:49:57 -04:00
Ben Wheeler
d5e2ed69ad refined colors 2019-05-06 16:22:41 -04:00
Ben Wheeler
08f8e1c546 simplified embed modal to remove social links 2019-05-02 17:18:13 -04:00
Eric Rosenbaum
49ec1ed281
Merge pull request #2932 from ericrosenbaum/feature/boost-landing-page 
LEGO BOOST extension landing page
 2019-05-01 10:32:45 -04:00
Eric Rosenbaum
56077811f5 Add extension chip 2019-04-30 16:03:32 -04:00
Eric Rosenbaum
513bbb43cd Fix headline icon size and position 2019-04-30 15:56:20 -04:00
Eric Rosenbaum
dd5a65fe73 Add starter projects 2019-04-30 15:25:53 -04:00
Eric Rosenbaum
f4f00f5ced Add route for /boost 2019-04-30 15:25:35 -04:00
Ben Wheeler
fdfa61649f removed copy link button on project page 2019-04-26 16:11:53 -04:00
Ben Wheeler
9622933ac7 fixed tests 2019-04-26 15:50:25 -04:00
Ben Wheeler
433aabc1c2 cleaned up comments 2019-04-26 14:03:55 -04:00
Ben Wheeler
2289584bbf got copied result text working, closing in on final design 2019-04-24 15:09:39 -04:00
Ben Wheeler
67e7a54413 renamed externalShare to social 2019-04-24 12:09:44 -04:00
Ben Wheeler
63baada567 added social icons and links 2019-04-23 17:11:27 -04:00
Eric Rosenbaum
882c576a60 Orange background on header 2019-04-23 15:12:58 -04:00
Eric Rosenbaum
a5a725322f Add Boost landing page 2019-04-23 15:01:11 -04:00
Ben Wheeler
5d12f0f781 put social links section, copy project link button inside social share modal 2019-04-22 22:36:26 -04:00
Ben Wheeler
1e63b51565 first take on embed modal 2019-04-22 14:50:49 -04:00
Eric Rosenbaum
4733976484 Fix Vernier Go Direct branding 2019-04-18 11:53:00 -04:00
Ben Wheeler
9587de480c first attempt at external share modal 2019-04-18 11:29:00 -04:00
Eric Rosenbaum
a33f904b17
Merge pull request #2817 from ericrosenbaum/feature/vernier-landing-page 
Add Vernier Force and Accel extension landing page
 2019-04-10 14:15:27 -04:00
Eric Rosenbaum
b8b558c64d Remove extra blank line 2019-04-10 13:34:29 -04:00
Eric Rosenbaum
05a4c7be06 Rename route to “vernier” 2019-04-10 12:42:53 -04:00
Eric Rosenbaum
209435d95e Update starter project ids 2019-04-09 15:18:33 -04:00
Eric Rosenbaum
c68fb1498d Add starter project IDs 2019-04-09 14:58:43 -04:00
Eric Rosenbaum
98dbc88708 Update starter project 2019-04-09 14:31:32 -04:00
Eric Rosenbaum
4f033c47e4 Add starter projects 2019-04-08 18:13:18 -04:00
Eric Rosenbaum
3a0452048d Add extension chip 2019-04-08 14:45:39 -04:00
Ben Wheeler
c3002be4a6 Revert "Merge pull request #2858 from benjiwheeler/studios-for-project-endpoint" 
This reverts commit a3902acfd1, reversing
changes made to 9e7a14cb76.
 2019-04-04 15:04:46 -04:00
Ben Wheeler
8d38d7d4e5 Revert "Merge pull request #2859 from benjiwheeler/comments-for-project-endpoint" 
This reverts commit 07417846a9, reversing
changes made to 32484656ba.
 2019-04-04 15:04:36 -04:00
Ben Wheeler
9b485cd16c Revert "Merge pull request #2871 from benjiwheeler/pass-ownerusername-to-comment-replies-endpoint" 
This reverts commit afe6d6f4a4, reversing
changes made to c00b4fb189.
 2019-04-04 15:04:27 -04:00
Ben Wheeler
f1dfeab399 pass ownerUsername in three places it was left out 2019-04-02 17:25:00 -04:00
Benjamin Wheeler
07417846a9
Merge pull request #2859 from benjiwheeler/comments-for-project-endpoint 
add ownerUsername to comment API endpoint URIs
 2019-03-29 13:23:47 -04:00
Benjamin Wheeler
32484656ba
Merge pull request #2805 from apple502j/patch-12 
Add SiP Link
 2019-03-26 16:16:41 -04:00
Ben Wheeler
fced35e49c add padding to sip feature banner 2019-03-26 15:54:55 -04:00
Ben Wheeler
aba4647c2c make sip link open in new tab 2019-03-26 14:01:08 -04:00
Ben Wheeler
2c1fd34d20 took sip section out of educators masthead, put between masthead and main content 2019-03-26 12:33:20 -04:00
Ben Wheeler
4f1f712083 using white plus transparent blue, instead of introducing new blue 2019-03-26 09:26:05 -04:00
Ben Wheeler
fc466fa7cc shortened harvard text, improved responsive styles for SiP 2019-03-25 23:32:31 -04:00
Ben Wheeler
dd51cf4ea6 pass token to comments endpoints every time, not only if user is admin 2019-03-25 14:21:06 -04:00
Ben Wheeler
163741f34e add ownerUsername to comment API endpoint URIs; handle error responses from those endpoints 2019-03-25 13:40:12 -04:00
Ben Wheeler
49df9a6386 split admin and non-admin project studios endpoints 2019-03-23 10:03:51 -04:00
Ben Wheeler
986c608136 make token optional in call to getProjectStudios endpoint 2019-03-22 15:43:00 -04:00
Ben Wheeler
4a20a09f52 change studios for project endpoint to include owner, token 2019-03-21 21:11:14 -04:00
Ben Wheeler
836af62e13 revised educators strings and removed commented out code 2019-03-21 11:35:30 -04:00
Ben Wheeler
dd3b777763 moved educators SiP from 3-icon section to standalone sub-banner 2019-03-21 09:23:59 -04:00
Ben Wheeler
5977796822 trying out a 3-icon resources for educators section 2019-03-18 18:05:20 -04:00
Ben Wheeler
815aa31f91 refactored the Resources for Educators section to have icons 2019-03-12 09:57:31 -04:00
Ben Wheeler
ee2cb00cc8 switched order of scratch in practice, other text in resources for educators 2019-03-05 15:40:11 -05:00
chrisgarrity
3aa37d5a82
Merge pull request #2748 from kyleplo/patch-4 
Migrate Starter Projects
 2019-03-05 12:40:58 +01:00
kyleplo
1aa87a74c8 Create starter-projects.jsx 
* add messages for localization
* define projects to include in starter-projects.json
* add new route and redirect
 2019-03-05 12:23:41 +01:00
seotts
32bbb1ae96 removed extra line breaks 2019-03-04 09:14:32 -05:00
Sarah Otts
2e5d93d933
Merge branch 'develop' into issue-2806 2019-03-04 09:10:44 -05:00
Andrew Sliwinski
c69a6b1ed9
Merge pull request #2773 from jakel181/patch-1 
Update moderator requirements.
 2019-02-28 17:39:22 -05:00
Ben Wheeler
e6f1a701f1 use long version of mailing list url 2019-02-28 10:57:44 -05:00
Ben Wheeler
2a4e076339 corrected mail list form; links use _blank; redirect conference url; logo links to main site 2019-02-28 10:44:30 -05:00
Benjamin Wheeler
600205b7b7
Merge pull request #2795 from benjiwheeler/regional-conferences 
Add 2019 Regional conferences page
 2019-02-28 06:59:10 -05:00
Eric Rosenbaum
fb09d904f9 URL is /vernier 2019-02-27 21:13:46 -05:00
Ben Wheeler
7cbf6764e2 updated route alias for conferences 2019-02-27 17:00:58 -05:00
Ben Wheeler
42844a8927 made more conferences 2019 related strings translatable 2019-02-27 16:58:13 -05:00
Ben Wheeler
b2b3dfa037 updated 2019 conference text per further changes 2019-02-26 16:54:22 -05:00
seotts
2020759204 updated mod job description 2019-02-26 14:04:56 -05:00
jakel181
4de5cb27b6
Update moderator.jsx 2019-02-26 07:56:54 -05:00
apple502j
5e34e41a21
Add SiP texts 2019-02-26 18:24:57 +09:00
apple502j
cf4cf875b2
Add SiP Link 2019-02-26 18:23:33 +09:00
Ben Wheeler
6668e6d840 updated text and icons per feedback from scratch foundation 2019-02-25 17:22:30 -05:00
Ben Wheeler
42f2486e1c improved 2019 conference responsiveness, improved calendar icon 2019-02-25 13:49:08 -05:00
Ben Wheeler
3e02b59866 improve responsive layouts of 2019 conferences page 2019-02-25 11:47:10 -05:00
Ben Wheeler
f33b96d6bf new title image for conference page, new calendar icon 2019-02-20 18:13:07 -05:00
Ben Wheeler
5b20f743f2 added envelope, calendar icons 2019-02-20 17:55:32 -05:00
Ben Wheeler
c29518bd6b adjusted 2019 conferences title size 2019-02-20 17:16:30 -05:00
Ben Wheeler
7ef7a40b8e compressed svgs 2019-02-20 17:14:30 -05:00
Ben Wheeler
1483f6d86c revised conference layout and css per feedback 2019-02-20 16:41:52 -05:00
Ben Wheeler
3179f7e59d use solid icons, not outlines ones, on 2019 conference page 2019-02-19 16:26:30 -05:00
Paul Kaplan
4e8ea5c3bd Get thumbnails from the project for reporting 2019-02-15 14:27:36 -05:00
Ben Wheeler
9509e698cb initial conference 2019 changes 2019-02-15 12:11:14 -05:00
Benjamin Wheeler
a985585d80
Merge pull request #2764 from apple502j/patch-11 
Don't refer to a section which does not exist
 2019-02-15 07:59:51 -05:00
Ben Wheeler
752a90965c in FAQ, added reference to Scratch Extensions to blocks change answer 2019-02-14 14:17:57 -05:00
jakel181
99a4408df3
Update privacypolicy.jsx 2019-02-14 11:23:41 -05:00
jakel181
ec87c9ee8f
Update privacypolicy.jsx 2019-02-14 11:12:50 -05:00
jakel181
e15f0c8baa
Update privacypolicy.jsx 2019-02-14 11:08:19 -05:00
jakel181
370d249975
Update moderator.jsx 2019-02-13 16:40:10 -05:00
jakel181
4ae339a5e6
Update moderator.jsx 2019-02-13 16:24:20 -05:00
jakel181
3fdfe6d588
Update moderator.jsx 2019-02-13 16:10:50 -05:00
Benjamin Wheeler
6ed66a7321
Merge pull request #2767 from benjiwheeler/autocensored-message 
show autocensored message if API indicates project was autocensored
 2019-02-12 10:31:41 -05:00
Paul Kaplan
9f2ca84283
Merge pull request #2765 from paulkaplan/form-submit-logout 
Use a dummy form submission instead of logging out via xhr.
 2019-02-11 15:33:36 -05:00
Ben Wheeler
902367ef05 show autocensored message if API indicates project was autocensored 2019-02-11 13:00:35 -05:00
Paul Kaplan
c6961aae36 Do not try to manage fullscreen mode URI for unsaved projects 
This fixes the issue where you could go from /projects/editor => /projects/0/fullscreen by entering fullscreen mode on a new unsaved project.
 2019-02-11 10:28:44 -05:00
Paul Kaplan
49afbd2c70 Use a dummy form submission instead of logging out via xhr. 
This fixes an issue where you could get logged out but then remain on your page by dismissing the window.onbeforeunload prompt when you have unsaved changes. That would put you in a state where you looked logged in but could not save.
 2019-02-11 10:08:38 -05:00