Commit Graph
4620 Commits
Author SHA1 Message Date
Karishma Chadha ba9d02f9df update scratch vm to pull in sb1 import 2018-12-20 15:45:40 -05:00
Karishma Chadha ea54953caf The file uploader file input should accept .sb files as well. 2018-12-20 15:44:01 -05:00
DD Liu 75d8ffbf00 Merge pull request #4171 from fsih/updateNewlines
Update deps to preserve spaces on stage
2018-12-20 15:40:13 -05:00
DD d80746bf67 Update preserve spaces on stage 2018-12-20 15:29:33 -05:00
Paul Kaplan 57e841b19b Merge pull request #4146 from paulkaplan/list-import
Implement list import and export from files
2018-12-20 13:35:54 -05:00
Paul Kaplan 6c9ae25159 Fix linting 2018-12-20 13:29:44 -05:00
Benjamin Wheeler d76b74e8d4 Merge pull request #4144 from benjiwheeler/library-history2
On modal mount, push history if current history state doesn't match this modal's id
2018-12-20 13:24:44 -05:00
Paul Kaplan ce7e65267d Merge pull request #4166 from paulkaplan/reduce-analytics-events
Reduce analytics events
2018-12-20 13:22:22 -05:00
Paul Kaplan 6fe27f7691 Remove the error logging to GA, augment Sentry with the action prop 2018-12-20 13:19:44 -05:00
Paul Kaplan 54eea42e15 Remove most of the analytics.pageview events, keeping the search queries 2018-12-20 13:19:24 -05:00
Paul Kaplan 4df56e41ca Include the action in the sentry report 2018-12-20 13:11:07 -05:00
Paul Kaplan 77fb9b67a7 Merge pull request #4165 from paulkaplan/use-new-sentry-api
Use new sentry API provided by www, and use analytics ID from www
2018-12-20 12:58:31 -05:00
Paul Kaplan 50a917280a Use new sentry API provided by www, and use analytics ID from www 2018-12-20 12:53:33 -05:00
Benjamin Wheeler 19f5b196bd Merge pull request #4160 from benjiwheeler/load-fonts-in-redux
refactored font loading state to be in redux
2018-12-20 10:00:37 -05:00
Paul Kaplan 80df9d6f13 Fix issue with undefineds in the CSV 2018-12-20 09:23:33 -05:00
Paul Kaplan fc28a7256d Add txt import so file can be imported/exported from symmetrically 2018-12-20 08:43:07 -05:00
Paul Kaplan 54c8588279 Merge pull request #4153 from paulkaplan/enfasten-remix
Make remixing/saving faster by marking all assets as clean to start.
2018-12-20 08:30:26 -05:00
Paul Kaplan ca7e4e5c7e Merge pull request #4157 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181219200003
Update scratch-vm to the latest version 🚀
2018-12-20 08:30:14 -05:00
Paul Kaplan ef43a17c1e Merge pull request #4156 from paulkaplan/only-trigger-saves-from-editor
Ignore projectChange updates from the VM when not in editor mode
2018-12-20 08:29:56 -05:00
Paul Kaplan 8f554a74e0 Merge pull request #4158 from paulkaplan/fix-unload-alert
Do not remove the window beforeunload handler in componentWillUnmount.
2018-12-20 08:29:17 -05:00
Ben Wheeler 8e075eb371 removed elementIsNotVisible, since it doesn't really work 2018-12-19 20:00:27 -05:00
Ben Wheeler 8a9996b247 refactored font loading state to be in redux 2018-12-19 19:45:38 -05:00
greenkeeper[bot] 4a2f22f728 chore(package): update scratch-vm to version 0.2.0-prerelease.20181219200003 2018-12-19 21:37:39 +00:00
Paul Kaplan c492602a9f Do not remove the window beforeunload handler in componentWillUnmount.
This is because when switching from project to editor view, this component gets unmounted and then remounted, but the componentDidMount seems to happen before the componentWillUnmount. Because it is dealing with a global variable, it is unsafe to always unset the beforeunload when unmounting.
2018-12-19 16:37:32 -05:00
Paul Kaplan c799541d8e Ignore projectChange updates from the VM when not in editor mode
This prevents unnecassary changes that do not matter to the player view because they were made by the project in progress (i.e. made by running the blocks, or by cloud var updates)
2018-12-19 16:02:31 -05:00
Paul Kaplan faadda3007 Make remixing/saving faster by marking all assets as clean to start.
They were not being marked as clean when loaded from the server, causing remixes that included only minimal (or no) changes to take a very long time as it waited for hundreds of network requests to resolve. Mark them as clean when loaded from the server so we know they do not need to be resaved
2018-12-19 15:11:30 -05:00
Paul Kaplan 8a19bab3b4 Merge pull request #4152 from ericrosenbaum/feature/add-city-and-bedroom-assets
Add city and bedroom assets
2018-12-19 14:25:52 -05:00
Paul Kaplan 28f6b5eb6e Merge pull request #4150 from ktbee/update-scratch-storage
Update scratch-storage package
2018-12-19 14:25:41 -05:00
Paul Kaplan 9b3c84737b Merge pull request #4151 from paulkaplan/show-error-id
Show error ID if available from Raven and report react errors
2018-12-19 14:16:58 -05:00
Eric Rosenbaum 8263a734ca Add city and bedroom assets 2018-12-19 13:55:22 -05:00
Paul Kaplan 5ed340c789 Fix typo 2018-12-19 13:51:52 -05:00
Paul Kaplan 40ca680e39 Show error ID if available from Raven 2018-12-19 13:39:56 -05:00
Eric Rosenbaum 6355abe0a8 Merge pull request #4149 from ericrosenbaum/bugfix/library-update-fixes
Sprite and costume library fixes
2018-12-19 13:38:57 -05:00
Eric Rosenbaum 0f83046f7d Zebrafixes 2018-12-19 13:28:33 -05:00
Eric Rosenbaum ba06a64e9d Fixilations 2018-12-19 13:20:03 -05:00
Eric Rosenbaum 2c7ffe9f3b Fixifications 2018-12-19 13:16:54 -05:00
Eric Rosenbaum 010078d8a7 Yet more fixes 2018-12-19 13:15:33 -05:00
Eric Rosenbaum 400fc676a9 More fixes 2018-12-19 13:14:34 -05:00
Chris Willis-Ford 0544641515 Merge pull request #4113 from cwillisf/isScratchDesktop
Add a helper function to check if GUI is running in Scratch Desktop
2018-12-19 10:00:51 -08:00
Christopher Willis-Ford af50ac76bf Remove ready check from isScratchDesktop()
This was intended as a safety check but it causes problems with some
tests.
2018-12-19 09:50:27 -08:00
Eric Rosenbaum 829616db44 Sprite and costume library fixes 2018-12-19 12:48:37 -05:00
Christopher Willis-Ford 75053b52d1 Don't use Object.keys() 2018-12-19 08:49:46 -08:00
Katie Broida 8f9793c331 Update scratch-storage package 2018-12-19 11:12:38 -05:00
Paul Kaplan aa253d7de0 Implement list import and export from files 2018-12-19 10:54:37 -05:00
Paul Kaplan b5b3f33f58 Merge pull request #4081 from paulkaplan/more-beefers
Make the requiredProjectId work with the online editor
2018-12-19 09:17:05 -05:00
Ben Wheeler 67074edb52 added back button test 2018-12-19 09:13:48 -05:00
Paul Kaplan 12ea49bc57 Open the editor view of the required project 2018-12-19 09:05:11 -05:00
Paul Kaplan 6647eb9174 Merge pull request #4115 from towerofnix/fix-touchevent-error
Fix "TouchEvent is not defined" error
2018-12-19 09:01:35 -05:00
Ben Wheeler 3f4e969810 push history on modal mount, if current history ref is not this same component id 2018-12-19 08:53:33 -05:00
Christopher Willis-Ford b9dc953ded Derive isScratchDesktop state from a GUI prop 2018-12-19 01:10:27 -08:00