scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-03 04:17:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
4300 commits 218 branches 1 tag 483 MiB
Commit graph

2786 commits

Author SHA1 Message Date
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