scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 10:58:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3694 commits 216 branches 1 tag 480 MiB
Commit graph

3694 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
a2e46ea6ec
Merge pull request #2420 from rschamp/fix-props 
Fix lint issues
 2018-12-06 23:42:19 -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
c65ad06e91
Merge pull request #2419 from rschamp/admin-panel-only-admins 
Fix admin panel visibility and style
 2018-12-06 22:50:22 -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
Benjamin Wheeler
5235cb2ecc
Merge pull request #2408 from benjiwheeler/remix-cues 
Remix button progress spinner & banner message showing that user has remixed
 2018-12-06 16:01:49 -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
chrisgarrity
b9b90ae666
Merge pull request #2403 from chrisgarrity/issue/2399-fix-fastly 
Revised ?tip_bar= fastly rules
 2018-12-05 17:24:49 -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
chrisgarrity
84884bebf2 Revised ?tip_bar= fastly rules 
Added missing request condition
 2018-12-05 14:57:30 -05:00
Paul Kaplan
b481ae7fad Allow admins to see share banner 2018-12-05 13:39:18 -05:00
Paul Kaplan
a1d391bfe2
Merge pull request #2398 from LLK/revert-2373-issue/2236-tipbar-redirect 
Revert "Add tip_bar fastly config"
 2018-12-05 11:43:06 -05:00
Paul Kaplan
214b81cf6d
Revert "Add tip_bar fastly config" 2018-12-05 11:42:30 -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
87fd733615 Ensmallinate microbit header image 2018-12-04 14:59:09 -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
chrisgarrity
47a08e7dec
Merge pull request #2373 from chrisgarrity/issue/2236-tipbar-redirect 
Add tip_bar fastly config
 2018-12-04 07:28:58 -05:00
Kenny2github
06a38ca247 Redirect /info/cards route to /ideas 2018-12-04 10:47:14 +08:00