Christopher Willis-Ford
28cd140d9f
Cancel ScratchImage load if unmounted
2019-03-18 12:58:25 -07:00
Christopher Willis-Ford
5f6b89ec2a
Simplify unnecessarily complicated loop
2019-03-18 12:07:41 -07:00
Christopher Willis-Ford
1fd9a1f689
Merge branch 'develop' into load-library-images-through-storage
2019-03-14 11:49:47 -07:00
Chris Willis-Ford
33f3d1d79b
Merge pull request #4645 from cwillisf/add-telemetry-hooks
...
Add telemetry hooks
2019-03-14 10:47:59 -07:00
Christopher Willis-Ford
5051ba2105
Code review: remove dead code, clarify arg name
2019-03-14 10:35:39 -07:00
Paul Kaplan
551b7b98ce
Merge pull request #4652 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190314020908
...
chore(package): update scratch-vm to version 0.2.0-prerelease.2019031…
2019-03-14 08:03:48 -04:00
Paul Kaplan
a3e8dd1aab
Merge pull request #4651 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1552509492
...
Update scratch-blocks to the latest version 🚀
2019-03-14 08:03:06 -04:00
greenkeeper[bot]
bb0e1e54cd
chore(package): update scratch-vm to version 0.2.0-prerelease.20190314020908
...
Closes #4650
2019-03-14 02:46:54 +00:00
Evelyn Eastmond
98ec67d728
Merge pull request #4641 from evhan55/feature/extensions-wifi-icon
...
Allow for both bluetooth and internet connection icons in extensions
2019-03-13 19:39:57 -04:00
Chris Willis-Ford
f773ee2dab
Merge branch 'develop' into load-library-images-through-storage
2019-03-13 16:33:38 -07:00
Christopher Willis-Ford
a7487fb26d
Fix ScratchImage current jobs count going NaN
2019-03-13 16:00:24 -07:00
greenkeeper[bot]
3adacd3f2a
chore(package): update scratch-blocks to version 0.1.0-prerelease.1552509492
2019-03-13 22:48:55 +00:00
Paul Kaplan
1dd3e1d26a
Merge pull request #4638 from paulkaplan/remove-analytics
...
Remove most of the GA events
2019-03-13 17:03:21 -04:00
Christopher Willis-Ford
ce5aa9fb7a
Fix ScratchImage visibility check on Windows Firefox ESR
2019-03-13 11:09:36 -07:00
Paul Kaplan
846a174f13
Merge pull request #4647 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190312212117
...
Update scratch-vm to the latest version 🚀
2019-03-13 14:08:56 -04:00
greenkeeper[bot]
c779c5fe77
chore(package): update scratch-vm to version 0.2.0-prerelease.20190312212117
2019-03-13 16:08:45 +00:00
chrisgarrity
3e33c10b04
Fix mock store for project-saver-hoc test
...
Account for the addition of locale prop expected in mapStateToProps.
Note: if/when the telemetry code gets moved into its own hoc, the prop should get removed, and the test should get updated as well.
2019-03-12 16:13:44 -07:00
Christopher Willis-Ford
f0ba4180c7
Fix spacing in comments
2019-03-12 16:13:44 -07:00
Christopher Willis-Ford
f6b9f11d3b
Merge branch 'develop' into scratch-desktop
...
Conflicts:
src/components/library-item/library-item.jsx
src/components/library/library.jsx
src/components/menu-bar/menu-bar.jsx
src/containers/library-item.jsx
src/lib/project-saver-hoc.jsx
2019-03-12 16:13:40 -07:00
Christopher Willis-Ford
d71a9114b7
Merge remote-tracking branch 'upstream/develop' into scratch-desktop
2019-03-12 16:13:28 -07:00
Christopher Willis-Ford
5c4f50c1b8
Merge branch 'develop' into scratch-desktop
2019-03-12 16:13:28 -07:00
Christopher Willis-Ford
4d671ddfab
Merge remote-tracking branch 'upstream/develop' into scratch-desktop
2019-03-12 16:13:27 -07:00
Christopher Willis-Ford
94901b33fe
Merge remote-tracking branch 'upstream/develop' into scratch-desktop
2019-03-12 16:13:27 -07:00
Christopher Willis-Ford
f6dc2726b5
Implement projectDidSave telemetry event
2019-03-12 16:13:21 -07:00
Christopher Willis-Ford
7b4c0657c6
Merge remote-tracking branch 'upstream/develop' into scratch-desktop
2019-03-12 15:55:50 -07:00
Christopher Willis-Ford
39279fa0ef
Merge remote-tracking branch 'upstream/develop' into scratch-desktop
2019-03-12 15:55:50 -07:00
Christopher Willis-Ford
5f2f95a6db
HACK: report telemetry events if telemetry is active
2019-03-12 15:55:49 -07:00
Christopher Willis-Ford
790fc13157
Fix ScratchImage incompatibilities
2019-03-12 15:01:50 -07:00
Christopher Willis-Ford
face0d20d4
Test library icon rotation by comparing src over time
2019-03-12 15:01:50 -07:00
Christopher Willis-Ford
5c16407818
Fix imageSource for rotating library icons
2019-03-12 15:01:50 -07:00
Christopher Willis-Ford
d8201fd4ad
Merge branch 'develop' into scratch-desktop
...
Conflicts:
src/components/library-item/library-item.jsx
src/components/library/library.jsx
src/components/menu-bar/menu-bar.jsx
src/containers/library-item.jsx
src/lib/project-saver-hoc.jsx
2019-03-12 15:01:42 -07:00
Christopher Willis-Ford
2b1cd4951d
Merge remote-tracking branch 'upstream/develop' into scratch-desktop
2019-03-12 15:01:26 -07:00
Christopher Willis-Ford
849fe8fc0c
Merge branch 'develop' into scratch-desktop
2019-03-12 15:01:25 -07:00
Christopher Willis-Ford
f600e6095e
Merge remote-tracking branch 'upstream/develop' into scratch-desktop
2019-03-12 15:01:25 -07:00
Christopher Willis-Ford
d952f774dd
Merge remote-tracking branch 'upstream/develop' into scratch-desktop
2019-03-12 15:01:25 -07:00
Christopher Willis-Ford
38ee27d896
Merge remote-tracking branch 'upstream/develop' into scratch-desktop
2019-03-12 15:01:24 -07:00
Christopher Willis-Ford
73e1bc352b
Merge remote-tracking branch 'upstream/develop' into scratch-desktop
2019-03-12 15:01:24 -07:00
Christopher Willis-Ford
46ce75bf2a
Prevent crash when opening tutorials library
2019-03-12 15:01:23 -07:00
Christopher Willis-Ford
2c285fee8a
Load 6 ScratchImages at a time, prioritize visible
2019-03-12 15:01:08 -07:00
Christopher Willis-Ford
d1c3cf8bb0
Move image-from-storage code into new ScratchImage component
2019-03-12 14:38:25 -07:00
Christopher Willis-Ford
a09c7ddb53
Clarify getAssetTypeForExtension
2019-03-12 14:38:25 -07:00
Christopher Willis-Ford
fec81c93a3
Make sure icon load starts immediately
2019-03-12 14:38:25 -07:00
Christopher Willis-Ford
2b3c70dfc3
Move event processing out of LibraryItemComponent
2019-03-12 14:38:25 -07:00
Christopher Willis-Ford
db9236bef2
Fix sprite lib animation: move load into LibraryItem
...
The `LibraryItem` component has been split into a container, responsible
for handling interaction with the storage module, and a component,
responsible for presentation. The component now always takes an
`iconURI` and the logic to load an icon from storage has been moved from
`Library` into `LibraryItem`.
TODO: move animation logic from `SpriteLibrary` into `LibraryItem`. This
should simplify the code quite a bit and might also improve performance.
2019-03-12 14:38:25 -07:00
Paul Kaplan
fb383ee5f5
Merge pull request #4642 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20190312125229
...
Update scratch-render to the latest version 🚀
2019-03-12 14:35:38 -04:00
Paul Kaplan
3a33e7ea86
Update blocks.jsx
2019-03-12 14:34:45 -04:00
greenkeeper[bot]
8e51409e20
chore(package): update scratch-render to version 0.1.0-prerelease.20190312125229
2019-03-12 17:34:45 +00:00
Evelyn Eastmond
f29b82b636
Adding right padding to icons.
2019-03-12 10:39:27 -04:00
Evelyn Eastmond
31625d6807
Adding ability to show both bluetooth and internet icons in extension library item tiles.
2019-03-12 10:10:59 -04:00
unknown
dadef73bfa
Testing two icons side by side to see how the padding is currently working.
2019-03-12 09:39:24 -04:00
