Commit Graph
5021 Commits
Author SHA1 Message Date
Paul Kaplan ac0f004e5a Add error handling for the costumeUpload function 2019-02-13 15:07:17 -05:00
Paul Kaplan 324dc1717c Refactor to handle errors from file reader 2019-02-13 14:47:21 -05:00
Paul Kaplan 541c43482d Make sure to only close import alert after import is done 2019-02-13 10:27:54 -05:00
Paul Kaplan 7847f9e775 Show an "Importing..." alert during file import 2019-02-13 10:21:48 -05:00
Paul Kaplan ade61132a7 Merge pull request #4410 from nikhiljha/nj/ui-changes
Delete Preview Modal
0.1.0-prerelease.20190212142310
2019-02-12 09:20:57 -05:00
Paul Kaplan 4500c4f781 Remove more try-it steps 2019-02-12 09:05:05 -05:00
Paul Kaplan cae9d9a683 Merge branch 'develop' into nj/ui-changes 2019-02-12 09:04:31 -05:00
Paul Kaplan 9bef38e977 Remove try-it step from more integration tests 2019-02-12 08:53:28 -05:00
Paul Kaplan 773b8e28d4 Merge pull request #4526 from LLK/greenkeeper/scratch-l10n-3.1.20190211142555
Update scratch-l10n to the latest version 🚀
0.1.0-prerelease.20190211202530
2019-02-11 15:23:31 -05:00
Paul Kaplan 7563eddb2b Merge pull request #4509 from LLK/gif-upload
Gif upload v1: sprites, costumes
0.1.0-prerelease.20190211151422
2019-02-11 10:12:40 -05:00
greenkeeper[bot] b879fd412b chore(package): update scratch-l10n to version 3.1.20190211142555 2019-02-11 14:54:30 +00:00
Paul Kaplan 1d617214b4 Simplify disposal method handling 2019-02-11 09:28:16 -05:00
Ray Schamp e2113cf1e0 Merge pull request #4525 from rschamp/feature/push-tags
Tag NPM releases
0.1.0-prerelease.20190211142338
2019-02-11 09:22:30 -05:00
Paul Kaplan 3856fbc6c5 Tag NPM releases
Check if an NPM release just happened. And if so, tag the commit and push to GitHub.

Thanks to @paulkaplan for pairing on this
2019-02-11 09:18:43 -05:00
Nikhil Jha fb9c3eed74 Merge branch 'develop' into nj/ui-changes 2019-02-08 20:21:32 -08:00
Paul Kaplan b618f2493c Fix backdrop uploading from gif 2019-02-08 13:56:00 -05:00
Paul Kaplan 8dad7d8ec0 Remove extra parens 2019-02-08 13:45:30 -05:00
Paul Kaplan a18ea5a92c Name uploaded backdrops based on the name 2019-02-08 13:44:10 -05:00
Paul Kaplan d17824d7e3 Merge pull request #4517 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1549643185
Update scratch-blocks to the latest version 🚀
2019-02-08 13:38:41 -05:00
Paul Kaplan 474a00ed72 Merge branch 'develop' into greenkeeper/scratch-blocks-0.1.0-prerelease.1549643185 2019-02-08 13:38:27 -05:00
Ray Schamp 44cb5e8706 Merge pull request #4520 from LLK/prune-removal
Remove prune step from deployment for now
2019-02-08 13:38:24 -05:00
Paul Kaplan 0002f5181c Merge pull request #4515 from LLK/greenkeeper/scratch-l10n-3.1.20190207224638
Update scratch-l10n to the latest version 🚀
2019-02-08 13:38:02 -05:00
Paul Kaplan 7c1d720e17 Merge pull request #4485 from towerofnix/sort-of-variables
Sort variable options in "of" block
2019-02-08 13:37:27 -05:00
Ray Schamp a150bc99db Remove prune step from deployment for now
It doesn't affect greenkeeper subdirectories, which are the ones that cause the most issues. And now the prune step itself is breaking builds. So until it works better, remove this step.
2019-02-08 13:28:22 -05:00
Paul Kaplan b29862fc96 Merge pull request #4498 from mzgoddard/lazy-text-encoder
require text-encoding only if it is needed
2019-02-08 13:27:19 -05:00
Paul Kaplan 38fb199533 Merge pull request #4500 from mzgoddard/loading
Set an initial message number to skip rendering a second time
2019-02-08 13:25:54 -05:00
Paul Kaplan 232d6610ae Merge pull request #4519 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190207224121
chore(package): update scratch-vm to version 0.2.0-prerelease.2019020…
2019-02-08 13:24:50 -05:00
Paul Kaplan b0e2ea7d20 Merge pull request #4518 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20190208165820
chore(package): update scratch-render to version 0.1.0-prerelease.201…
2019-02-08 13:23:48 -05:00
Paul Kaplan 28635d8028 Remove namer from costume and sound upload helpers to reduce spaghetti 2019-02-08 13:18:57 -05:00
Paul Kaplan ba277a5238 Fix namer conventions to be less bizarre 2019-02-08 13:18:57 -05:00
Paul Kaplan 489467e63d Pass function for naming costumes, add integration tests 2019-02-08 13:18:57 -05:00
Paul Kaplan 88651e6e48 Gif upload v1: sprites, costumes 2019-02-08 13:18:57 -05:00
greenkeeper[bot] 5e3c251405 chore(package): update scratch-render to version 0.1.0-prerelease.20190208165820
Closes #4513
2019-02-08 16:59:54 +00:00
greenkeeper[bot] 41ba125641 chore(package): update scratch-blocks to version 0.1.0-prerelease.1549643185 2019-02-08 16:28:53 +00:00
Paul Kaplan da65b41366 Merge pull request #4499 from LLK/multi-upload
Multiple file upload for costumes, sounds, backdrops and sprites
2019-02-08 10:47:15 -05:00
greenkeeper[bot] 34be9ac23d chore(package): update scratch-l10n to version 3.1.20190207224638 2019-02-07 22:48:35 +00:00
greenkeeper[bot] e20566a242 chore(package): update scratch-vm to version 0.2.0-prerelease.20190207224121
Closes #4510
2019-02-07 22:43:57 +00:00
Paul Kaplan 65f9f7f16d Merge pull request #4512 from LLK/revert-4501-greenkeeper/scratch-render-0.1.0-prerelease.20190206213754
Revert "Update scratch-render to the latest version 🚀"
0.1.0-prerelease.20190207214203
2019-02-07 16:24:15 -05:00
Paul Kaplan 71a251448c Revert "Update scratch-render to the latest version 🚀" 2019-02-07 16:22:41 -05:00
Paul Kaplan a5c6e09e44 Merge pull request #4508 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190207191220
chore(package): update scratch-vm to version 0.2.0-prerelease.2019020…
0.1.0-prerelease.20190207194935
2019-02-07 14:38:17 -05:00
greenkeeper[bot] 89b5cdf7c1 chore(package): update scratch-vm to version 0.2.0-prerelease.20190207191220
Closes #4506
2019-02-07 19:18:54 +00:00
Paul Kaplan 83ad459c53 Merge pull request #4505 from paulkaplan/fix-asset-downloading
Use blob download instead of data-uri to enable large downloads
2019-02-07 11:57:14 -05:00
Paul Kaplan 50b14524b2 Get the asset type correctly 2019-02-07 11:56:03 -05:00
Paul Kaplan 0c261e5597 Use blob download instead of data-uri to enable large downloads
This was already being used for sb3s and sprite3s, but the code was repeated in different places. Make a single helper that downloads blobs, and make all download paths use it.
2019-02-07 11:44:34 -05:00
Paul Kaplan 4699667257 Merge pull request #4504 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190207134238
chore(package): update scratch-vm to version 0.2.0-prerelease.2019020…
0.1.0-prerelease.20190207141026
2019-02-07 08:56:15 -05:00
greenkeeper[bot] e725541e68 chore(package): update scratch-vm to version 0.2.0-prerelease.20190207134238
Closes #4503
2019-02-07 13:54:02 +00:00
Paul Kaplan 7edef6c4b7 Merge pull request #4501 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20190206213754
Update scratch-render to the latest version 🚀
2019-02-07 08:34:03 -05:00
chrisgarrity 8e1d7599b3 Merge pull request #4502 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1549534784
Update scratch-blocks to the latest version 🚀
2019-02-07 12:13:24 +01:00
greenkeeper[bot] 69ebefbf45 chore(package): update scratch-blocks to version 0.1.0-prerelease.1549534784 2019-02-07 10:46:40 +00:00
greenkeeper[bot] 1cb9ae9765 chore(package): update scratch-render to version 0.1.0-prerelease.20190206213754 2019-02-06 23:14:11 +00:00