Commit graph

2222 commits

Author SHA1 Message Date
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
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
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
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
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
apple502j
653beccf4b
Don't refer to a section which does not exist 2019-02-09 15:25:12 +09:00
Eric Rosenbaum
d988534144 Update images 2019-02-07 14:25:43 -05:00
Eric Rosenbaum
777f0cca47 Initial draft of landing page 2019-02-06 11:54:30 -05:00
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
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
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
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
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
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
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
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
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
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
apple502j
21aaeacb5c Split sentences 2019-01-09 18:05:42 +09:00
Paul Kaplan
885977e554 Disable global handlers 2019-01-08 14:19:11 -05: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
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
Ben Wheeler
0ad5c977aa show link to view all remixes on project page 2019-01-03 18:50:19 -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
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
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
Andrew Sliwinski
4a4b8815e5 Remove "CappedNumber" from view count on project page. 2018-12-30 10:06:02 -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
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
dcb03a0526 Fix lint whitespace 2018-12-20 13:48:38 -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
picklesrus
e864055605 Fix some duplicates 2018-12-20 10:30:12 -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
picklesrus
54d9c202c2 change out the video 2018-12-19 14:13:30 -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
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
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
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
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
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
9f343fa662 Fix l10n-static ids 2018-12-13 11:01:25 -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
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
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
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
Eric Rosenbaum
43e7ec6ebf css lint and cleanup 2018-12-12 15:05:36 -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
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
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
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
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
e9d2d9bffa Add EV3 troubleshooting info about unpairing before reconnecting 2018-12-03 17:57:37 -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
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
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
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
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
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
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
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
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
picklesrus
4a66cc2e59 Fix code review comments. Got rid of a bunch of uncessary stuff. 2018-11-13 14:14:24 -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
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
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
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
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
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
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