Commit Graph
2055 Commits
Author SHA1 Message Date
Andrew Sliwinski e4e7e72a12 Make MINDSTORMS uppercase as per feedback from LEGO 2018-04-23 11:24:12 -04:00
Paul Kaplan 10f18ece8d Merge pull request #1833 from LLK/revert-1832-revert-1829-greenkeeper/scratch-paint-0.2.0-prerelease.20180420154430
Bring in the latest bitmap editor from scratch-paint
2018-04-23 10:16:05 -04:00
chrisgarrity 77e9498d4b Merge pull request #1448 from chrisgarrity/feature/untangle-redux
Export GUI for use on www!
2018-04-23 10:04:35 -04:00
Paul Kaplan 5b5c0013ed Merge pull request #1834 from paulkaplan/update-vm-mp3
Update the vm to include fixes for downloading imported sounds
2018-04-20 16:13:11 -04:00
Paul Kaplan b550f89a2c Update the vm to include fixes for downloading imported sounds 2018-04-20 16:12:30 -04:00
Paul Kaplan e7e3fcfb1e Revert "Revert bitmap paint editor PR for now" 2018-04-20 16:10:34 -04:00
Paul Kaplan 8fd6f7a3ac Merge pull request #1832 from LLK/revert-1829-greenkeeper/scratch-paint-0.2.0-prerelease.20180420154430
Revert bitmap paint editor PR for now
2018-04-20 16:10:01 -04:00
Paul Kaplan 32c82555c4 Revert "chore(package): update scratch-paint to version 0.2.0-prerelease.2018…" 2018-04-20 16:06:21 -04:00
Paul Kaplan 0963195125 Merge pull request #1821 from LLK/greenkeeper/chromedriver-2.38.0
Update chromedriver to the latest version 🚀
2018-04-20 13:15:19 -04:00
Paul Kaplan 80c28772e9 Merge pull request #1829 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180420154430
chore(package): update scratch-paint to version 0.2.0-prerelease.2018…
2018-04-20 13:11:58 -04:00
kchadha 8223bf0e7a Merge pull request #1830 from kchadha/update-scratch-vm
Update scratch-vm version.
2018-04-20 12:19:45 -04:00
Karishma Chadha 53658fb114 Use the right version number.. 2018-04-20 12:11:47 -04:00
Karishma Chadha 9b1ba2461e Update scratch-vm version. 2018-04-20 12:11:47 -04:00
Ray Schamp 74d2ff7c50 Merge pull request #1831 from rschamp/bugfix/library-filter-tweaks
Library tweaks
2018-04-20 12:10:35 -04:00
Ray Schamp a36ff212ea Final spacing and height tweaks with @carljbowman 2018-04-20 12:05:17 -04:00
Ray Schamp 0ce9524899 Show border while input is focused
This won't work on a lot of browsers, but temporarily just target modern ones. (Robust solution is possible using classNames and refs)
2018-04-20 12:04:53 -04:00
greenkeeper[bot] d4a94cf3f6 chore(package): update scratch-paint to version 0.2.0-prerelease.20180420154430
Closes #1760
2018-04-20 15:45:52 +00:00
Ray Schamp d9a561f3bb Merge pull request #1828 from gnarf/USE_HEADLESS
Add USE_HEADLESS=no npm run test:integration option
2018-04-20 11:38:09 -04:00
Corey Frang 987680d7de Add USE_HEADLESS=no npm run test:integration option 2018-04-20 10:49:12 -04:00
Ray Schamp 342ac4a244 Merge pull request #1824 from rschamp/feature/library-phase-ii
Libraries Phase II
2018-04-20 10:38:25 -04:00
Ray Schamp fa1e6c9333 Clip overflowed tags 2018-04-20 10:18:08 -04:00
Ray Schamp e943ba2d28 Fix back button in modals on Firefox
Thanks @towerofnix!
2018-04-20 09:48:39 -04:00
Ray Schamp 3601eacb1d Fix propType warnings
Including action-menu which was also giving one when the backdrop library opened.
Localize the costume library, I missed it while doing the other libraries.
2018-04-20 09:47:59 -04:00
Paul Kaplan 6f5686ba9b Merge pull request #1822 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1524163302
Update scratch-blocks to the latest version 🚀
2018-04-20 09:27:50 -04:00
Ray Schamp d1ae67b23b Update search placeholder string for tests 2018-04-19 17:34:14 -04:00
Ray Schamp 1e2de85438 Don't output allowed console messages during tests
They're spammy — happy to put this back but they were unhelpful while fixing tests IMO.
2018-04-19 17:33:52 -04:00
Ray Schamp c8e25b4192 Clear tags on filter query change 2018-04-19 16:01:43 -04:00
Ray Schamp 601b574cb8 Remove tag icons 2018-04-19 16:01:22 -04:00
greenkeeper[bot] 7b0c61ac11 chore(package): update scratch-blocks to version 0.1.0-prerelease.1524163302 2018-04-19 19:04:24 +00:00
Paul Kaplan eec7c7ba48 Merge pull request #1819 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1524157404
chore(package): update scratch-blocks to version 0.1.0-prerelease.152…
2018-04-19 14:41:36 -04:00
greenkeeper[bot] f2cd0d93e8 chore(package): update chromedriver to version 2.38.0 2018-04-19 18:38:36 +00:00
chrisgarrity 37aacc90f1 Handle intl prop correctly
The initial intl store expected an object with an `intl` key, not the intl object as returned by `injectIntl`.

Also changed GUI proptypes to accept Object as well as String for projectData to avoid warnings.
2018-04-19 14:38:14 -04:00
chrisgarrity d0f5998f8a handle projectId as prop
Update project-loader to look for project id as prop (i.e. from www), and fall back to hash.
2018-04-19 14:38:14 -04:00
chrisgarrity 8fc7d9462a Use absolute public path for static assets
Use absolute path when building library (production) so assets can be copied to /static in GUI consumer (like scratch-www)
2018-04-19 14:38:14 -04:00
chrisgarrity 55800bce4d Fix up localization after rebasing on LLK/develop 2018-04-19 14:38:14 -04:00
chrisgarrity 1264dfa047 Don’t set env to production for testing
playground and other test builds (e.g. blocks-only) are only in develop now.
2018-04-19 14:38:13 -04:00
chrisgarrity ca898cedcb Add documentation and fix lint 2018-04-19 14:38:13 -04:00
chrisgarrity c1d53b3599 Update build and move project-loader back to lib
- export image and sounds in dist/static/assets
- rename main export (`scratch-gui.js`, not `index.js`)
- move project-loader-hoc back to lib (VM doesn’t load properly without it)
2018-04-19 14:38:13 -04:00
chrisgarrity bc1e3ecbe0 reconfigure webpack
export Library if `NODE_ENV===‘production’`, otherwise export playground and examples.
2018-04-19 14:38:12 -04:00
chrisgarrity 924c2aefc0 Make Error Boundary into HOC
Don’t translate IE error modal, if there are errors during the `connect` process the `IntlProvider` doesn’t get set up and the error modal can’t be shown.
2018-04-19 14:38:12 -04:00
chrisgarrity a569a170f7 Move ErrorBoundary into playground 2018-04-19 14:38:11 -04:00
chrisgarrity b38807289a Export GUI as library 2018-04-19 14:38:11 -04:00
chrisgarrity fe1cb9585b Pass intl as prop to GUI
Allow intl to be passed in to GUI as a prop (rather than having to be already in the store)
2018-04-19 14:38:10 -04:00
Andrew Sliwinski 93d9b4a632 Merge pull request #1800 from thisandagain/bugfix/1739
Reorder and add default arguments to gt, lt, eq blocks
2018-04-19 14:37:51 -04:00
Andrew Sliwinski a18686d5da Merge pull request #1798 from thisandagain/bugfix/1797
Adjustments to string operator default arguments
2018-04-19 14:37:05 -04:00
Ray Schamp 6d0518532a Localize some things 2018-04-19 14:13:53 -04:00
Ray Schamp 32b10344cf Add sound tags
Thanks @ericrosenbaum!
2018-04-19 14:00:38 -04:00
Ray Schamp 6cf8c16021 Revert joke 2018-04-19 14:00:38 -04:00
Ray Schamp fc87a1e0e0 Implement tag filtering 2018-04-19 14:00:38 -04:00
Ray Schamp 1e8bca53fb Rearrange to use existing back icon 2018-04-19 14:00:38 -04:00