Skip to content

Save 3.0 project JSON to the project server and assets to the assets server #3724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 15, 2018
Merged

Save 3.0 project JSON to the project server and assets to the assets server #3724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
079f702
Re-store cat SVGs from assets server
Nov 12, 2018
44d948b
Save project JSON and assets separately
Nov 5, 2018
8857652
Add some explanatory comments
Nov 12, 2018
71baad2
Bump scratch-vm to get vm.assets API
Nov 15, 2018
70a6222
Fix tests
Nov 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@

# File types which we know are binary

# Treat SVG files as binary so that their contents don't change due to line
# endings. The contents of SVGs must not change from the way they're stored
# on assets.scratch.mit.edu so that MD5 calculations don't change.
*.svg binary

# Prefer LF for most file types
*.frag text eol=lf
*.htm text eol=lf
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"scratch-render": "0.1.0-prerelease.20181102130522",
"scratch-storage": "1.2.0",
"scratch-svg-renderer": "0.2.0-prerelease.20181101210634",
"scratch-vm": "0.2.0-prerelease.20181114192419",
"scratch-vm": "0.2.0-prerelease.20181115103725",
"selenium-webdriver": "3.6.0",
"startaudiocontext": "1.2.1",
"style-loader": "^0.23.0",
Expand Down
82 changes: 41 additions & 41 deletions src/lib/default-project/09dc888b0b7df19f70d81588ae73420e.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading