scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
5109 commits 217 branches 1 tag 473 MiB
Commit graph

3199 commits

Author SHA1 Message Date
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
apple502j
653beccf4b
Don't refer to a section which does not exist 2019-02-09 15:25:12 +09:00
Eric Rosenbaum
d988534144 Update images 2019-02-07 14:25:43 -05:00
Eric Rosenbaum
777f0cca47 Initial draft of landing page 2019-02-06 11:54:30 -05:00
Benjamin Wheeler
16ca2d7319
Merge pull request #2739 from chrisgarrity/issue/2309-wide-translations 
Wrap ‘need help?’ link when translation is too long
 2019-02-05 09:43:15 -05:00
chrisgarrity
56d2a90bf2 Wrap ‘need help’ link when translation is too long 
Refactored the submit row of the login component to use Flex Row instead of `float: right` for the `need help` link.  The bulk of the changes are white space, so remember to ignore whitespace for review.
 2019-02-05 13:00:41 +01:00
Ben Wheeler
7aa1ba6c42 use slider toggle for turning comments on and off 2019-02-01 17:03:43 -05:00
Ben Wheeler
6ffaa1afa8 include informationpage.jsx after render.jsx, so CSS overrides in correct order 2019-01-31 11:23:07 -05:00
chrisgarrity
a7d0cb857b Change video id to one without autoplay 2019-01-31 16:59:41 +01:00
Benjamin Wheeler
bb96d5ebb3
Merge pull request #2732 from benjiwheeler/keep-commenting-enabled-mobile 
reenable commenting on mobile, which was disabled in #2512
 2019-01-30 13:43:15 -05:00
chrisgarrity
42bc19c2e3
Merge pull request #2622 from apple502j/about-video 
About video
 2019-01-30 18:19:32 +01:00
Benjamin Wheeler
5b9229c6c0
Merge pull request #2731 from chrisgarrity/issue/modal-zindex 
Make www modal z-index consitent with gui
 2019-01-30 12:17:01 -05:00
Ben Wheeler
bf8dd81ce9 comment form buttons should stay in row in mobile 2019-01-30 11:52:53 -05:00
Ben Wheeler
1a39d82fbf reenable commenting on mobile, which was disabled in #2512 2019-01-30 09:56:04 -05:00
chrisgarrity
42d5254f1e more resizing for new video 2019-01-30 12:58:15 +01:00
apple502j
10da7662e6
Remove height and width 2019-01-30 19:54:17 +09:00
chrisgarrity
3c661660c8 Make www modal z-index consitent with gui 
The gui uses z-indices up to 500 for things that should be covered by a modal and sets the modal to 510. www should match gui.
 2019-01-30 11:50:07 +01:00
chrisgarrity
29b08dfd16
Merge pull request #2728 from chrisgarrity/issue/2271-tutorials-shortcut 
Add route for `/tutorials` shortcut
 2019-01-30 10:10:57 +01:00
Benjamin Wheeler
f5134483a3
Merge pull request #2676 from apple502j/patch-8 
Make internal URL clickable
 2019-01-29 23:28:25 -05:00
chrisgarrity
b293f34444
Merge pull request #2535 from Kenny2github/no-faq-htmlmsg 
Migrate FAQ page to FormattedMessage. Note that I pushed the `faq/l10n.json` to transifex and manually updated scratchr2_translations as this is a 'breaking' change for translations.
 2019-01-29 17:52:40 +01:00
chrisgarrity
fc5d2ed8c7 Add route for /tutorials shortcut 2019-01-29 17:21:06 +01:00
Benjamin Wheeler
bfa4e3331c
Merge pull request #2512 from benjiwheeler/mobile-read-only 
changed tablet width to 768; several responsive tweaks
 2019-01-29 10:47:24 -05:00
Ben Wheeler
a8d4184b3f renamed frameless.js tablet var to mobileIntermediate, use tabletPortrait for breaks 2019-01-29 10:35:19 -05:00
chrisgarrity
31e572e534
Merge pull request #2720 from chrisgarrity/sync-translations 
Add missing resource to .tx/config
 2019-01-29 15:23:58 +01:00
chrisgarrity
b105c517d6 Add missing resource to .tx/config 
The `download/scratch2` l10n file was missing from the config file, along with the new ideas page.

Also, the `name` field in the routes json needs to match the resource name. So changed the `download-scratch2` route name to match the l10n name.
 2019-01-29 11:33:45 +01:00
Ben Wheeler
2ef8edf5b1 added back commented out no jobs message, for later 2019-01-28 23:37:11 -05:00
Ben Wheeler
4b660b0176 constrain studio and remix thumbnails to a single column 2019-01-28 23:12:43 -05:00
Ben Wheeler
640d565207 made extension chip showing/hiding consistent 2019-01-28 23:12:36 -05:00
Ben Wheeler
be975cba26 using tabletPortrait instead of changing value of tablet var, per chrisg's suggestion 2019-01-28 22:36:39 -05:00
Ben Wheeler
7b19878d7f changed tablet width to 768; several responsive tweaks 2019-01-28 22:27:01 -05:00
Ken
f2bea32df8
Add Community Moderator listing 2019-01-29 08:59:31 +08:00
Paul Kaplan
8e57bb5493 Pass updates up from project updater to top-level redux store 2019-01-25 13:35:39 -05:00
Ray Schamp
29d5a80b5e
Update z-index so validation bubbles go below the nav bar 2019-01-25 11:20:32 -05:00
Ray
d8d46b102b Fix initial value for notes and credits aka description 
Resolves "mirror world" issue
 2019-01-25 10:11:22 -05:00
Paul Kaplan
d6c48a5730 Wrap project update inputs to show server validation 2019-01-24 16:53:21 -05:00
Eric Rosenbaum
71cb92c214
Merge pull request #2704 from ericrosenbaum/bugfix/update-extension-chips 
Update extension chips
 2019-01-23 17:30:38 -05:00
Eric Rosenbaum
825b885638 Update extension chip icons 2019-01-23 15:51:35 -05:00
Eric Rosenbaum
44ec3de0f1 Change extension chip wording to “Video Sensing” 2019-01-23 15:51:00 -05:00
Benjamin Wheeler
b72118e29d
Merge pull request #2702 from benjiwheeler/autocensored-message 
added default censored messages
 2019-01-23 15:24:58 -05:00
Benjamin Wheeler
5f3f7f0977
Merge pull request #2703 from LLK/revert-2693-revert-2682-studio-use-permissions 
Revert "Revert "Add to studio modal should only show studios user can actually change""
 2019-01-23 14:17:27 -05:00
Ben Wheeler
aeedf456c0 corrected messageHTML to message 2019-01-23 13:29:37 -05:00
Ben Wheeler
696bfa117e refactored censored message into component, removed autocensor message 2019-01-23 10:30:26 -05:00
Ben Wheeler
971b3dc2d1 added autocensor-specific banner message 2019-01-23 09:18:40 -05:00
Benjamin Wheeler
4d3e46e40b
Revert "Revert "Add to studio modal should only show studios user can actually change"" 2019-01-22 17:07:52 -05:00
Ben Wheeler
ddf6793362 reformat banner css to be less red, better line-height, max width on text 2019-01-22 16:35:59 -05:00
Ben Wheeler
d70bbe20c9 added default censored messages 2019-01-22 15:15:36 -05:00
Eric Rosenbaum
dea983c995 Update WeDo legacy link text 2019-01-22 11:32:42 -05:00
Eric Rosenbaum
5603e2dc2b Fix WeDo extension chip wording 2019-01-22 11:23:48 -05:00
Eric Rosenbaum
3231d4cbd7 Fix WeDo page title 2019-01-22 11:18:59 -05:00
Eric Rosenbaum
11c449226e Update LEGO wording 2019-01-22 11:02:10 -05:00
Eric Rosenbaum
ecad945ead
Merge pull request #2621 from apple502j/sound-credit 
Sound credits
 2019-01-22 10:54:27 -05:00
Eric Rosenbaum
41b74bab56 Remove paragraph break 2019-01-22 10:41:56 -05:00
Benjamin Wheeler
77733e2a87
Merge pull request #2691 from apple502j/little-bridge 
Don't link if destination is null
 2019-01-18 14:55:46 -05:00
Benjamin Wheeler
5ddb7660f6
Revert "Add to studio modal should only show studios user can actually change" 2019-01-17 11:22:00 -05:00
apple502j
608c08377a Don't link if destination is null 2019-01-17 21:23:15 +09:00
Ben Wheeler
e9b736270f make showStudio utility function purely functional 2019-01-16 16:42:02 -05:00
Ben Wheeler
ab82d37720 only show studios user can manipulate in add to studio modal 
Refactored studio list consolidation code for add to studio; set canAdd, 
canRemove flags directly on each studio.

pass flag userOwnsProject through to add to studio modal and its 
buttons.

pass flag isAdmin through to add to studio and its buttons.

set flags in add to studio buttons for whether user has permission to 
add project to studio, remove project from studio.

Set user ability/inability to click add to studio buttons using 
permissions flags and css
 2019-01-16 13:49:54 -05:00
Benjamin Wheeler
db6e0ed88f
Merge pull request #2624 from apple502j/patch-7 
Raise z-index of navbar
 2019-01-16 11:17:00 -05:00
Ben Wheeler
e88e669297 set the z-index of the player as a whole, to go under nav bar 
separately set z-index in fullscreen mode, to go over other project page 
UI including nav bar

correct isFullScreen prop
 2019-01-15 23:45:05 -05:00
apple502j
ea9282a3eb
Check hashtag after URL 2019-01-16 09:15:58 +09:00
Benjamin Wheeler
245a90530d
Merge pull request #2677 from apple502j/patch-9 
Change Credits URL
 2019-01-15 18:23:04 -05:00
chrisgarrity
ed1cf35721 de-dup helpers.cloudData 2019-01-15 10:10:36 -05:00
apple502j
d8a0a90e92
Change Credits URL - Footer 2019-01-15 14:49:45 +09:00
apple502j
b8ba34e5fb
Credits URL changed - For Developers 2019-01-15 14:48:36 +09:00
apple502j
7937611272
Make internal URL clickable 2019-01-15 14:34:17 +09:00
chrisgarrity
b2b00ee867 Support link to cloud variable log 
Add Cloud Variables to the ‘Extension’ Chips when there are cloud variables in the project. If the user is logged in, also link to the cloud variable log for the project.
 2019-01-14 15:32:00 -05:00