Commit graph

3666 commits

Author SHA1 Message Date
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
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
Karishma Chadha
55db6f1dc6
Merge pull request #2378 from kchadha/has-cloud-permission
Track isScratcher status and pass hasCloudPermission flag to gui.
2018-12-03 17:01:31 -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
Paul Kaplan
0903f919e4
Merge pull request #2377 from LLK/paulkaplan-patch-1
Point scratch-gui dependency back to develop tag
2018-12-03 14:55:01 -05:00
Paul Kaplan
aa10db8cf6
Point scratch-gui dependency back to develop tag
This was accidentally changed to "latest" when the merge from @rschamp's latest hotfix to master was made.
2018-12-03 14:53:55 -05:00
Paul Kaplan
30eb06066c
Merge pull request #2372 from paulkaplan/es6-promise-polyfill
Add es6-promise polyfill to fix browsers lacking promise.finally
2018-12-03 13:53:07 -05:00
Ray Schamp
80cf7137b8
Merge pull request #2376 from LLK/hotfix/fix-adventure-game
[Develop] Add project data to adventure game tutorial
2018-12-03 13:28:46 -05:00
Ray Schamp
7d816ac5e7
Merge branch 'develop' into hotfix/fix-adventure-game 2018-12-03 13:28:27 -05:00
Ray Schamp
d89d9778d3
Merge pull request #2375 from LLK/hotfix/fix-adventure-game
[Master] Add project data to adventure game tutorial
2018-12-03 12:39:32 -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
chrisgarrity
39a3af8732 Add tip_bar fastly config
Add another section to the fastly config that will permanently redirect any URL with `tip_bar=` to a matching `tutorial=`
2018-12-03 09:47:26 -05:00
Paul Kaplan
ee4268af15 Add es6-promise polyfill to fix browsers lacking promise.finally
This fixes an issue where projects could not be loaded on Edge
2018-12-03 09:32:27 -05:00
Benjamin Wheeler
39f13b50ec
Merge pull request #2346 from benjiwheeler/share-message
Display green "Shared" banner after user shares; bring CSS into line with spec
2018-12-03 09:31:43 -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
chrisgarrity
f7d65f212c
Merge pull request #2371 from apple502j/patch-5
[Master] No localhost allowed on HoC Banner
2018-12-03 08:09:28 -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