Commit Graph
2437 Commits
Author SHA1 Message Date
apple502j cb8f14568f Block Vivaldi 2018-05-27 08:51:33 +09:00
Paul Kaplan 1c0ef2828a Merge pull request #2150 from kchadha/update-dependencies
Update scratch-vm and scratch-render
2018-05-25 09:47:40 -04:00
Karishma Chadha 17b581f7c4 Update scratch-vm and scratch-render 2018-05-25 09:43:26 -04:00
Paul Kaplan 27c1d45866 Merge pull request #2138 from paulkaplan/fix-touch-tooltips
Force the tooltips to close to fix touch devices
2018-05-25 08:55:46 -04:00
DD Liu d87f5ac733 Merge pull request #2147 from fsih/updateDeps
Update deps
2018-05-24 19:22:15 -04:00
DD 82e3be3fb0 Update deps 2018-05-24 18:55:24 -04:00
Ray Schamp b593f11e04 Merge pull request #1991 from rschamp/platform-bowser
Replace platform with bowser for browser detection
2018-05-24 16:44:05 -04:00
Paul Kaplan 70f56d0876 Merge pull request #2144 from SpeakkVisually/develop
Update Learning Activities
2018-05-24 16:21:32 -04:00
Paul Kaplan e6fe3d1e10 Merge pull request #2145 from paulkaplan/fix-error-boundary
Move error boundary out beyond the project loader
2018-05-24 16:03:08 -04:00
Paul Kaplan 623b382b50 Merge pull request #2146 from paulkaplan/fix-toolbox-refresh-after-tabbing
Fix toolbox refreshing for new variables after switching tabs
2018-05-24 16:02:56 -04:00
Paul Kaplan dbec9ccd55 Merge pull request #2131 from paulkaplan/username-block
Show username block in sensing
2018-05-24 15:18:25 -04:00
Andrew Sliwinski b365d3284f Merge pull request #2141 from thisandagain/feature/story
Add 'story' letters to libraries
2018-05-24 15:13:30 -04:00
Paul Kaplan 9fb23e92af Fix toolbox refreshing for new variables after switching tabs 2018-05-24 14:55:39 -04:00
Paul Kaplan ad1421bd37 Update scratch vm to include implementations for opcode 2018-05-24 14:34:04 -04:00
Paul Kaplan 46416c3585 Merge pull request #2133 from paulkaplan/backpack-component
Show a coming-soon backpack
2018-05-24 14:32:10 -04:00
Paul Kaplan 9be70ca2d0 Move error boundary out beyond the project loader 2018-05-24 13:41:15 -04:00
Paul Kaplan e0dbcf98b5 Fix integration test 2018-05-24 13:28:25 -04:00
Paul Kaplan daf9af110c Merge pull request #2130 from paulkaplan/draggable-assets
Make costume, sound and sprite tiles draggable.
2018-05-24 13:23:53 -04:00
Paul Kaplan a3cf0c73ba Merge pull request #2136 from paulkaplan/fix-default-backdrop
Make new default backdrop included in build
2018-05-24 13:21:44 -04:00
Paul Kaplan 729f7aa317 Fix linting 2018-05-24 13:15:19 -04:00
DD Liu b2f78615b5 Merge pull request #2143 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180523204456
chore(package): update scratch-paint to version 0.2.0-prerelease.2018…
2018-05-24 11:59:39 -04:00
Kristin Osiecki 8620c0ce1f Updates to Intro + other activities 2018-05-24 11:07:16 -04:00
Andrew Sliwinski 569ea2bfae Add 'story' letters to libraries 2018-05-24 10:02:41 -04:00
Eric Rosenbaum 2bbf8a8347 Merge pull request #2140 from ericrosenbaum/feature/legacy-sound-tags
Add sound library tags for legacy sounds
2018-05-23 20:33:22 -04:00
greenkeeper[bot] 8db3079158 chore(package): update scratch-paint to version 0.2.0-prerelease.20180523204456
Closes #1949
2018-05-23 22:24:54 +00:00
DD Liu 7cae0cd75a Merge pull request #2139 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180523195410
chore(package): update scratch-paint to version 0.2.0-prerelease.2018…
2018-05-23 18:13:21 -04:00
Eric Rosenbaum 1b0f96fa2c Add sound library tags for legacy sounds 2018-05-23 16:53:24 -04:00
Andrew Sliwinski 8ede87513b Merge pull request #2098 from thisandagain/feature/tags
Add tags to many sprites and sounds
2018-05-23 16:21:30 -04:00
greenkeeper[bot] ffe0c1298e chore(package): update scratch-paint to version 0.2.0-prerelease.20180523195410
Closes #1949
2018-05-23 19:54:30 +00:00
Paul Kaplan 2368823bb1 Force the tooltips to close to fix touch devices 2018-05-23 15:01:03 -04:00
Paul Kaplan 33c31fe997 Merge pull request #2076 from thisandagain/bugfix/1995
Fix default costume index for cat sprite
2018-05-23 14:53:38 -04:00
Paul Kaplan 94d0fa2ee8 Add a label for the username monitor 2018-05-23 14:19:58 -04:00
Paul Kaplan 12deeed7f9 Make new default backdrop included in build 2018-05-23 14:10:57 -04:00
Paul Kaplan d029836de7 Show a coming-soon backpack 2018-05-23 12:03:35 -04:00
Paul Kaplan 3a43162712 Show username block in sensing 2018-05-23 11:30:40 -04:00
Paul Kaplan c1c431e53e Merge pull request #2116 from paulkaplan/fix-list-monitor-typing
Do not clear list monitor input when reselecting
2018-05-23 11:24:05 -04:00
Paul Kaplan 6ee0a343ac Make costume, sound and sprite tiles draggable. 2018-05-23 11:12:06 -04:00
Paul Kaplan 71012e8e66 Make list test sensitive to "clicking clears the field" bug 2018-05-23 10:45:29 -04:00
Paul Kaplan fa75113351 Add integration test for list monitor.
Tests adding a list through the UI, the add <thing> blocks, the reported value and adding items using the monitor UI
2018-05-23 10:34:24 -04:00
Paul Kaplan 5096f13db3 Test changing monitor mode, prevent a regression we saw last week. 2018-05-23 10:34:18 -04:00
Paul Kaplan b41512d7b5 Fix state path from redux update 2018-05-23 10:28:59 -04:00
Paul Kaplan 9b6cd4fc63 Do not activate the already active list item 2018-05-23 10:08:55 -04:00
Paul Kaplan 1377e7b84c Merge pull request #2124 from paulkaplan/viewport-sizing
Force a min viewport size to scroll around the UI instead of breaking
2018-05-22 16:23:07 -04:00
chrisgarrity d92995217e Merge pull request #2083 from chrisgarrity/feature/refactor-gui-store
Feature/refactor gui store

Needed for https://github.com/LLK/scratch-www/issues/1874
2018-05-22 15:05:29 -04:00
Paul Kaplan da8a4af389 Reduce min height so that it barely fits 2018-05-22 14:49:10 -04:00
chrisgarrity afca67cee2 Fix the merge 2018-05-22 14:17:05 -04:00
Paul Kaplan 3006d23e28 Merge pull request #2123 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20180522141925
chore(package): update scratch-render to version 0.1.0-prerelease.201…
2018-05-22 12:49:13 -04:00
Paul Kaplan 1de7866960 Force a min viewport size to scroll around the UI instead of breaking 2018-05-22 12:46:31 -04:00
greenkeeper[bot] 2a660ca2a4 chore(package): update scratch-render to version 0.1.0-prerelease.20180522141925
Closes #2122
2018-05-22 14:21:16 +00:00
chrisgarrity 1b5cf4dac2 Fix merge conflicts
src/containers/blocks.jsx had changed referring to redux state that needed to be updated to use `state.scratchGui`
2018-05-22 10:00:21 -04:00