Commit graph

3822 commits

Author SHA1 Message Date
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
apple502j
653beccf4b
Don't refer to a section which does not exist 2019-02-09 15:25:12 +09:00
apple502j
7ecaa12222
Change min height 2019-02-09 15:17:23 +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
Christopher Willis-Ford
2018f8534a Update Scratch Desktop download links to v1.2.1 2019-01-10 15:19:51 -08:00
chrisgarrity
cebdd0a17d
Merge pull request #2656 from chrisgarrity/issue/2628-remix-loading-project
Don’t allow remixing if the project is not loaded
2019-01-10 14:41:52 -05:00
Paul Kaplan
6c8881106e
Merge pull request #2657 from paulkaplan/more-replies
Allow loading more than 20 replies
2019-01-10 14:29:27 -05:00
chrisgarrity
17be315d25
Merge pull request #2653 from apple502j/patch-8
Change Mobile Chrome supported ver to 63+
2019-01-10 14:03:05 -05:00
Paul Kaplan
16391f25ee Strip out duplicates from replies and comments.
Fixes https://github.com/LLK/scratch-www/issues/2575
2019-01-10 13:49:07 -05:00
Paul Kaplan
1277ca4876 Make "See more replies" only the width of the replies column 2019-01-10 10:58:34 -05:00
chrisgarrity
ccbaa60e59 Don’t allow remixing if the project is not loaded
Depends on https://github.com/LLK/scratch-gui/pull/4312

Adds new `isProjectLoaded` state to the project view, and disables the remix button until the project is loaded. Passes new callback to gui to be notified when the project is loaded.
2019-01-10 10:50:37 -05:00
Paul Kaplan
f7e8922757 Allow loading more than 20 replies 2019-01-10 10:46:01 -05:00
Paul Kaplan
7f99e8b8c2 Prevent uncaught errors from going to sentry
For real this time. Just needed to figure out the right plugins to filter. TryCatch plugin is the one that reports errors from setTimeouts, which the VM executes code in.

Remove the previous window.onerror kludge, it was not working and prevented errors from reaching the console.

Tested locally by providing the staging DSN for Sentry
2019-01-10 10:07:30 -05:00
apple502j
830b38c214 Fix the credits again 2019-01-10 20:37:24 +09:00
apple502j
95203a462e
Change Mobile Chrome supported ver to 63+ 2019-01-10 19:02:59 +09:00
Paul Kaplan
2ea49fc4d3
Disable window onerror 2019-01-09 16:56:31 -05:00
chrisgarrity
6cd2b38ad1
Merge pull request #2645 from chrisgarrity/revise-unsupported-browser
Revise unsupported browser
2019-01-09 14:48:49 -05:00
Benjamin Wheeler
f26e6f2190
Merge pull request #2620 from apple502j/titled-404
Set title for 404 pages
2019-01-09 14:44:09 -05:00
chrisgarrity
70c4240b8d Revise unsupported browser
Only reject IE, other gui errors should get handled by error boundary in gui.
2019-01-09 14:40:06 -05:00
apple502j
21aaeacb5c Split sentences 2019-01-09 18:05:42 +09:00
Paul Kaplan
3cd837d20d
Revert "Check for recommended browser version" 2019-01-08 16:09:26 -05:00
Paul Kaplan
ee30377f72
Merge pull request #2635 from paulkaplan/disable-global-handlers
Disable global error handling for sentry
2019-01-08 14:33:22 -05:00
Paul Kaplan
885977e554 Disable global handlers 2019-01-08 14:19:11 -05:00
chrisgarrity
84606bf753 Check for recommended browser version
Also removed Vivaldi from the rejected list to match gui
2019-01-08 09:17:02 -05:00
apple502j
76e01f5919
Monitors should be under navbar
Change the z-index to 99
2019-01-08 20:36:50 +09:00
apple502j
1695bf23b8 New about page video 2019-01-08 16:05:53 +09:00
apple502j
7030b16e28 New about page video CSS 2019-01-08 16:04:44 +09:00
apple502j
ad363a5e23 Sound section l10n 2019-01-08 15:11:40 +09:00
apple502j
26c88defd1 Sound section 2019-01-08 15:11:23 +09:00
apple502j
8e4124f093 Wear helmet on 404 to set title 2019-01-08 13:51:18 +09:00
Benjamin Wheeler
63cc104668
Merge branch 'develop' into hotfix/proxy-love-favorite 2019-01-07 14:20:28 -05:00
Paul Kaplan
3ecc7d9a7e
Merge pull request #2612 from chrisgarrity/hotfix/no-comment-unshared
Disallow comments on unshared projects
2019-01-07 13:10:09 -05:00
Ben Wheeler
8e1d6fee54 love and favorite proxy, and use x-requested-with header 2019-01-07 11:39:31 -05:00
chrisgarrity
29fb4b69d1 restore 5000 character limit for description fields
Also make sure that validation error message is visible when 5000 character limit is exceeded.
2019-01-07 11:09:44 -05:00
chrisgarrity
1d223825df Disallow comments on an unshared project 2019-01-07 10:42:53 -05:00
Benjamin Wheeler
ad0da48eeb
Merge pull request #2596 from benjiwheeler/hotfix/view-all-remixes
[Master] Show link to view all remixes on project page
2019-01-04 11:47:47 -05:00
Benjamin Wheeler
976524b64d
Merge pull request #2600 from benjiwheeler/hotfix/view-all-remixes
[Develop] Show link to view all remixes on project page
2019-01-04 10:50:42 -05:00
Ben Wheeler
7f2fbd4a3b added View all link at top of studios list 2019-01-04 10:30:43 -05:00
Ben Wheeler
b452f73a32 revised remix list header css to handle longer strings better 2019-01-04 10:22:48 -05:00
Ray Schamp
ecdac98322
Merge pull request #2599 from paulkaplan/fix-hashtag-search
[Develop] Fix hashtag search
2019-01-04 09:13:30 -05:00
apple502j
220b027c46
capitalize URL 2019-01-04 10:28:06 +09:00
Paul Kaplan
6f83dd09a8 Fix hashtag search to link to query without the # 2019-01-03 20:24:39 -05:00
Ben Wheeler
0ad5c977aa show link to view all remixes on project page 2019-01-03 18:50:19 -05:00
Benjamin Wheeler
35b55d7af0
Merge pull request #2574 from kyleplo/patch-3
Fix font in add to studio modal
2019-01-03 13:16:47 -05:00
Ben Wheeler
9625bc554d added comments explaining need to show project instructions, notes when both are empty 2019-01-03 13:12:08 -05:00
Ben Wheeler
627737fdd4 collapse empty project instructions or notes and credits 2019-01-03 12:45:07 -05:00
kyleplo
7cfad7b075
switch to more common options 2019-01-03 09:23:06 -05:00
kyleplo
c7f3ac00e9
Fix font in add to studio modal 2019-01-03 08:30:46 -05:00
Ray Schamp
3931f867a6
Merge pull request #2569 from paulkaplan/remove-project-count-request
Remove the project count request since it is no longer being used
2019-01-02 17:08:23 -05:00
Paul Kaplan
f7818049da Remove the project count request since it is no longer being used 2019-01-31 16:48:56 -05:00
Ray Schamp
999fe63db9
Merge pull request #2567 from paulkaplan/only-track-green-flag-once
Only track green flag once per session
2019-01-02 17:06:48 -05:00
Paul Kaplan
a2fbdf9943 Only track green flag once 2019-01-02 16:19:26 -05:00
Paul Kaplan
2d79cd0191 Fix the regexp that allows for query params on faq and download 2019-01-02 11:47:39 -05:00
picklesrus
dcdf068f75
Merge pull request #2559 from picklesrus/update-links
update download links
2019-01-02 07:19:23 -05:00
picklesrus
aae2609bbc update download links 2019-01-02 07:16:52 -05:00
Colby Gutierrez-Kraybill
176bfe3e12
Merge pull request #2551 from colbygk/hotfix/fix_downloads_3faq_routes
[RELEASE] fix downloads 3faq routes
2019-01-02 06:56:59 -05:00
Colby Gutierrez-Kraybill
e1780b2454
Merge pull request #2552 from colbygk/hotfix/fix_downloads_3faq_routes
[Develop] fix downloads 3faq routes
2019-01-02 06:56:09 -05:00
Andrew Sliwinski
4a4b8815e5 Remove "CappedNumber" from view count on project page. 2018-12-30 10:06:02 -05:00
Colby Gutierrez-Kraybill
25a1854fb1 These should be more greedy, as we sometimes have links from third parties that add query parameters. We don't do anything with the final group match, yet. 2018-12-28 23:43:09 -05:00
Kenny2github
44e66051b0 Fix a couple of quotes 2018-12-28 13:17:25 +08:00
Ray Schamp
7a7a6de4b0
Merge pull request #2543 from paulkaplan/fix-gui-min-size
Bring in the min sizes for GUI to allow scrollable UI
2018-12-27 16:10:59 -05:00
Paul Kaplan
da8d60706f Bring in the min sizes for GUI to allow scrollable UI 2018-12-27 11:12:34 -05:00
Paul Kaplan
bfd14a115a Fix the studio links to use the correct URL 2018-12-27 09:27:11 -05:00
Kenny2github
13f3706a9d Migrate to FormattedMessage 2018-12-24 12:57:23 +08:00
Paul Kaplan
c7a8a7b61d
Revert "[REVERT ME] Turn up GA sampling to 100% for testing on staging" 2018-12-21 13:24:21 -05:00
Paul Kaplan
0acf16c348 [REVERT ME] Turn up GA sampling to 100% for testing on staging 2018-12-21 10:09:19 -05:00
picklesrus
033a47f7d9
Merge pull request #2533 from picklesrus/add-illustrator
Add an illustrator
2018-12-20 16:31:51 -05:00
picklesrus
9c5836fba8 Add an illustrator 2018-12-20 16:00:24 -05:00
Paul Kaplan
0f4b20d5f6
Merge pull request #2530 from colbygk/integrate-sentry-webpack
Use sentry webpack instead of Raven
2018-12-20 15:36:46 -05:00
Paul Kaplan
dcb03a0526 Fix lint whitespace 2018-12-20 13:48:38 -05:00
Paul Kaplan
95658d06b8 Fix indentation for linting 2018-12-20 13:38:22 -05:00
chrisgarrity
54ae001e72
Merge pull request #2480 from chrisgarrity/issue/consistent-languages
Make list of languages on www consistent with gui
2018-12-20 13:28:19 -05:00
Colby Gutierrez-Kraybill
827a91ade0 Fix up incorrect title insert 2018-12-20 12:59:59 -05:00
Colby Gutierrez-Kraybill
6a946b99fc Update to new sentry API pattern
Use current Sentry browser package and forward errorId into eventId
Fix up errorInfo reference
Put Sentry on the window object for GUI to use
Remove unneeded reference to old style Raven and raven-js
Move Sentry webpack config into production only

Add GA tracker ID to window

Allows scratch-gui to use same GA id
2018-12-20 12:56:33 -05:00
Benjamin Wheeler
3c8cf1a6fc
Merge pull request #2526 from chrisgarrity/feature/2319-masthead
Implement new Intro masthead
2018-12-20 11:35:39 -05:00
picklesrus
60ef644bc7 Add people to acknoledgements. Move credits from /info/credits to /credits. Remove 3.0 from text about illustrations. 2018-12-20 11:02:38 -05:00
ChampikaF
d74681650e
Merge pull request #2523 from picklesrus/ChampikaF-UpdateFAQ
FAQ updates from Champikaf
2018-12-20 10:41:00 -05:00
Paul Kaplan
f44d39b549
Merge pull request #2525 from paulkaplan/fix-project-server-routes
Update storage to get 3.0 projects.
2018-12-20 10:36:27 -05:00
picklesrus
e864055605 Fix some duplicates 2018-12-20 10:30:12 -05:00
picklesrus
37cb2fb7fa redirect /3faq to /info/faq/#scratch3 2018-12-20 10:12:21 -05:00
Paul Kaplan
d49a48c2e7 Update storage to get 3.0 projects. 2018-12-20 10:00:58 -05:00
picklesrus
a9971b2f7b Fix formatting issues. Fix broken mailto. Remove duplicate message 2018-12-20 09:47:50 -05:00
Paul Kaplan
a196462818
Merge pull request #2515 from paulkaplan/enfasten-remixing-further
Set isRemixing to true and then start remixing process
2018-12-20 08:31:58 -05:00
picklesrus
32d1c63a3e Merge branch 'UpdateFAQ' of https://github.com/ChampikaF/scratch-www into ChampikaF-UpdateFAQ 2018-12-20 08:24:16 -05:00
picklesrus
f2c79ab658
Merge pull request #2511 from picklesrus/parents-page
Parents page
2018-12-20 08:20:42 -05:00
chrisgarrity
496d585add Don’t duplicate localization strings
Current launch banner should just use the intro.startCreating string for the call to action. Leaving the generic Call to Action in place for the next banner.
2018-12-20 08:05:52 -05:00
chrisgarrity
496fdad8be New 3.0 Masthead
* intro component was changed for new banner masthead layout
* added new video component for embedding wistia (based on extension video, we should probably figure out consolidating the two)
* new and updated strings in splash/l10n.json
* updated splash presentation to move Intro above `inner` to allow it to be full width (like banners)
* new assets
2018-12-20 07:32:03 -05:00
Champika
66c4466465 faq page updates for Scratch 3 2018-12-19 18:05:24 -05:00
picklesrus
2f35049ff8
Merge pull request #2501 from kyleplo/patch-3
Make it clear that only Scratchers can use the cloud
2018-12-19 17:24:25 -05:00
Paul Kaplan
137015cfc0 Set isRemixing to true and then start remixing process
This makes it feel snappier to start the remixing project because it does not wait for the GUI to notify
2018-12-19 15:58:38 -05:00
Benjamin Wheeler
64fc4b3ed8
Merge pull request #2508 from benjiwheeler/switch-to-editor-on-remix
switch to editor after remixing from project page
2018-12-19 15:35:18 -05:00
Benjamin Wheeler
944ac0ff96
Merge pull request #2509 from benjiwheeler/admin-see-credit-editor
admins should not see editable project title in editor
2018-12-19 15:35:07 -05:00
Paul Kaplan
b0ade469c6
Merge pull request #2510 from paulkaplan/sentry-error-id
Show error ID and report React errors to Sentry
2018-12-19 14:16:33 -05:00
picklesrus
54d9c202c2 change out the video 2018-12-19 14:13:30 -05:00
Paul Kaplan
8af12ec0e1 Show error ID and report React errors to Sentry 2018-12-19 13:47:17 -05:00
Ben Wheeler
5ff13da56d admins should not see editable project title in editor 2018-12-19 11:59:47 -05:00
Ben Wheeler
859574a8bd switch to editor after remixing from project page 2018-12-19 11:40:49 -05:00
picklesrus
495299908b Updates to the parents page. See #2355 2018-12-19 11:30:25 -05:00
picklesrus
d13a773f7c
Merge pull request #2498 from picklesrus/download-space-edits
Fix some spacing issues on the download page. Adds a more padding und…
2018-12-19 09:44:13 -05:00
Benjamin Wheeler
293b7beefc
Merge pull request #2506 from benjiwheeler/mod-info
added author username to moderation info area
2018-12-18 11:45:51 -05:00
Paul Kaplan
f0b37134ff
Merge pull request #2505 from paulkaplan/remove-approx-liking
Remove approx liking/favoriting format
2018-12-18 11:40:07 -05:00
Ben Wheeler
5d96a6293a less css repetition 2018-12-18 10:48:03 -05:00
Ben Wheeler
edec88f0ab added author username to moderation info area 2018-12-18 10:43:11 -05:00
Paul Kaplan
d9b30d96d1 Remove approx liking/favoriting format 2018-12-18 09:50:17 -05:00
chrisgarrity
2972ac7462
Merge pull request #2495 from chrisgarrity/issue/2493-skip-tutorial
Remove tutorial for logged in users.
2018-12-18 07:16:24 -05:00
kyleplo
11ec64ac9c
Make it clear that only Scratchers can use the cloud 2018-12-17 16:41:57 -05:00
Paul Kaplan
d9c37318c4
Merge pull request #2500 from benjiwheeler/pass-thumbnail
pass onUpdateProjectThumbnail to gui when on project page
2018-12-17 15:50:18 -05:00
Ben Wheeler
153c749546 pass onUpdateProjectThumbnail to gui when on project page 2018-12-17 15:36:09 -05:00
picklesrus
158f130fab Fix some spacing issues on the download page. Adds a more padding under heading titles and makes the text in the older versions section have normal text styling. 2018-12-17 15:03:41 -05:00
Paul Kaplan
c768fab47d Add flag for dynamic meta tags in the template 2018-12-17 14:55:27 -05:00
chrisgarrity
0d5323ff0c Remove tutorial for logged in users. 2018-12-17 10:40:48 -05:00
Paul Kaplan
e20f928147 Put project info alerts below navbar 2018-12-14 16:47:54 -05:00
Ray Schamp
8ea6a9782f
Merge pull request #2488 from paulkaplan/change-comment-endpoint
Change the endpoint for loading single comments
2018-12-14 14:27:28 -05:00
Paul Kaplan
3c7b090a1f Change the endpoint for loading single comments 2018-12-14 14:03:18 -05:00
Benjamin Wheeler
92ac2786e5
Merge pull request #2474 from picklesrus/download-content-updates
Download content updates
2018-12-14 12:58:32 -05:00
picklesrus
96bc439ab0
Merge pull request #2478 from picklesrus/educator-links
Add proper links to cards and guides instead of hard coding them.
2018-12-14 07:14:28 -05:00
chrisgarrity
94a8396713 Make list of languages on www consistent with gui
start to depend on `scratch-l10n`

So far only the supported locales is used.

There is one small difference between scratch-l10n and the `languages.json` that was removed.
languages was:
`{locale: ‘languagename’, …}` key value pairs.

l10n exports:
`{locale: {name: ‘languagename’},…}

That required an additional change to the language chooser.
2018-12-13 16:00:41 -05:00
Benjamin Wheeler
d949edef6f
Merge pull request #2479 from benjiwheeler/fix-misalign
don't use flex-row class to wrap instructions and credits
2018-12-13 15:48:15 -05:00
picklesrus
3ebdcc11f7 Add icon! 2018-12-13 14:57:21 -05:00
picklesrus
828bf569b8 Add links! 2018-12-13 14:32:38 -05:00
picklesrus
43db3c12e5 Add proper links to cards and guides instead of hard coding them. 2018-12-13 14:10:47 -05:00
Ben Wheeler
2a0a76fba1 don't use flex-row class to wrap instructions and credits 2018-12-13 14:01:27 -05:00
Eric Rosenbaum
e170a9cd4a
Merge pull request #2455 from ericrosenbaum/feature/ideas-page
Ideas page
2018-12-13 13:58:55 -05:00
picklesrus
c52b083c62 Add correct screenshots. Update lots of text. 2018-12-13 12:57:42 -05:00
Eric Rosenbaum
b434865c45 Update l10n-static ids 2018-12-13 12:35:11 -05:00
Eric Rosenbaum
6d4af6014d Fix spacing of lower cards and starter sections 2018-12-13 11:52:12 -05:00
Paul Kaplan
cac7c2ff49
Merge pull request #2457 from paulkaplan/scroll-studios
Fix scrollbars for add-to-studio modal
2018-12-13 11:41:59 -05:00
chrisgarrity
f945897e86
Merge pull request #2470 from chrisgarrity/issue/2318-launch-banner
Issue/2318 launch banner
2018-12-13 11:41:45 -05:00
chrisgarrity
9cbcd80c76 two more tweaks with the mobile version 2018-12-13 11:40:39 -05:00
picklesrus
8848f11c8d download button padding 2018-12-13 11:20:32 -05:00
picklesrus
bdf93a15db Add questions to FAQ and change some messages. 2018-12-13 11:16:59 -05:00
Eric Rosenbaum
7aecb1185d Fix tile layout 2018-12-13 11:13:15 -05:00
Eric Rosenbaum
9f343fa662 Fix l10n-static ids 2018-12-13 11:01:25 -05:00
Eric Rosenbaum
6ae4bb882b Update routes for ideas page 2018-12-13 10:49:04 -05:00
Eric Rosenbaum
4ca6570592 Remove or rename unused l10n strings 2018-12-13 10:28:48 -05:00
picklesrus
1ce8ef5b0d
Merge pull request #2449 from picklesrus/download-directly-version
New Download page
2018-12-13 10:26:23 -05:00
Eric Rosenbaum
646624a07f Clicking modal img also opens tutorial 2018-12-13 10:22:47 -05:00
Eric Rosenbaum
b993b274ad Rename function and prop 2018-12-13 10:22:35 -05:00
picklesrus
c76d55de70 css cleanup! 2018-12-13 10:14:24 -05:00
picklesrus
f9bf122850
Merge pull request #2451 from picklesrus/educator-tweaks
minor educator pages fixes
2018-12-13 09:54:23 -05:00
Ray Schamp
295c1df2ff Hook up onClickLogo in GUI
This way it will take us to where we expect on staging and production.

Resolves #2296
2018-12-13 09:44:14 -05:00
picklesrus
7276cb3bff remove leftover line 2018-12-13 09:27:46 -05:00
Paul Kaplan
eb0c98b939
Merge pull request #2464 from paulkaplan/minor-style-fixes
Minor style fixes to the project page
2018-12-13 08:44:39 -05:00
Benjamin Wheeler
e9001e17c3
Merge pull request #2452 from benjiwheeler/parent-remix-null
if remix parent or original is unshared, don't crash project page
2018-12-12 21:33:56 -05:00
chrisgarrity
c28b5051ca revise with images absolute
Switched the images div to absolute positioning instead of the header container.
2018-12-12 20:42:23 -05:00
Paul Kaplan
bbda370d56
Merge pull request #2445 from paulkaplan/fix-preview-remix-list
Fix hard-coded /preview/id url for remix list.
2018-12-12 19:39:03 -05:00
Paul Kaplan
ef217b96a1 Use custom meta tag info for project page.
Note this _will not_ work until the page uses a template that does not include these meta tags. That is because react-helmet does not override any existing info in the head.

Thus, this was tested by removing that info from the template and seeing it work, then putting the template back.
2018-12-12 19:30:48 -05:00
Eric Rosenbaum
c1e5b05a0f update static l10n 2018-12-12 18:36:32 -05:00
Eric Rosenbaum
3cc6794ca1
Merge pull request #2443 from ericrosenbaum/feature/landing-pages-update
Update extension landing pages
2018-12-12 18:18:53 -05:00
Eric Rosenbaum
521a11e8a3 Remove duplicate l10n strings 2018-12-12 18:04:53 -05:00
Eric Rosenbaum
8fddd3b430 Use template for tutorial URLs 2018-12-12 17:22:17 -05:00
Eric Rosenbaum
ecccc6ac23 Add tutorial links 2018-12-12 17:13:31 -05:00
Eric Rosenbaum
7db60b7631 Align button text 2018-12-12 17:13:23 -05:00
Paul Kaplan
612d08e850 Fix line heights for instructions and comments 2018-12-12 17:04:14 -05:00
Paul Kaplan
fb4f6b6d56 Fix ordering and sizing of loves, extensions and mod info 2018-12-12 17:04:14 -05:00
Paul Kaplan
0af216137b Give copy-link and other subaction buttons an active state to show click 2018-12-12 17:04:14 -05:00
Paul Kaplan
ac92c65af6 Increase comment box border to prevent popping when focused 2018-12-12 17:04:14 -05:00
Paul Kaplan
70ab7c9c45 Correctly align extension chip images 2018-12-12 17:04:14 -05:00
Paul Kaplan
48ed10b493
Merge pull request #2460 from paulkaplan/conserve-angular-momentum
Make the remix button spin the correct the direction
2018-12-12 17:03:35 -05:00
Eric Rosenbaum
5829ff29b2 Improve l10n ids 2018-12-12 16:47:39 -05:00
Eric Rosenbaum
600830acc5 Fixing links 2018-12-12 15:57:27 -05:00
Paul Kaplan
16b8a90607 Actually return the mapping of extension info 2018-12-12 15:50:40 -05:00
Paul Kaplan
3aeda2208b Make the remix button spin the correct the direction 2018-12-12 15:38:00 -05:00
Eric Rosenbaum
bd96aaf81f l10n cleanup 2018-12-12 15:32:47 -05:00
Eric Rosenbaum
b9e4f51a00 Wording changes 2018-12-12 15:32:38 -05:00
Eric Rosenbaum
666e26b324 Cleanup 2018-12-12 15:21:14 -05:00
Paul Kaplan
1aafd28b0c Fix scrollbars for add-to-studio modal 2018-12-12 15:14:13 -05:00
Eric Rosenbaum
43e7ec6ebf css lint and cleanup 2018-12-12 15:05:36 -05:00
Eric Rosenbaum
8a06137284 Remove unused require 2018-12-12 14:25:25 -05:00
chrisgarrity
b9fb557b88 style adjustments 2018-12-12 14:24:07 -05:00
Eric Rosenbaum
20e3812380 First pass at complete layout 2018-12-12 14:17:39 -05:00
picklesrus
dcfb168878 fix lint 2018-12-12 13:45:42 -05:00
Ben Wheeler
634d6c93e0 if remix parent or original is unshared, don't crash project page 2018-12-12 13:24:41 -05:00
picklesrus
36ce0a4f74 minor educator pages fixes 2018-12-12 13:11:32 -05:00
picklesrus
3aaf36e82a where did the ; go? 2018-12-12 12:41:31 -05:00
picklesrus
a3afa5e482
Merge pull request #2447 from picklesrus/educators
Educators Page Changes
2018-12-12 12:18:34 -05:00
picklesrus
5c67ef4961 lint 2018-12-12 12:06:44 -05:00
picklesrus
dc24ab193d Fix up some stuff to better match the spec 2018-12-12 12:01:15 -05:00
chrisgarrity
79449ac547 [WIP] Draft 3.0 Launch banner
Started transition to ‘featured’ banner that is somewhat reusable. However, middle and smallTop banners are still based on beta. They’re not used for 3.0 launch.
2018-12-12 11:35:41 -05:00
Benjamin Wheeler
a9f9d7ee49
Merge pull request #2428 from benjiwheeler/fix-favorite-love
make love and favorite icons respond to click immediately, cleanly
2018-12-12 11:25:31 -05:00
Benjamin Wheeler
964459fb17
Merge pull request #2437 from benjiwheeler/placeholder-text-go-away
Placeholder text go away
2018-12-12 11:24:43 -05:00
picklesrus
5b6bbbdb8a rename some messages and fix some wording 2018-12-12 10:21:12 -05:00
picklesrus
1d305adc79 Fix some messages. 2018-12-12 09:07:49 -05:00
picklesrus
c3dde0c9eb version without app store buttons 2018-12-12 08:43:50 -05:00
Andrew Sliwinski
4587736684
Merge pull request #2438 from apple502j/patch-6
Unquote userId
2018-12-12 08:26:21 -05:00
picklesrus
e6420b601a fix lint and remove unused stuff 2018-12-11 17:30:35 -05:00
picklesrus
09afde4396 add more links 2018-12-11 17:23:04 -05:00
Paul Kaplan
a99e8574f5
Merge pull request #2433 from paulkaplan/cloud-data-modal
Show username and cloud var alerts on projects that use them.
2018-12-11 16:58:11 -05:00
picklesrus
0a39123a3b more links 2018-12-11 16:53:43 -05:00
picklesrus
4716cb3b32 fix all the things 2018-12-11 16:36:17 -05:00
picklesrus
f3fb63b2e4 fix some stuff 2018-12-11 16:13:34 -05:00
picklesrus
8a8a564996 Beginnings of new educator page 2018-12-11 15:02:43 -05:00
Paul Kaplan
bc99c52ebe Fix hard-coded /preview/id url for remix list. 2018-12-11 14:46:05 -05:00
Eric Rosenbaum
09a14b811a Update microbit starter project links 2018-12-11 14:30:57 -05:00
Eric Rosenbaum
6a1cf5b6e9 Update landing getting started instructions 2018-12-11 14:28:08 -05:00
Eric Rosenbaum
13e3c8efdc Update EV3 starter projects 2018-12-11 14:21:20 -05:00
Eric Rosenbaum
134126c170 Update WeDo starter projects 2018-12-11 13:53:49 -05:00
Ben Wheeler
478259a5d2 placeholder text goes away when instructions, credits clicked 2018-12-11 12:29:31 -05:00
picklesrus
84e3d84ed0 minor stuff 2018-12-11 11:55:42 -05:00
picklesrus
570ba86e75 lint! 2018-12-11 11:44:35 -05:00
picklesrus
60af2fff7c Fix background color 2018-12-11 11:32:57 -05:00
picklesrus
145770798f Fix padding around screenshots 2018-12-11 11:31:36 -05:00
picklesrus
6dde3fa231 Move the scratch2 download page to /download/scratch2. 2018-12-11 11:26:53 -05:00
Paul Kaplan
78506f82c7 Hide project info alerts when switching to editor 2018-12-11 11:18:53 -05:00
Paul Kaplan
ace110c59b Show username and cloud var alerts on projects that use them.
Only implemented for scratch3 projects
2018-12-11 11:15:00 -05:00
chrisgarrity
bc49f04ed6
Merge pull request #2387 from Kenny2github/delete-cards
Redirect /info/cards route to /ideas 
/cc @ericrosenbaum
2018-12-11 10:25:48 -05:00
chrisgarrity
594ce06b5b
Merge pull request #2427 from chrisgarrity/issue/sb2-mod-info
Add moderator info for sb2 projects
2018-12-11 10:13:45 -05:00
picklesrus
77c311ccea clean up some css and align some images with text 2018-12-11 10:11:06 -05:00
apple502j
c134a95de3 Translate placeholder 2018-12-11 20:41:49 +09:00
apple502j
fa29c2f2a5
Unquote userId 2018-12-11 18:29:02 +09:00
picklesrus
8bfa310f5a Fix line spacing and font size along with a message. 2018-12-10 19:34:23 -05:00
picklesrus
47ce5f5919 Crush the pngs 2018-12-10 18:49:03 -05:00
picklesrus
ce854f7b80 more faq. More messages 2018-12-10 18:35:17 -05:00
Eric Rosenbaum
7212436f3b Update nav from “tips” to “ideas” 2018-12-10 18:17:05 -05:00
picklesrus
d7a678ad8c Mostly adding messages and removing unnecessary sections 2018-12-10 18:09:36 -05:00
Eric Rosenbaum
68c8decae9 Remove microworlds pages 2018-12-10 18:06:23 -05:00
Eric Rosenbaum
8e6af59635 Initial draft of ideas page 2018-12-10 18:06:07 -05:00
picklesrus
2baf5860ca Skeleton of downloads page. 2018-12-10 17:33:22 -05:00
Ben Wheeler
d5ec7e17df add clientFaved and clientLoved, fix number selection 2018-12-10 11:59:32 -05:00
Paul Kaplan
26e821214a
Merge pull request #2431 from paulkaplan/fix-multi-love
Only try to update fave counts if there are no requests in progress.
2018-12-10 10:56:34 -05:00
Paul Kaplan
901dfeb6ca
Merge pull request #2425 from rschamp/admin-panel-occlusion
Don't occlude page content with the admin panel
2018-12-10 10:35:59 -05:00
Paul Kaplan
7c5d909a68 Only try to update fave counts if there are no requests in progress. 2018-12-10 10:31:58 -05:00
Paul Kaplan
98b5930b91 Use falsey check for shareDate instead of checking for null.
It is set to empty string elsewhere when the value does not exist, not null
2018-12-10 09:15:24 -05:00
chrisgarrity
84cfcdee85 Add moderator info for sb2 projects 2018-12-10 08:47:01 -05:00
Benjamin Wheeler
9d5788cc77
Merge pull request #2417 from benjiwheeler/view-count
pass onGreenFlag to GUI; when called, call API to register project view
2018-12-07 16:52:44 -05:00
Paul Kaplan
d20b16d79c
Merge pull request #2424 from paulkaplan/admin-toggle-comments
Allow admins to toggle comments
2018-12-07 16:47:01 -05:00
Paul Kaplan
3934c92c7a
Merge pull request #2423 from paulkaplan/add-to-studio-fix
Show addToStudio for all logged in users on shared projects
2018-12-07 16:46:42 -05:00
Paul Kaplan
551cc0cc13 Remove userOwnsProject because it is unused 2018-12-07 16:09:34 -05:00
Ray Schamp
1979675ebf Don't occlude page content with the admin panel
/ht @paulkaplan for the idea to move it below the nav bar.
2018-12-07 13:15:38 -05:00
Paul Kaplan
5d409bcdcf Allow admins to toggle comments 2018-12-07 12:57:50 -05:00
Paul Kaplan
4522983e20 Show addToStudio for all logged in users on shared projects 2018-12-07 12:51:00 -05:00
Paul Kaplan
2a464c8c21 Remove share button on censored project banner.
Functionality needs reconsidering.
2018-12-07 12:32:54 -05:00
Ben Wheeler
8dd239ebe5 use authorUsername, not users own username, in hitting logProjectView endpoint; use cookie and tokens in request 2018-12-07 11:00:43 -05:00
Ray Schamp
402799e55f Fix lint issues
My linter doesn't catch prop order for some reason. So fix linting so the build works.
2018-12-06 23:15:54 -05:00
Ben Wheeler
5c3300dd68 pass onGreenFlag to GUI; when called, call API to register project view 2018-12-06 23:06:27 -05:00
Ray Schamp
0957173c88 Fix CSS
I dunno what I was seeing that made me think the width should be 237, but it was incorrect.
2018-12-06 22:48:03 -05:00
Ray Schamp
bc59a63e5e Only show the admin panel to admins 2018-12-06 17:07:28 -05:00
Ben Wheeler
d235d872e1 show remixed banner to all, not just new scratchers 2018-12-06 16:01:28 -05:00
Ben Wheeler
07568b0f65 remove editor from url when not appropriate 2018-12-06 16:01:28 -05:00
Ben Wheeler
1adca1800a Banner message showing that user has remixed 2018-12-06 16:01:28 -05:00
Ray Schamp
af32c08971
Merge pull request #2413 from rschamp/mod-panel-phase-3
Match scratchr2 admin panel behavior more closely
2018-12-06 15:47:48 -05:00
Ray Schamp
15cc6ca529 Lint 2018-12-06 15:16:22 -05:00
Ray Schamp
0f823531b6 Use local storage to remember the panel state
This is mirroring from scratchr2
2018-12-06 15:06:55 -05:00
Ray Schamp
d243b5dad7 Allow the iframe to close the parent admin panel 2018-12-06 15:06:21 -05:00
Ray Schamp
e41cd84f09 Fix up admin panel styles
Match the width more closely and hide scrollbars
2018-12-06 15:05:41 -05:00
Ray Schamp
b7ffa34eec Open and close admin panel from parent component 2018-12-06 15:05:20 -05:00
chrisgarrity
7ac90afb56
Merge pull request #2406 from chrisgarrity/issue/2388-embed-project
show embed view
2018-12-06 11:51:33 -05:00
Eric Rosenbaum
b49854300b
Merge pull request #2405 from ericrosenbaum/feature/landing-pg-vids
Add videos to WeDo and EV3 landing pages
2018-12-06 10:38:19 -05:00
Eric Rosenbaum
c371a3757f Maybe this is the correct order for CSS properties 2018-12-06 09:43:30 -05:00
Ray Schamp
8e75b8c6cf
Merge pull request #2404 from rschamp/mod-panel-phase-1
Admin panel for the project page
2018-12-06 09:33:02 -05:00
picklesrus
cb16831f4f
Merge pull request #2407 from picklesrus/credits-fix
Fix image path bug and capitalization CBs name.
2018-12-06 08:50:38 -05:00
Paul Kaplan
27e0612ea9
Merge pull request #2401 from paulkaplan/admin-share-banner
Allow admins to see share banner
2018-12-06 05:33:27 -05:00
picklesrus
11f8105de4 Fix image path bug and capitalization CBs name. 2018-12-05 17:48:58 -05:00
chrisgarrity
1a1122d984 show embed view
* detect `embed` in the URL
* initialize GUI in embed mode if detected
* match `embed` in the project page route
* add fastly config rules to redirect `/projects/embed/:id` to `/projects/:id/embed`
2018-12-05 17:35:44 -05:00
Eric Rosenbaum
8c6013b243 Add extension video component to wedo and ev3 pages 2018-12-05 17:25:07 -05:00
Ray Schamp
59e0941652 Update iframe to the standalone view 2018-12-05 17:12:18 -05:00
Ray Schamp
096aeb02a0 Lint 2018-12-05 16:09:04 -05:00
Ray Schamp
726a2005bb Basic project admin panel support
Just in case we don't do anything else, this "proxies" the old admin panel to the new project page.

Requires https://github.com/LLK/scratchr2/pull/5219 to work.
2018-12-05 15:40:18 -05:00
chrisgarrity
8d88ab9b9b
Merge pull request #2389 from chrisgarrity/issue/2306-projects-404
Show NotAvailable for invalid URL
2018-12-05 15:01:51 -05:00
Paul Kaplan
b481ae7fad Allow admins to see share banner 2018-12-05 13:39:18 -05:00
Eric Rosenbaum
d206b44abe Add video player to wedo page 2018-12-05 10:48:46 -05:00
Paul Kaplan
40795d1cb9
Merge pull request #2394 from paulkaplan/fix-censor-endpoint-shape
Use message instead of censorMessage for the censor message.
2018-12-05 08:31:33 -05:00
Kenny2github
2916da2822 Remove routeAlias 2018-12-05 10:33:05 +08:00
Benjamin Wheeler
93b04a59f1
Merge pull request #2393 from benjiwheeler/update-project-error
project page will no longer vanish when project metadata update fails on the backend
2018-12-04 16:38:42 -05:00
Paul Kaplan
ff8bbe79b4 Use message instead of censorMessage for the censor message. 2018-12-04 16:29:46 -05:00
Eric Rosenbaum
824764bc83
Merge pull request #2380 from ericrosenbaum/feature/update-win-version-req
Update Windows version requirement on hardware extension landing pages
2018-12-04 16:17:17 -05:00
Ben Wheeler
dab1be812e handle update project metadata errors without setting body 2018-12-04 15:47:21 -05:00
Eric Rosenbaum
3c24bf236b Adjust header layout 2018-12-04 14:58:16 -05:00
chrisgarrity
880b890dc2 Show NotAvailable for invalid URL
`/projects` without an id or `editor` should just show a 404.
2018-12-04 10:48:16 -05:00
Paul Kaplan
4a57d36112
Merge pull request #2379 from paulkaplan/refresh-project-data
Refresh the data related to the project json on switch back from editor
2018-12-04 08:34:45 -05:00
Kenny2github
06a38ca247 Redirect /info/cards route to /ideas 2018-12-04 10:47:14 +08:00
Eric Rosenbaum
e9c2e8f13f Lint 2018-12-03 17:58:51 -05:00
Eric Rosenbaum
e9d2d9bffa Add EV3 troubleshooting info about unpairing before reconnecting 2018-12-03 17:57:37 -05:00
chrisgarrity
ef64ccb343
Merge pull request #2374 from chrisgarrity/issue/2364-missing-redirects
Add missing tutorial shortcuts
2018-12-03 17:40:06 -05:00
Eric Rosenbaum
e2ae6da18f Add OS version troubleshooting to each landing page 2018-12-03 17:19:06 -05:00
Eric Rosenbaum
421aabadc1 Update version requirements 2018-12-03 15:29:25 -05:00
Paul Kaplan
e49eb3a222 Refresh the data related to the project json on switch back from editor 2018-12-03 15:15:18 -05:00
Karishma Chadha
da4cfb3120 Track isScratcher status and pass hasCloudPermission flag to gui. 2018-12-03 15:02:13 -05:00
Ray Schamp
7d816ac5e7
Merge branch 'develop' into hotfix/fix-adventure-game 2018-12-03 13:28:27 -05:00
Ray Schamp
a0b6fda7a0
Add project data to adventure game tutorial 2018-12-03 12:33:28 -05:00
chrisgarrity
44e64aede8 Add missing tutorial shortcuts
Add `/bird` and `/makeitfly` as redirects to the tips page.

When the Fly tutorial is created /mak
2018-12-03 10:45:03 -05:00
chrisgarrity
e246c6a75c
Merge pull request #2184 from sehgalvibhor/thumbnail-fix
Thumbnail Fix
2018-12-03 09:53:45 -05:00
Ben Wheeler
655f3365ec rearranged css for linting 2018-12-03 09:24:35 -05:00
Ben Wheeler
089cdbb06b revised banner css to be more flexible
simplified share banner conditionals

shorter banner height without button; button has margin instead
2018-12-03 09:24:35 -05:00
apple502j
574f2b0897
HOTFIX: No localhost allowed on real website! 2018-12-03 20:31:49 +09:00
Ben Wheeler
351d38de09 fixed lint errors 2018-12-02 08:35:31 -05:00
Ben Wheeler
e1cc0c390b tweaked banner css to bring it into line with design spec 2018-12-02 08:35:31 -05:00
Ben Wheeler
a6a5ef7941 long and short shared messages; clarified logic around which banner to show 2018-12-02 08:35:31 -05:00
Ben Wheeler
3af745eede don't show shared message forever 2018-12-02 08:35:31 -05:00
Ben Wheeler
8d74726080 added congratulations on sharing message for new scratchers 2018-12-02 08:35:31 -05:00
Vibhor Sehgal
f1ccfbee66 Fix for Fashion microworld 2018-12-01 18:34:01 +05:30
Eric Rosenbaum
ab106f7723 Update windows version requirement 2018-11-30 17:21:59 -05:00
chrisgarrity
f6d54e25b9
Merge pull request #2367 from chrisgarrity/feature/mod-info
Additional project data for Moderators/Admins on the project page
2018-11-30 08:21:15 -05:00
chrisgarrity
e95e5c5f25 Additional project data for Moderators/Admins 2018-11-29 15:43:28 -05:00
Eric Rosenbaum
8260d7bb5d Add Makey Makey extension chip 2018-11-29 15:28:55 -05:00
Paul Kaplan
443039389a
Merge pull request #2366 from paulkaplan/fix-cloud-switching
Pass canSave to both editor and player view to allow cloud reconnecting.
2018-11-29 11:26:52 -05:00
Paul Kaplan
c777ccffc8 Pass canSave to both editor and player view to allow cloud reconnecting.
The canSave prop was being passed to the editor view, but needs to also be passed to the player view because it is used to decide whether to connect the viewer to cloud variables. People cannot connect to cloud variables after entering editor mode on anothers project.
2018-11-29 10:53:03 -05:00
Paul Kaplan
172915f9d9 Add project thumbnail update action 2018-11-29 09:55:45 -05:00
Benjamin Wheeler
84dc08b5cc
Merge pull request #2314 from chen-robert/gh2263-negative-loves
Fix gh-2263: Negative loves
2018-11-28 19:25:01 -08:00
chrisgarrity
edfee0713a show intro for logged out users
Switch `&&` to `||`. Current date before AND after HoC is never true.
2018-11-28 12:23:47 -05:00
chrisgarrity
bef5e615f7
Merge pull request #2186 from apple502j/add-parents
Migrate Parents Page
2018-11-28 09:23:01 -05:00
chrisgarrity
5cff3f9ae4 Revised unsupported browser info
- Header reads ‘This browser is not supported’
- FAQ link goes to general Scratch FAQ.
2018-11-27 12:51:49 -05:00
Paul Kaplan
99ac59d2cb
Merge pull request #2350 from paulkaplan/fix-comments-remixing
Remove comments when remixing, they do not exist on the new project
2018-11-26 16:32:12 -05:00
Paul Kaplan
1c4c5895af Remove comments when remixing, they do not exist on the new project 2018-11-26 11:21:14 -05:00
Paul Kaplan
f025407818 Use a more popular clipboard manager 2018-11-26 10:22:55 -05:00
Paul Kaplan
1c09bdf7b0 Implement the copy link functionality
This does not implement any further design, like showing a confirmation popover, but just makes sure the button works. I used a very slim package to implement copy that does not include any fallbacks for IE, since we do not need to support that here.
2018-11-26 10:22:34 -05:00
Paul Kaplan
d31cbe58e2
Merge pull request #2344 from paulkaplan/fix-comment-actions
Show comment actions on hover and fix report translation
2018-11-26 10:15:16 -05:00
chrisgarrity
decb250dd5 Initial version 2018-11-26 09:43:05 -05:00
Paul Kaplan
1be21bdb7e
Merge pull request #2345 from paulkaplan/fix-placeholder-alignment
Fix alignment of the placeholder and text in project instructions & note
2018-11-26 09:25:44 -05:00
Paul Kaplan
3fb5dd769a
Merge pull request #2340 from paulkaplan/visibility-info
Show details about why a project is not public
2018-11-26 09:18:38 -05:00
Paul Kaplan
d5c3ae773f Fix lint 2018-11-21 13:00:53 -05:00
Paul Kaplan
847d0c3844 Fix alignment of the placeholder and text in project instructions & note 2018-11-21 12:12:51 -05:00
Paul Kaplan
a8cf28958c Fix incorrect translation string in comment report 2018-11-21 11:47:12 -05:00
Paul Kaplan
933b805044 Make comment actions (report, delete, restore) only visible on hover 2018-11-21 11:46:54 -05:00
chrisgarrity
345b111371
Merge pull request #2333 from chrisgarrity/feature/2270-shortcut-redirect
Tutorial shortcut redirects
2018-11-21 11:31:00 -05:00
Paul Kaplan
2ed74a2682 Show deleted banner if both deleted and censored.
This is because the user can take an action to remove the trash status, but not the censored status.
2018-11-21 10:36:27 -05:00
Paul Kaplan
0b8c13fb40 Use the project author username in visibility request instead of viewer
/ht @chrisgarrity
2018-11-21 10:31:10 -05:00
Ray Schamp
df3d18e649
Revert "Revert "use cdn.scratch.ly in staging"" 2018-11-21 10:27:13 -05:00
Ray Schamp
45415944c1
Revert "use cdn.scratch.ly in staging" 2018-11-21 10:07:57 -05:00
Benjamin Wheeler
95fb947c08
Merge pull request #2325 from benjiwheeler/hash-redirect
redirect hash urls to url pathnames
2018-11-20 16:06:46 -05:00
Paul Kaplan
ac6a870a3f
Merge pull request #2334 from chrisgarrity/feature/rename-preview
Rename /preview to /projects
2018-11-20 15:34:03 -05:00
Ben Wheeler
79ae4dd511 let pathname end without a slash 2018-11-20 15:03:57 -05:00
Eric Rosenbaum
bfc36e25f9
Merge pull request #2329 from ericrosenbaum/feature/get-link-from-app-stores
App store badges for Link download
2018-11-20 13:17:18 -05:00
Paul Kaplan
c18ccba646 Fix scss linting 2018-11-20 12:16:10 -05:00
Paul Kaplan
122160726d Show details about why a project is not public
Follow up the project info request with a request to the visibility endpoint to find out if the project is trashed or censored. The project just not being published is handled by the existing code.

This PR generalizes the ShareBanner to a more generic "Banner" that is then filled with the relevant content.
2018-11-20 12:01:52 -05:00
Paul Kaplan
af301ba450
Merge pull request #2336 from paulkaplan/exit-single-comment-view
Allow user to exit "single comment mode" and see all comments.
2018-11-20 08:13:42 -05:00
Ben Wheeler
7ee463509c use cdn.scratch.ly in staging 2018-11-19 17:07:48 -05:00
chrisgarrity
c4403c5d8d Replace uses of /preview in URLs 2018-11-19 17:02:09 -05:00
Eric Rosenbaum
f77357daf2 Update mac and windows app store links 2018-11-19 15:59:37 -05:00
Paul Kaplan
3fe1242aa6 Allow user to exit "single comment mode" and see all comments.
This visually appears like a "load more comments" button for now, but has the impact of unsetting the #comments-<id> hash in the url and resetting the comment state, showing all the comments (in paginated view)
2018-11-19 15:47:47 -05:00
chrisgarrity
2065090bb8
Merge pull request #2262 from sjgllghr/issue/gh2212-migrate-scratch-1.4
Fix gh-2212: Migrate Scratch 1.4 download page
2018-11-19 15:27:49 -05:00
Eric Rosenbaum
8efb6045ee Lint 2018-11-19 15:22:18 -05:00
chrisgarrity
494bc3e48d Rename /preview to /projects 2018-11-19 14:59:56 -05:00
chrisgarrity
dd620e1187 Tutorial shortcut redirects
Duplicate tutorial shortcuts previously handled by scratchr2.

Left out routeAlias as that is no longer needed.
2018-11-19 14:18:22 -05:00
Paul Kaplan
7cfc3ed846 Show projectNotAvailable view in editor mode also 2018-11-19 14:16:56 -05:00
Ben Wheeler
50a2072794 removed stale comment 2018-11-19 13:58:02 -05:00
Eric Rosenbaum
9ee3c9eb6c App store badges for Link download 2018-11-19 13:51:29 -05:00
Ben Wheeler
1c8a124f44 switched button border radius back to 4px 2018-11-19 13:22:27 -05:00
chrisgarrity
911005f5ad
Merge branch 'master' into hotfix/hoc-banner 2018-11-19 12:03:02 -05:00
chrisgarrity
a06d8ec11e Add more bottom padding to activities button
Also restore hocbanner messages to l10n.json.
2018-11-19 11:11:48 -05:00
Ben Wheeler
cd030e0895 rearranged css to get tests working 2018-11-18 11:19:21 -05:00
Ben Wheeler
d9fdb67543 redirect hash urls to url pathnames 2018-11-17 23:59:41 -05:00
Ben Wheeler
30ed29a39a enable remix button; format remix, see inside button css 2018-11-17 15:13:58 -05:00
chrisgarrity
f2f4a6ac7c 2018 Hour of Code Banners
* add Top and Middle HoC banners
* banners share styles
* add new assets for banners
* update presentation to check date to determine whether to show the HoC banners.
2018-11-16 14:02:56 -05:00
Paul Kaplan
16e3fa100b
Merge pull request #2313 from paulkaplan/fix-missing-extensions
Add missing extensions and images
2018-11-14 20:31:26 -05:00
Robert Chen
9b7097a772 Resolved issue #2263 2018-11-14 17:06:33 -08:00
chrisgarrity
d2500e88c7
Merge pull request #2302 from chrisgarrity/issue/2281-gettingstarted
Issue/2281 gettingstarted
2018-11-14 17:11:46 -05:00
chrisgarrity
7e9403d049
Merge pull request #2291 from chrisgarrity/feature/2280-hoc-2018
2018 Hour of Code Banners
2018-11-14 17:10:35 -05:00
chrisgarrity
d24a76e896
Merge pull request #2303 from chrisgarrity/issue/fix-wedolegacy-translations
Fix wedo-legacy translations
2018-11-14 17:08:42 -05:00
S. Gallagher
e4be2bd87c make suggested changes 2018-11-14 13:36:21 -08:00
picklesrus
6c7a56dde8
Merge pull request #2220 from picklesrus/credits-stuff
Redo the credits page.
2018-11-14 16:32:43 -05:00
Paul Kaplan
194dc90688 Add missing extensions and images 2018-11-14 15:39:40 -05:00
Paul Kaplan
476578cfa8
Merge pull request #2304 from paulkaplan/update-share-endpoint
Move sharing to special endpoint.
2018-11-14 14:15:45 -05:00
Paul Kaplan
d36b71dcb3
Merge branch 'develop' into hide-backpack-logged-out 2018-11-14 14:12:51 -05:00
Eric Rosenbaum
9f640ffdd6
Merge pull request #2307 from ericrosenbaum/feature/update-microbit-hex-1.1.0
Update microbit hex file version
2018-11-14 13:28:54 -05:00
Benjamin Wheeler
6d09f2dada
Merge pull request #2289 from benjiwheeler/show-creator
Pass authorId and authorUsername to gui
2018-11-14 06:43:29 -05:00
Ben Wheeler
4bb5e641bb added comment about falseness of authorId, authorUsername 2018-11-14 06:42:57 -05:00
Eric Rosenbaum
1840c9ec19 Update microbit hex file version 2018-11-13 15:43:14 -05:00
Ben Wheeler
8e967737e5 use production or staging hosts for static assets url 2018-11-13 15:32:59 -05:00
picklesrus
4a66cc2e59 Fix code review comments. Got rid of a bunch of uncessary stuff. 2018-11-13 14:14:24 -05:00
Paul Kaplan
f8d598549d Update instead of replacing project info to match API.
The API endpoint will return just the updated slice of the projectInfo, so just update the projectInfo instead of replacing.
2018-11-13 12:23:05 -05:00
Paul Kaplan
3a03f10aff Move sharing to special endpoint.
This makes a couple of assumptions about the shape of the endpoint:
- Route is /proxy/projects/:id/share.
- Returns the full (updated) project info on success, just like the project update endpoint does.

I reviewed these with colby since this is frontrunning the actual API, but I can update once the API is finalized.
2018-11-13 08:49:37 -05:00
chrisgarrity
48593869f9 Fix wedo-legacy translations
The translation generatation script uses the view name from the routes file when generating the translations files. So the route `name:` and `view:` must match.

Symptom: when generating translations there were warnings that there were no translations for `wedo-legacy`.
2018-11-12 14:07:44 -05:00
chrisgarrity
13b3e57381 open getting started tutorial for logged out users
- `create` on the navbar opens the getting started tutorial if the user is not logged in
- replaced any other use of `tip_bar=getStarted` with `tutorial=getStarted` (with the exception of Tips page)
- did not replace other uses of `tip_bar=home` as those should probably go to the new tips/ideas page.
2018-11-12 12:58:59 -05:00
chrisgarrity
062c074407 allow query parameters on the preview route
Preview needs to be able to handle query parameters for tutorials.
2018-11-12 10:16:22 -05:00
Ray Schamp
25f7f5b273
Merge pull request #2301 from MasterOfTheTiger/issue/gh2298-job-listing
Removes Full Stack Job Listing
2018-11-11 18:26:16 +00:00
MasterOfTheTiger
4677feb371 State that no jobs are currently available 2018-11-11 08:58:55 -08:00
Ben Wheeler
c965fd15f9 generate author thumbnail and pass to gui 2018-11-10 02:07:48 -05:00
MasterOfTheTiger
12aeba90ed Use https for ScratchJR links 2018-11-09 09:17:04 -08:00
Paul Kaplan
9ed3ecc7bb Split up the backpack options and tie visibility to isLoggedIn 2018-11-08 13:19:12 -05:00
Paul Kaplan
c62470150b
Merge pull request #2290 from paulkaplan/project-not-available
Add "project not available" view for when project body cannot be loaded
2018-11-08 12:58:37 -05:00
Paul Kaplan
ae05f07e07 Fix project not available flag setting and catch 404 responses 2018-11-08 08:43:36 -05:00
chrisgarrity
a156c404e1 2018 Hour of Code Banners
* add Top and Middle HoC banners
* banners share styles
* add new assets for banners
* update presentation to check date to determine whether to show the HoC banners.
2018-11-07 17:14:28 -05:00
Paul Kaplan
315c8b78fc Add "project not available" view for when project body cannot be loaded
This happens when the project id does not exist, or is not visible to the given user.
2018-11-07 16:32:12 -05:00
Ben Wheeler
464d5f7c2d Pass authorId and authorUsername to gui 2018-11-07 12:59:16 -05:00
Ray Schamp
e2795ec4d6
Merge pull request #2284 from rschamp/bugfix/offline-homepage
Avoid displaying an error when /news returns a 500
2018-11-07 17:57:10 +00:00
Paul Kaplan
80028bfea5
Merge pull request #2288 from paulkaplan/ip-muted-comments
Add IP Mute message to project comment errors
2018-11-07 11:47:44 -05:00
Paul Kaplan
4105e88cfd Add IP Mute message to project comment errors 2018-11-07 10:58:07 -05:00
chrisgarrity
b5d551b705 Add new strings in preparation for Hour of Code 2018-11-06 16:15:54 -05:00
Ray Schamp
037078d623 Avoid displaying an error when /news returns a 500
This situation probably occurs most frequently when running dev servers while offline, but could also happen if the API is having issues. 500 responses from the API should not take down the homepage so drastically, and are also sometimes unavoidable while working offline.
2018-11-06 12:25:04 +00:00
Andrew Sliwinski
7721418165
Merge pull request #2269 from DeleteThisAcount/patch-1
Fix typo on micro:bit landing page
2018-11-05 13:00:19 -05:00
S. Gallagher
24a345cc21 stop using FormattedHTMLMessage 2018-11-04 07:57:48 -08:00
Ben Wheeler
7aae4219ec make share banner appear only if user has the power to share this project 2018-11-01 14:19:28 -04:00
S. Gallagher
3ba4e551d4 migrate scratch 1.4 download page 2018-10-31 16:20:35 -07:00
DeleteThisAcount
ab9004f901
fix small typo 2018-10-31 17:52:16 +01:00
Benjamin Wheeler
e14cb0f8f2
Merge pull request #2250 from benjiwheeler/share-button-icon
removed erroneous share button icon
2018-10-30 22:29:19 -04:00
Karishma Chadha
950f13a35a
Merge pull request #2245 from kchadha/cloudhost
Configure Cloud Host
2018-10-30 14:26:17 -04:00
Ben Wheeler
78f059e8b4 removed erroneous share button icon 2018-10-29 17:30:53 -04:00
picklesrus
db2453bc69 Replace FormattedHtmlMessage with FormattedMessage 2018-10-29 10:02:43 -04:00
chrisgarrity
b629d28a6d
Merge pull request #2242 from chrisgarrity/issue/2030-gui-layers
remove obsolete code
2018-10-29 09:59:50 -04:00
Benjamin Wheeler
183bdccdae
Merge pull request #2223 from sehgalvibhor/develop
Responsive about page!
2018-10-29 06:59:56 -04:00
Karishma Chadha
e771e91164 Configure cloud host and pass it as a prop to the gui. 2018-10-29 01:05:36 -04:00
Vibhor Sehgal
93d847271d Travis Fix 2018-10-29 08:08:13 +05:30
chrisgarrity
9dd13dac74 remove obsolete code
Preview doesn’t need to set a z-index (the first version was trying to overlay gui on top of the project view).
2018-10-26 15:11:46 -04:00
Paul Kaplan
f2490baa16
Merge pull request #2239 from paulkaplan/fix-comments-id
Use #comments-id instead of #comment-id for fetching single comments
2018-10-25 16:56:27 -04:00
Benjamin Wheeler
cff5733833
Merge pull request #2234 from benjiwheeler/isshared
pass isShared to gui
2018-10-25 15:57:07 -04:00
Benjamin Wheeler
8653e358b1
Merge pull request #2232 from benjiwheeler/dont-get-extensions
moved getExtensions out of constructor, and out of projectInfo response
2018-10-25 15:56:39 -04:00
Paul Kaplan
32f0999bb0 Use #comments-id instead of #comment-id for fetching single comments 2018-10-25 15:53:34 -04:00
Paul Kaplan
e563254c8f
Merge pull request #2231 from paulkaplan/comment-linking
Decorate comment text to add @username links and scratch-domain links
2018-10-25 15:18:56 -04:00
Paul Kaplan
f133f29353 Fix form styling for project edit fields 2018-10-25 11:38:27 -04:00
Paul Kaplan
209c8da9f7 Keep each input in its own formsy wrapper to improve performance
Having Formsy around the entire page was causing re-renders to happen when you typed into an input, when really just that component needed to re-render.
2018-10-25 10:27:54 -04:00
Vibhor Sehgal
04adcb5063 Retaining Flex Layout 2018-10-25 09:53:28 +08:00
Ben Wheeler
c4de63d93a pass isShared to gui 2018-10-24 18:13:57 -04:00
Paul Kaplan
dbca5a4044
Merge pull request #2226 from LLK/i10n-preview
Extract strings for localizing the preview page
2018-10-24 16:00:40 -04:00
Paul Kaplan
fa7c2d5b09
Merge pull request #2230 from paulkaplan/single-comment-mode
Showing specific comment by url hash on preview
2018-10-24 15:41:14 -04:00
Ben Wheeler
dd07e46c6a moved getExtensions out of constructor, and out of projectInfo response 2018-10-24 15:38:18 -04:00
Benjamin Wheeler
95dc611d77
Merge pull request #2222 from benjiwheeler/copy-remix
Set capability flags to be passed to GUI, to support remix and save as copy
2018-10-24 13:24:40 -04:00
Paul Kaplan
2c5efbda50 Fix scss linting 2018-10-24 11:45:17 -04:00
Paul Kaplan
5158907c5b
Merge pull request #2229 from paulkaplan/sudo-fix-load-more
Do not rely on total comment number for load more functionality
2018-10-24 11:42:00 -04:00
Paul Kaplan
9066686c2b Decorate comment text to add @username links and scratch-domain links 2018-10-24 11:25:32 -04:00
Paul Kaplan
faf3f49c50 Fix proptypes 2018-10-24 10:43:21 -04:00
Paul Kaplan
520018ee50 View single thread of comments by URL hash 2018-10-24 10:29:33 -04:00
Paul Kaplan
4d8256e985 Update all preview... l10n strings to project... 2018-10-24 09:35:30 -04:00
Paul Kaplan
ae626d5244 Do not rely on total comment number for load more functionality
Show the load more comments button any time the last comment page was filled to the requested limit. As noted in the comment, this heuristic will be wrong at most 5% of the time but the failure mode (showing load more which, when clicked doesn't load any more, just goes away) is very mild, and for the overwhelming majority of project views that happen on projects with many, many comments, this is very unlikely to ever be noticed. It obviously isn't a perfect solution, but I cannot think of another that does not need the server to do another query to find out the total number of visible comments, or to find out if there are more comments after the requested offset+limit.
2018-10-24 09:18:45 -04:00
Paul Kaplan
efb1a380da Update the comment routes 2018-10-24 08:55:36 -04:00
Ben Wheeler
3d964911a1 renamed canSaveAsCopy to canCreateCopy 2018-10-23 17:42:55 -04:00
Ben Wheeler
d713249bee changed the meaning of canCreateNew to true creation 2018-10-23 17:42:55 -04:00
Ben Wheeler
e03f83466e better logic around canSave when project is new 2018-10-23 17:42:55 -04:00
Ben Wheeler
ed7b6541e9 set canRemix and canSaveAsCopy 2018-10-23 17:42:55 -04:00
Paul Kaplan
f4887008a5 Extract strings for localizing the preview page 2018-10-23 11:38:34 -04:00
Vibhor Sehgal
733c3d1bff Responsive about page. 2018-10-23 11:29:44 +08:00
chrisgarrity
3fcc13a8cd Integrate www-gui localization
* Initialize `locales` in redux using methods exported by GUI.
* pass GUI method to set the `scratchlanguage` cookie

NOTE: It does not reload the page, so switching back to the project page will not reflect language changes made in gui until the next page reload. Reloading the page will lose project state so we don’t want to do that.
2018-10-22 17:38:35 -04:00
Paul Kaplan
c289ce72d1 Use parent_id and commentee_id the right way when posting comments.
The parent_id is the top-level-parent, the commentee_id is the user to whom the comment is directed , the one that is mentioned in @ reply.
2018-10-22 14:35:42 -04:00
picklesrus
d4a050a1c0 Remove duplicate message 2018-10-22 08:57:22 -04:00
picklesrus
ad564b4ea4 Redo the credits page.
See https://github.com/LLK/scratch-www/issues/2093 for details.
2018-10-21 14:57:12 -04:00
Benjamin Wheeler
a6409bbcce
Pass to and receive from GUI info about project creation lifecycle; handle url changes (#2197)
* add canSaveNew prop to pass to GUI

* pass to and receive from GUI info about project lifecycle

* reset project data or fetch new project data depending on updates received from gui

* removed canSaveNew

* projectId always a string

* moved handleUpdateProjectId calls that fetch or set project metadata into componentDidUpdate

* changed page history object

* removed comments

* two small fixes to deal with edge cases

* cleaning up getExtensions
2018-10-19 16:02:59 -04:00
Paul Kaplan
8acbf05b1a
Merge pull request #2211 from paulkaplan/fix-studio-modal
Connect the consolidated studio data directly
2018-10-19 10:44:32 -04:00
chrisgarrity
b0a5f7feff
Merge pull request #2183 from sehgalvibhor/character-fix
Japanese Character Fix
2018-10-19 09:12:53 -04:00
Paul Kaplan
f9f662a3f3
Merge pull request #2206 from paulkaplan/staff-comments
Add * to comments from staff on preview
2018-10-19 08:55:41 -04:00
apple502j
9cb2c34a1d
Merge branch 'develop' into add-parents 2018-10-19 21:14:57 +09:00
apple502j
43238c4bca
FAQ link fix 2018-10-19 21:13:27 +09:00
Paul Kaplan
35abd285df Connect the consolidated studio data directly
To the modal to prevent constantly updating. Also only render the modals if they are visible
2018-10-18 16:45:24 -04:00
Paul Kaplan
f3b9826fd5
Merge pull request #2208 from paulkaplan/fix-load-more
Use top level + replies count to control "Load More" comments button
2018-10-18 13:19:10 -04:00
Paul Kaplan
4f6f7502ae
Use scratchteam instead of is_staff 2018-10-18 13:09:43 -04:00
Paul Kaplan
61947f2390
Use scratchteam instead of is_staff 2018-10-18 13:09:08 -04:00
Paul Kaplan
066e5ff141 Use top level + replies count to control "Load More" comments button
This fixes an issue where a project with one top-level comment and one reply would should the "Load more" button at the bottom, even though there were no more to load
2018-10-18 11:42:10 -04:00
Paul Kaplan
1d3c3ff431 Use EmojiText component to allow emoji display when API includes them 2018-10-18 10:18:00 -04:00
Paul Kaplan
c257379846 Add * to comments from staff on preview
This requires the API to include the `is_staff` flag, but it will not change functionality if it is not there, everyone would be considered not staff, which is the current behavior.
2018-10-18 10:14:42 -04:00
Paul Kaplan
d982d2d723 Show the username of the person being replied to in a comment on preview 2018-10-18 10:11:51 -04:00
Paul Kaplan
312a9e2bff Restrict reporting comments to logged in users 2018-10-17 13:19:46 -04:00
Paul Kaplan
7b514344fa Allow admins access to comment delete 2018-10-17 13:16:41 -04:00
Paul Kaplan
242f01118b Add missing status message for comments 2018-10-17 11:56:43 -04:00
Ray Schamp
cd0fb08045 Change conditional rendering to be consistent 2018-10-17 11:21:52 -04:00
Paul Kaplan
2ac90315ea Use can prefix instead of undefined callback 2018-10-16 15:09:10 -04:00
Paul Kaplan
1965a1223d Fix sass lint 2018-10-16 15:08:01 -04:00
Paul Kaplan
7772e197c7 Make comment deleting and restoring correctly update replies 2018-10-16 15:08:01 -04:00
Paul Kaplan
592c0e5703 Add restore functionality to comments for admins 2018-10-16 15:08:00 -04:00
Paul Kaplan
b0ac4018ee Use admin routes to include all comments when loading page 2018-10-16 15:08:00 -04:00
Paul Kaplan
b7b7b079b9 Combine comment reported and deleted flags into visibility string
To prepare for server including visibility
2018-10-16 15:08:00 -04:00
sjgllghr
6d8235c7e8 Fix gh-2156: Use variables for media queries for consistency (#2182)
* use variables for media queries

* add medium-and-intermediate media query variable
2018-10-16 13:28:41 -04:00
Paul Kaplan
effbfbeaff
Merge pull request #2196 from paulkaplan/share-banner
Make share banner work on preview
2018-10-16 13:21:16 -04:00
Paul Kaplan
9ce79deac6 Control visibility externally and fix css 2018-10-16 13:02:22 -04:00
Paul Kaplan
21a7f1227e Make share banner actually share projects 2018-10-16 11:38:26 -04:00
Benjamin Wheeler
4124e26588
set explicit capabilities like “can____” for GUI and project page (#2187)
* set explicit capabilities like “can____” for GUI and project page

* set canShare to proper value instead of hardcoding it

* don't tell gui canReport
2018-10-16 10:49:35 -04:00
Paul Kaplan
29a6a27f46
Merge pull request #2173 from paulkaplan/comment-i10n
Localize all the comment related strings
2018-10-16 10:04:06 -04:00
Paul Kaplan
bb71bd706a
Merge pull request #2190 from paulkaplan/move-report-to-api
Use the proper API route for reporting projects
2018-10-16 10:03:43 -04:00
Paul Kaplan
95d088f56a
Merge pull request #2191 from paulkaplan/fix-delete-comment
Fix comment delete endpoint
2018-10-16 10:03:26 -04:00
Benjamin Wheeler
9106a14340
made account menu have min-width, changed max-width to rem from px (#2181) 2018-10-15 16:00:47 -04:00
Paul Kaplan
cef36682fd Fix comment delete endpoint 2018-10-15 15:24:20 -04:00
Paul Kaplan
85f13935b3 Use the proper API route for reporting projects 2018-10-15 11:17:40 -04:00
Robert Chen
24d07f6139 Fix gh-2160: Search with % (#2161)
* Fixed turning '+' into ' '

* Fixed issue 2160

* Added space before '{'
2018-10-15 09:36:05 -04:00
apple502j
ec1d46eef6 Parents Page fix 2018-10-15 19:51:57 +09:00
apple502j
4845b5af3e l10n 2018-10-15 19:51:46 +09:00
Vibhor Sehgal
1ae8180aa4 Fix Select Menu in Messages Section (#2179)
* Fix width for Select in Message Section

* Removed extra CSS property

* Removed Margin property; Not required

* Fix for the CI test
2018-10-15 06:48:29 -04:00
apple502j
972ae72a61 Parents Page SCSS 2018-10-15 18:18:04 +09:00
apple502j
1481bba310 Parents Page! 2018-10-15 18:17:43 +09:00
apple502j
7bf2c6d7e3 l10n 2018-10-15 18:17:31 +09:00
apple502j
38c85f559d Routes config 2018-10-15 18:16:17 +09:00
Vibhor Sehgal
56f7cf06ea Thumbnail Fix 2018-10-14 14:54:11 +05:30
Vibhor Sehgal
d9018185e7 Japanese Character Fix 2018-10-14 13:28:48 +05:30
Paul Kaplan
231e9c6d89 Internationalize strings in compose-comment 2018-10-12 09:16:27 -04:00
Paul Kaplan
9e1741f883
Merge pull request #2174 from paulkaplan/fix-comment-replying
Prevent replying when comments are turned off
2018-10-12 09:11:34 -04:00
Benjamin Wheeler
d5343dfb01
fix ReactModal bodyOpenClassName error so that it is entirely omitted, rather than passing null value (#2176) 2018-10-11 16:58:30 -04:00
Paul Kaplan
600ba29933 Prevent replying when comments are turned off 2018-10-11 11:54:58 -04:00
Paul Kaplan
1f8342b987
Merge pull request #2164 from paulkaplan/comment-report-delete
Comment report action and modal flow for deleting
2018-10-11 11:08:07 -04:00
Paul Kaplan
57408e46af Fix scss name order 2018-10-10 15:29:30 -04:00
Paul Kaplan
086012f802 Add comment toggling 2018-10-10 15:14:53 -04:00
Benjamin Wheeler
8b222f0466
fix base modal prop passed to ReactModal (#2165) 2018-10-10 14:08:59 -04:00
Paul Kaplan
c535f8e731 Update report route to match newest API update 2018-10-10 14:01:14 -04:00
Paul Kaplan
6b4e0595d0 Use gray for deleted, red for reported 2018-10-10 11:25:16 -04:00
Paul Kaplan
c19adee84a Fix internationalization 2018-10-10 11:15:09 -04:00
Paul Kaplan
237c6ecb55 Add parens for clarity 2018-10-10 09:17:18 -04:00
Paul Kaplan
997d0b5694 Fix css for report and delete comment styles 2018-10-10 09:13:21 -04:00
Paul Kaplan
ce84dddc34 Fix proptype warning for project id 2018-10-09 11:38:34 -04:00
Paul Kaplan
bdde34ba26 Implement report action with modal flow 2018-10-09 11:38:24 -04:00
chrisgarrity
32aa3e66d4
Merge pull request #2153 from LiFaytheGoblin/2133/move-media-queries-to-frameless
Move media queries used in responsive project page to frameless
2018-10-09 10:56:11 -04:00
chrisgarrity
47f71c2758 Fix confict resolution error
I missed one of the changes when resolving conflicts.
2018-10-09 10:24:02 -04:00
Paul Kaplan
c622d52396 Pass the topLevelCommentId to make sure nested comment deleting works 2018-10-09 10:16:35 -04:00
Paul Kaplan
e29caceb6b
Merge pull request #2150 from paulkaplan/new-comment
Add comments to projects and replies to comments
2018-10-09 10:02:17 -04:00
Benjamin Wheeler
341428ce50
storage.js can use PROJECT_HOST env setting (#2146) 2018-10-09 09:59:04 -04:00
Paul Kaplan
58ab51a629 Add messages for other rejected comment reasons 2018-10-09 09:36:42 -04:00
Paul Kaplan
9b122470f5 Fix formatting from review comments 2018-10-09 09:36:42 -04:00
Paul Kaplan
24fe4fef65 Use topLevelCommentId to simplify adding and deleting comments
This fixes the nested comment deletion problem: https://github.com/LLK/scratch-www/issues/2151
2018-10-09 09:36:41 -04:00
Paul Kaplan
744c90501e Add comments to projects and replies to comments 2018-10-09 09:36:41 -04:00
chrisgarrity
7af2c8a80a
Merge branch 'develop' into 2133/move-media-queries-to-frameless 2018-10-09 09:12:58 -04:00
Ray Schamp
ab08aa4281
Merge pull request #2152 from LiFaytheGoblin/2133/subactions-share-date-as-prop
[new project page] share date is passed as a prop to subactions component
2018-10-08 21:35:38 +01:00
Ray Schamp
3f5f224a76
Merge pull request #2107 from LiFaytheGoblin/responsive-project-page/container-width
Make container smaller for mobile to allow for space left and right
2018-10-08 18:13:40 +01:00
Linda
14741e1cb8 if the report or add to studio modals are open, don't switch to fulls… (#2145)
* if the report or add to studio modals are open, don't switch to fullscreen on orientationchange landscape

* fix linting errors
2018-10-05 18:00:52 -04:00
Linda
d358c45482 media queries used in responsive project page have been moved to frameless.css 2018-10-05 10:25:56 -04:00
Linda
8db5216f17 share date is passed as a prop to subactions 2018-10-05 09:15:09 -04:00
Linda
bf3977821a fixed linting errors 2018-10-04 10:51:26 -04:00
Linda
ad1531aff3 fixes to spacing around page content and a few other fixes 2018-10-04 10:41:10 -04:00
Linda
502ead072f Merge branch 'develop' into responsive-project-page/container-width 2018-10-04 10:25:48 -04:00
Linda
79afc55f26
Merge pull request #2108 from LiFaytheGoblin/responsive-project-page/modals
Make modals responsive
2018-10-04 10:23:35 -04:00
Linda
8476cd3152 solution from before was not working if combined with current develop branch 2018-10-04 09:47:28 -04:00
Paul Kaplan
24e1c92b74
Merge pull request #2141 from paulkaplan/comment-delete
Add comment deleting for project owners on preview
2018-10-03 16:26:50 -04:00
Linda
27d7a3bf59
Merge pull request #2135 from LiFaytheGoblin/responsive-project-page/header
Make header of new project page look good on mobile
2018-10-03 15:41:03 -04:00
Linda
1aa30fb10b
Merge pull request #2136 from LiFaytheGoblin/responsive-project-page/see-inside-remix-buttons
New project page: See inside and remix buttons disappear on mobile
2018-10-03 15:40:47 -04:00
Paul Kaplan
a3f1ccc132 Fix sass-lint 2018-10-03 14:00:56 -04:00
Paul Kaplan
24b456873b Add comment deleting for project owners 2018-10-03 13:31:54 -04:00
Linda
fc57218066 fix linting errors 2018-10-03 11:12:56 -04:00
Linda
a3df002b49 resolve mergin issues 2018-10-03 11:03:18 -04:00
Linda
437334b872 resolve merging conflicts 2018-10-03 10:54:53 -04:00
Linda
193a4ac70a
Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons 2018-10-03 10:45:10 -04:00
Linda
38b8e2e97e on mobile, remix credit is still a flex row 2018-10-03 10:32:12 -04:00
Linda
f11d338d65 text gets vertically centered 2018-10-03 10:29:45 -04:00
Linda
57e147e110 remove commented out css 2018-10-03 10:09:44 -04:00
Linda
8009978c06 fixed linting errors 2018-10-03 10:09:44 -04:00
Linda
6f5b5c3278 extract css for new components and make some fixes to validation in report modal 2018-10-03 10:09:44 -04:00
Linda
5832969912 fixed linting errors 2018-10-03 10:09:44 -04:00
Linda
0895719f36 subactions getting own component 2018-10-03 10:09:44 -04:00
Linda
d85ca5d755 subactions getting their own component 2018-10-03 10:05:21 -04:00
Linda
b4a4ded822 share date positioning on small screens 2018-10-03 09:59:15 -04:00
Linda
8b10f3cba4 made project stats and action buttons responsive 2018-10-03 09:58:01 -04:00
Linda
2408568dda Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons 2018-10-02 17:03:18 -04:00
Linda
a525e09cf6 Merge branch 'develop' into responsive-project-page/header 2018-10-02 16:59:01 -04:00
Linda
d0257ae43d
Merge pull request #2105 from LiFaytheGoblin/responsive-project-page/landscape-player
If in landscape format on mobile, switch to fullscreen mode
2018-10-02 16:38:57 -04:00
Linda
f55dd02665 never mind screen.orientation 2018-10-02 15:42:29 -04:00
Linda
06bb9c60c4 fixed problem where sometimes there would be two scrollbars 2018-10-02 15:33:15 -04:00
Linda
b03bd51f79 fixed linting error 2018-10-02 13:57:41 -04:00
Linda
7c8fdbfcc3 fixed height of studio buttons scrolling container to fill all modal 2018-10-02 13:49:56 -04:00
Linda
a0b190aa87
Merge pull request #2118 from LiFaytheGoblin/responsive-project-page/notes-section
Made project notes look better on mobile
2018-10-01 19:30:36 -04:00
Linda
3432d95cdb
Merge pull request #2117 from LiFaytheGoblin/responsive-project-page/comments
Made comments look better on mobile
2018-10-01 19:30:25 -04:00
Linda
ef1b7d8f9f checking for landscape browser proof 2018-10-01 16:58:05 -04:00
Linda
d5641daae6 improve solution for spacing in container and used desktop variable instead of hardcoded value 2018-10-01 13:56:11 -04:00
Linda
f1738ca384 improved the code stylewise 2018-10-01 09:52:50 -04:00
Linda
3010db684d
Merge pull request #2116 from LiFaytheGoblin/responsive-project-page/thumbnailcolumns
Thumbnailcolumns appear at bottom on mobile
2018-09-28 13:57:24 -04:00
Linda
ec067778f2
Merge pull request #2099 from LiFaytheGoblin/2067/project-page/comments-fade-out-safari
Made comments fade out look nice in Safari too
2018-09-28 13:57:11 -04:00
Ray Schamp
5278e77e0c
Merge pull request #2098 from chen-robert/gh1930-teacher-register-year
Fix gh-1930: Teacher registration dates
2018-09-28 10:58:26 -04:00
Linda
50c7eb9bfd added todo 2018-09-27 10:31:32 -04:00
Ray Schamp
1ad9a95a3d Add placeholder share handler
Having the `onShare` prop defined to a function enables the button in the GUI
2018-09-26 21:42:44 -04:00
Linda
e014906125 linting fixes 2018-09-26 17:26:19 -04:00
Linda
3d67488b29
Merge pull request #2106 from LiFaytheGoblin/responsive-project-page/extension-buttons
Extension buttons are responsive
2018-09-26 17:19:38 -04:00
Linda
fa049d79fc
Merge pull request #2112 from LiFaytheGoblin/2104/remove-mod-pos-from-jobs
Removed moderator position from jobs page
2018-09-26 17:19:14 -04:00
Linda
32ab0202bc made project notes look better on mobile 2018-09-26 17:16:17 -04:00
Linda
b5a49e6cf2 linting fixes 2018-09-26 16:45:42 -04:00
Linda
c18a073e17 some fixes 2018-09-26 16:39:37 -04:00
Linda
532e201f53 made comments roughly responsive 2018-09-26 16:36:48 -04:00
Linda
cc57d0f206 removed stuff that doesn't belong into this pr 2018-09-26 15:01:25 -04:00
Linda
4f3d77f42a some fixes and adapted remix and studio thumbnails 2018-09-26 14:55:17 -04:00
Linda
a4e7ee35e4 adapted show and remix button to mobile 2018-09-26 14:54:33 -04:00
Linda
4299afaec5 fixes to warning and thumbnailcolumns for mobile WIP 2018-09-26 14:35:36 -04:00
Robert Chen
a94b9d6c84 Fix gh-1934: Search bar special chars (#2075)
* Fixed Issue 1934

The text was encoded once already by the search bar. That means we need to decode it twice in order to decode special characters.

* Rewrote search query parsing
2018-09-26 14:16:56 -04:00
Linda
7465c2e85a removed sth that isn't part of the title issue 2018-09-26 12:02:00 -04:00
Linda
6445c7471e some fixes and adapted remix and studio thumbnails 2018-09-26 11:52:32 -04:00
Linda
6b2ddcd217 adapted title area for mobile 2018-09-26 11:48:29 -04:00
Linda
89aaaab4d3 removed moderator position from jobs page 2018-09-26 10:24:53 -04:00
Linda
35194803b4 fixed linting errors 2018-09-25 16:06:46 -04:00
Linda
a5d2ee18ef fixed validation message for modals 2018-09-25 15:58:10 -04:00
Linda
d061e2afe9 improve responsiveness for project page modals and also clean up the modals a bit 2018-09-25 15:40:27 -04:00
Linda
55cdeea04d wip refactored and responsive project page modals 2018-09-25 15:37:52 -04:00
Linda
f1c6f6c223 fixed linting errors 2018-09-25 15:31:31 -04:00
Linda
4983fb3f8c solution for container size for screen size between tablet and 942 according to design 2018-09-25 15:21:26 -04:00
Linda
51bb905381 extensions appear on correct place depending on media query 2018-09-25 15:04:31 -04:00
Linda
d066e73b91 extensions buttons made responsive 2018-09-25 14:49:37 -04:00
Linda
56f1b80f24 if in landscape format on mobile, switch to fullscreen mode 2018-09-25 14:36:34 -04:00
Benjamin Wheeler
eb9abd23a0
fixed errors in splash page that appear in develop (#2077) 2018-09-25 00:52:23 -04:00
Benjamin Wheeler
935eb0b15f
move login/registration functions and view state to session reducer, pass to gui (#2078)
* move login/registration functions and view state to session reducer, pass to gui

* navigation reducer handles login; gui passed renderLogin function

* put back in join class to make smoke tests keep working
2018-09-24 11:04:30 -04:00
Linda
a160180245 added transparent for ui primary for cross browser support to colors css 2018-09-21 13:26:49 -04:00
Linda
c047612d68
Merge pull request #2083 from LiFaytheGoblin/2082/project-page/project-notes-alignment
Fix notfications box, player box, buttons and icons alignments
2018-09-21 10:03:58 -04:00
Linda
0d894e3208 convention of writing hsl is with percentages 2018-09-21 09:57:49 -04:00
Linda
8bc158118e fixed color gradiant display in Safari 2018-09-21 09:53:58 -04:00
Robert Chen
86551baa94 Fixed Issue 1930 2018-09-20 22:15:24 -07:00
Linda
f721c9591a Ok, css that doesn't work in all browsers is not an option... 2018-09-20 10:33:00 -04:00
Linda
c9b2306827 removed some stuff that is not needed anymore 2018-09-19 16:17:14 -04:00
Linda
a9872a14ff fixed problem that occured with remix credits 2018-09-19 15:03:20 -04:00
Linda
d0d7bba70e
Merge pull request #2079 from LiFaytheGoblin/2065/title-too-long-warning
Implemented design for title-too-long-warning
2018-09-18 13:20:13 -04:00
Linda
42f0ed16e5
Merge pull request #2073 from LiFaytheGoblin/2005/animate-add-to-studio-buttons
Animate add-to-studio-buttons on preview project page
2018-09-14 12:28:44 -04:00
Linda
0a50c1fb34 align notes box and player box on same y pos and align buttons and icons below notifications and player at same y pos 2018-09-13 14:58:00 -04:00
Linda
497aae2a3c convention fixes 2018-09-13 11:04:14 -04:00
Linda
35558bfdba fixed linking problems 2018-09-13 10:49:59 -04:00