Commit Graph
2096 Commits
Author SHA1 Message Date
greenkeeper[bot] 2e80ef0506 chore(package): update scratch-paint to version 0.2.0-prerelease.20180426161647 2018-04-26 16:42:10 +00:00
Andrew Sliwinski 29d5619d93 Updates to preview modal for release (#1864)
* Updates to preview modal for release

* Design tweaks and remove import modal

* Resolve issues with tests

* Copy edits HT Eric

* Resolve lint issue with integration test

* One more change to the disclaimer language

* Add line break
2018-04-25 17:47:22 -04:00
Paul Kaplan beaf75a90c Merge pull request #1804 from LLK/greenkeeper/scratch-audio-0.1.0-prerelease.1523977528
Update scratch-audio to the latest version 🚀
2018-04-25 15:49:43 -04:00
Paul Kaplan 7d2e7b63ab Merge pull request #1871 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20180425181730
Update scratch-render to the latest version 🚀
2018-04-25 15:48:40 -04:00
Paul Kaplan 3dc42d2bbe Merge branch 'develop' into greenkeeper/scratch-audio-0.1.0-prerelease.1523977528 2018-04-25 15:21:50 -04:00
greenkeeper[bot] 28e5084937 chore(package): update scratch-render to version 0.1.0-prerelease.20180425181730 2018-04-25 18:18:14 +00:00
chrisgarrity 384edaadf4 Merge pull request #1860 from chrisgarrity/export-travis
Update travis to publish dist and build
2018-04-25 12:05:56 -04:00
kchadha 60cf7f1e5d Merge pull request #1836 from kchadha/costume-file-upload
Upload Costumes and Backdrops (vector and bitmap)
2018-04-25 11:49:51 -04:00
Karishma Chadha 7110eb0026 Refactoring and code cleanup. 2018-04-24 18:22:56 -04:00
Ray Schamp 69e242f051 Merge pull request #1858 from rschamp/feature/modal-back-button
Allow the back button to work with libraries
2018-04-24 16:25:01 -04:00
Ray Schamp 4eddee6732 Merge pull request #1862 from LLK/revert-1861-greenkeeper-pls/scratch-vm-0.1.0-prerelease.1524520946
Revert "Update scratch-vm"
2018-04-24 16:17:43 -04:00
Ray Schamp a7eaae88aa Revert "Update scratch-vm" 2018-04-24 16:16:44 -04:00
Ray Schamp 88e202a7fa Merge pull request #1861 from LLK/greenkeeper-pls/scratch-vm-0.1.0-prerelease.1524520946
Update scratch-vm
2018-04-24 15:40:08 -04:00
Ray Schamp 607e9a754c Update scratch-vm 2018-04-24 15:00:27 -04:00
Karishma Chadha 906f5406ac Rename fileUploader to match file naming conventions. 2018-04-24 13:37:07 -04:00
chrisgarrity a26d975577 Update travis to publish dist and build
build in production mode on travis
2018-04-24 13:06:52 -04:00
Karishma Chadha 164ed2bd4d Update package json. 2018-04-24 12:54:39 -04:00
Karishma Chadha 73cd5b3019 File uploading abstractions 2018-04-24 12:54:38 -04:00
Karishma Chadha 2bf417045e Add bitmap support to backdrop upload button. 2018-04-24 12:44:39 -04:00
Karishma Chadha 4c50363a55 Fixed svg thumbnails, some cleanup. 2018-04-24 12:44:39 -04:00
Karishma Chadha f2b398ae0e Bitmap upload -- mostly working, code needs cleanup. 2018-04-24 12:44:39 -04:00
Karishma Chadha f12718c25b Toggle upload button title based on whether the currently selected sprite is the stage or not. 2018-04-24 12:44:39 -04:00
Karishma Chadha a0cbb07ec0 Remove preventDefault which was preventing the input file browser from popping up 2018-04-24 12:44:39 -04:00
Karishma Chadha 1f0d0e7e5a Backdrop WIP 2018-04-24 12:44:39 -04:00
Karishma Chadha b8b92269df Handle SVG upload (with bitmap coming soon). 2018-04-24 12:44:39 -04:00
Karishma Chadha 3dbd69e682 Costume upload -- very early WIP 2018-04-24 12:44:39 -04:00
Ray Schamp 3c576a0110 Allow the back button to work with libraries
Push to history when the library mounts. Whenever popstate occurs after mounting, request to be closed.

Behavior captured in the `Modal` container. If we want to re-use this functionality for anything else that uses `ModalComponent`, just use the `Modal` container rather than `ModalComponent`.
2018-04-24 09:35:46 -04:00
Ray Schamp afbb63bacc Merge pull request #1841 from rschamp/bugfix/search-height
Make the library filter input full height
2018-04-24 09:27:07 -04:00
Ray Schamp c6bab0a0f1 Merge pull request #1842 from rschamp/bugfix/library-header-height
Account for filter bar in library grid height
2018-04-24 09:26:37 -04:00
Ray Schamp 5ff8cb4a42 Merge pull request #1843 from rschamp/feature/partial-tag-match
Partially match tags while filtering
2018-04-24 09:26:03 -04:00
kchadha 0115364131 Merge pull request #1846 from kchadha/custom-proc-shadows
Support new scratch-blocks API for translating custom proc mutations
2018-04-23 15:19:25 -04:00
Paul Kaplan 15d33ff838 Merge pull request #1851 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180423143518
Update scratch-paint to the latest version 🚀
2018-04-23 13:32:37 -04:00
greenkeeper[bot] 277bbffcdc chore(package): update scratch-paint to version 0.2.0-prerelease.20180423143518 2018-04-23 17:15:59 +00:00
Andrew Sliwinski ce48714d50 Merge pull request #1847 from thisandagain/bugfix/mindstorms
Make MINDSTORMS uppercase as per feedback from LEGO
2018-04-23 13:04:50 -04:00
Andrew Sliwinski e4e7e72a12 Make MINDSTORMS uppercase as per feedback from LEGO 2018-04-23 11:24:12 -04:00
Karishma Chadha e19d395b82 Update scratch-blocks version 2018-04-23 10:41:19 -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
Paul Kaplan 170eb4343c Make whole search clickable 2018-04-23 10:13:19 -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
Karishma Chadha 5419eda58d Support new scratch-blocks mutationToDom api. 2018-04-23 09:52:30 -04:00
Ray Schamp f9614f1996 Account for filter bar in library grid height
This prevents the fullscreen modal from being scrollable by removing extra height from the library
2018-04-21 14:20:33 -04:00
Ray Schamp e45ab420c2 Make the filter input full height
This way you can click anywhere to gain focus
2018-04-21 14:15:14 -04:00
Ray Schamp 9049f24b17 Search name and tags while filtering
Concatenate all the tags plus the library item name into one string and search for a match within that. This allows queries to partially match tags and library item names.

The `\n` delimiter is because my first choices of `' '` or `,` are typeable, and would end up matching everything.
2018-04-21 14:12:21 -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