Commit Graph
3863 Commits
Author SHA1 Message Date
chrisgarrity 38218cb5ba Don’t reload default project when id doesn’t change
Fixes the issue where the default project reloads when the locale changes.

Why is SET_PROJECT_ID getting dispatched on locale change?
2018-10-30 10:09:07 -04:00
Paul Kaplan d4553f3809 Merge pull request #3544 from LLK/smoke
Deploy October work to Beta
2018-10-29 11:48:56 -04:00
Paul Kaplan 5314426203 Merge pull request #3523 from ericrosenbaum/feature/spicy-beefers-hack
Hack to load a starter project for a specific tutorial
2018-10-29 11:01:55 -04:00
Eric Rosenbaum 319e326e00 Hack to load starter project for CN tutorial 2018-10-29 11:00:16 -04:00
Paul Kaplan 0a78bebd97 Merge branch 'master' into smoke 2018-10-29 10:48:05 -04:00
chrisgarrity 0785ffaa10 Merge pull request #3532 from chrisgarrity/issue/fix-ie-intl
Restore IntlProvider for Internet Explorer
2018-10-29 09:59:25 -04:00
chrisgarrity 03415086da Restore IntlProvider for Internet Explorer
GUI includes its own Intl provider (react-intl supports nested intl providers) that works within the www intl provider.

Restore the app-state provider intl provider and app-stat-hoc for the stand-alone gui so that IE can function enough to put up the unsupported browser.
2018-10-26 21:06:50 -04:00
Benjamin Wheeler 292ac7a469 Merge pull request #3529 from benjiwheeler/ensmallen-npm
Don't publish playground or test files to npm
2018-10-26 13:54:10 -04:00
Ray Schamp a1ca4768b3 Don't publish playground or test files to npm
The package is too large to publish to NPM. These aren't necessary for other packages using scratch-gui as a module.
2018-10-26 13:51:48 -04:00
Ray Schamp 6fa90a51ff Merge pull request #3526 from rschamp/hotfix/record-sound
[Smoke] Fix typo accessing storage in record modal
2018-10-26 17:00:28 +01:00
Ray Schamp e4f41c899d Fix typo accessing storage in record modal 2018-10-26 16:57:32 +01:00
Ray Schamp 13ce9a6f6b Merge pull request #3521 from rschamp/hotfix/tutorial-names
[Smoke] Use names for tutorial URL ids
2018-10-25 19:47:51 +01:00
Ray Schamp 22f0fd8af4 Map some of the 2.0 tutorial ids 2018-10-25 19:38:31 +01:00
Ray Schamp 3b90ac207b Return early if no query param
This prevents a tutorial with no urlId being returned in the case of no tutorial query param

Nice catch @kchadha!
2018-10-25 19:22:16 +01:00
Ray Schamp e2d5a88549 Use names for tutorial URL ids 2018-10-25 18:07:12 +01:00
Andrew Sliwinski 79a43cc281 Merge pull request #3515 from LLK/develop
Merge to Smoke Branch
2018-10-25 10:28:32 -04:00
Andrew Sliwinski ab25a6ca33 Merge pull request #3514 from carljbowman/develop
Update tutorial and close icons
2018-10-25 10:00:43 -04:00
Andrew Sliwinski 628f362494 Merge branch 'smoke' into develop 2018-10-25 09:59:44 -04:00
Andrew Sliwinski 9d352de470 Merge pull request #3506 from LLK/greenkeeper/scratch-l10n-3.0.20181024221158
Update scratch-l10n to the latest version 🚀
2018-10-25 09:42:02 -04:00
Andrew Sliwinski bf5f30de4a Merge branch 'develop' into greenkeeper/scratch-l10n-3.0.20181024221158 2018-10-25 09:41:48 -04:00
Andrew Sliwinski f3813427ab Merge pull request #3513 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1540417094
chore(package): update scratch-blocks to version 0.1.0-prerelease.154…
2018-10-25 09:35:08 -04:00
carljbowman 9132c2cad0 Update tutorial and close icons
Adjusted the hierarchy of these icons. Close icon is now smaller and less prominent.
2018-10-25 09:29:28 -04:00
Ray Schamp 99caafa4d0 Merge pull request #3491 from rschamp/storage-no-cache
Use assets stored in the vm instead of storage
2018-10-25 11:13:41 +01:00
Ray Schamp 67722bb94e Update scratch-vm
This version is needed to work with the other storage changes made to GUI
2018-10-25 11:04:25 +01:00
Ray Schamp 5be07124a3 Fix merge error
Good catch @kchadha!
2018-10-25 11:03:16 +01:00
Ray Schamp d52aba0b4e Rename cacheAsset to better reflect what it does 2018-10-25 11:03:16 +01:00
Ray Schamp 60ca790b69 Lint 2018-10-25 11:03:16 +01:00
Ray Schamp e331232b00 Retrieve assets from the VM rather than storage 2018-10-25 11:03:16 +01:00
Ray Schamp 1a0bf07ea6 Stop using builtinHelper.cache
And start just creating assets to hand to the VM. Towards https://github.com/LLK/scratch-vm/issues/1577
2018-10-25 11:03:16 +01:00
Ray Schamp f64243d553 Merge pull request #3505 from chrisgarrity/issue/fix-translation-issues
Add @babel/cli for generating translation strings
2018-10-25 10:20:22 +01:00
DD Liu f4a94b3715 chore(package): update scratch-render to version 0.1.0-prerelease.20181024220305 (#3507)
Closes #3504
2018-10-24 22:30:02 -04:00
greenkeeper[bot] 0c3bb0744c chore(package): update scratch-l10n to version 3.0.20181024221158 2018-10-24 22:18:39 +00:00
DD Liu 2035bd5781 chore(package): update scratch-paint to version 0.2.0-prerelease.20181024214759 (#3503)
Closes #3498
2018-10-24 18:10:00 -04:00
greenkeeper[bot] 49e68ea543 chore(package): update scratch-svg-renderer to version 0.2.0-prerelease.20181024192149 (#3496) 2018-10-24 17:52:06 -04:00
chrisgarrity f88d2b75f5 Add @babel/cli for generating translation strings 2018-10-24 17:47:14 -04:00
greenkeeper[bot] 3a49550217 chore(package): update scratch-blocks to version 0.1.0-prerelease.1540417094
Closes #3502
2018-10-24 21:40:41 +00:00
Andrew Sliwinski 52f050e789 Merge pull request #3497 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1540403722
chore(package): update scratch-blocks to version 0.1.0-prerelease.154…
2018-10-24 15:47:58 -04:00
greenkeeper[bot] a65c39a4f9 chore(package): update scratch-blocks to version 0.1.0-prerelease.1540403722
Closes #3494
2018-10-24 19:03:00 +00:00
Benjamin Wheeler 4ab73a77ee Merge pull request #3461 from benjiwheeler/remix
can remix, can save as copy; project state names are more consistent
2018-10-24 13:24:25 -04:00
Andrew Sliwinski 44daf84146 Merge pull request #3492 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1540395268
chore(package): update scratch-blocks to version 0.1.0-prerelease.154…
2018-10-24 12:58:11 -04:00
Andrew Sliwinski 3c01eb221b Merge pull request #3486 from ericrosenbaum/bugfix/unique-tutorial-ids
Make tutorial ids unique
2018-10-24 12:47:15 -04:00
Ben Wheeler 5f19b7e272 updated to conform to merged changes to error handling 2018-10-24 11:51:53 -04:00
Paul Kaplan e2f1e37e3a Merge pull request #3478 from LLK/tutorial-tags
Add tutorial filters and tags, and fix translated search in libraries
2018-10-24 11:45:58 -04:00
greenkeeper[bot] 718b703bbe chore(package): update scratch-blocks to version 0.1.0-prerelease.1540395268
Closes #3475
2018-10-24 15:42:32 +00:00
Ben Wheeler 80f4e01d47 remix and save as a copy functionality
made remixing, saving as copy states; made project state naming more consistent

changed meaning of canCreateNew to true creation

fixed project-saver-hoc test

removed Remix option from standalone player menu; renamed canSaveAsCopy to canCreateCopy

added parenthesis missing from rebase

fixed create new test
2018-10-24 11:29:35 -04:00
Benjamin Wheeler 4fd0019d5d Merge pull request #3436 from benjiwheeler/project-state-error
use project state error for project state related errors
2018-10-24 11:17:48 -04:00
Benjamin Wheeler 9b5139977b Merge pull request #3490 from benjiwheeler/connection-modal-quick-fix
added missing onOpenConnectionModal
2018-10-24 11:16:49 -04:00
Ben Wheeler 7b100b2582 added missing onOpenConnectionModal 2018-10-24 09:41:54 -04:00
Ray Schamp 886e5dcdff Merge pull request #3488 from LLK/greenkeeper/scratch-storage-1.1.0
Update scratch-storage to the latest version 🚀
2018-10-24 13:06:26 +01:00
greenkeeper[bot] 7bffc808be chore(package): update scratch-storage to version 1.1.0 2018-10-24 10:56:21 +00:00