 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 |
|
|
Paul Kaplan
|
afc8ffcabd
|
Merge pull request #4210 from paulkaplan/stage-loading
Use the loading screen in player mode
|
2018-12-27 10:50:00 -05:00 |
|
|
Paul Kaplan
|
70eb240a7c
|
Use the loading screen in player mode
|
2018-12-27 10:34:02 -05:00 |
|
|
Karishma Chadha
|
0ce0e4837d
|
Merge pull request #4205 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181226213940
Update scratch-vm to the latest version 🚀
|
2018-12-26 16:43:19 -05:00 |
|
|
greenkeeper[bot]
|
f05a7d1edc
|
chore(package): update scratch-vm to version 0.2.0-prerelease.20181226213940
|
2018-12-26 21:42:11 +00:00 |
|
|
Karishma Chadha
|
57751e9d9a
|
Merge pull request #4204 from picklesrus/sensing-target-bug
Fix #4203 by checking whether a target exists before asking whether i…
|
2018-12-26 16:37:43 -05:00 |
|
|
picklesrus
|
9cd41199c5
|
Fix #4203 by checking whether a target exists before asking whether it has an variables
|
2018-12-26 16:26:34 -05:00 |
|
|
Karishma Chadha
|
c50bb3c150
|
Merge pull request #4199 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20181226153401
Update scratch-render to the latest version 🚀
|
2018-12-26 10:45:42 -05:00 |
|
|
Karishma Chadha
|
77df4e8c72
|
Merge pull request #4200 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181226154000
chore(package): update scratch-vm to version 0.2.0-prerelease.20181226154000
|
2018-12-26 10:44:27 -05:00 |
|
|
greenkeeper[bot]
|
faf73c92dd
|
chore(package): update scratch-vm to version 0.2.0-prerelease.20181226154000
Closes #4198
|
2018-12-26 15:42:37 +00:00 |
|
|
greenkeeper[bot]
|
4d0eb63ae2
|
chore(package): update scratch-render to version 0.1.0-prerelease.20181226153401
|
2018-12-26 15:35:37 +00:00 |
|
|
Karishma Chadha
|
2a6d798a26
|
Merge pull request #4195 from kchadha/fix-filename-regex
Fix regex for extracting the project title from a .sb file
|
2018-12-26 10:27:26 -05:00 |
|
|
Karishma Chadha
|
41d910057b
|
Update unit test that was checking that .sb files don't get project titles extracted.
|
2018-12-26 09:22:51 -05:00 |
|
|
Karishma Chadha
|
6b2cf976f6
|
Fix regex for extracting the project title from a .sb file
|
2018-12-25 13:17:52 -05:00 |
|
|
Karishma Chadha
|
135e521cae
|
Merge pull request #4185 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181221211506
Update scratch-vm to the latest version 🚀
|
2018-12-21 16:18:13 -05:00 |
|
|
greenkeeper[bot]
|
9c866e2b91
|
chore(package): update scratch-vm to version 0.2.0-prerelease.20181221211506
|
2018-12-21 21:17:49 +00:00 |
|
|
Karishma Chadha
|
9b65910d7a
|
Merge pull request #4183 from kchadha/update-vm
Update scratch-vm to pull in changes from scratch-sb1-converter
|
2018-12-21 14:49:08 -05:00 |
|
|
Karishma Chadha
|
259d0796d4
|
Update scratch-vm to pull in changes from scratch-sb1-converter
|
2018-12-21 14:47:15 -05:00 |
|
|
Paul Kaplan
|
daeec8fa0d
|
Merge pull request #4182 from LLK/paulkaplan-patch-1
Update to storage 1.2.2 for clean asset flag fix
|
2018-12-21 13:11:56 -05:00 |
|
|
Paul Kaplan
|
be37452697
|
Update to storage 1.2.2 for clean asset flag fix
|
2018-12-21 13:11:43 -05:00 |
|
|
Paul Kaplan
|
0465332835
|
Merge pull request #4181 from LLK/revert-4153-enfasten-remix
Revert "Make remixing/saving faster by marking all assets as clean to start."
|
2018-12-21 11:26:28 -05:00 |
|
|
Paul Kaplan
|
3c53bac17b
|
Revert "Make remixing/saving faster by marking all assets as clean to start."
|
2018-12-21 11:22:16 -05:00 |
|
|
chrisgarrity
|
1ea945f044
|
Merge pull request #4178 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1545364693
Update scratch-blocks to the latest version 🚀
|
2018-12-21 09:04:09 -05:00 |
|
|
greenkeeper[bot]
|
67aeb50ef3
|
chore(package): update scratch-blocks to version 0.1.0-prerelease.1545364693
|
2018-12-21 04:00:36 +00:00 |
|
|
chrisgarrity
|
5b4bef0e00
|
Merge pull request #4176 from LLK/greenkeeper/scratch-l10n-3.1.20181220222259
chore(package): update scratch-l10n to version 3.1.20181220222259
Removes the three languages from the menu that still need to be reviewed
|
2018-12-20 22:52:10 -05:00 |
|
|
Karishma Chadha
|
410ea070f9
|
Merge pull request #4175 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181221030743
chore(package): update scratch-vm to version 0.2.0-prerelease.20181221030743
|
2018-12-20 22:11:56 -05:00 |
|
|
greenkeeper[bot]
|
5f71c34013
|
chore(package): update scratch-vm to version 0.2.0-prerelease.20181221030743
Closes #4174
|
2018-12-21 03:10:17 +00:00 |
|
|
chrisgarrity
|
543d23970c
|
Merge pull request #4169 from benjiwheeler/translate-validation
translate form validation string
|
2018-12-20 22:02:48 -05:00 |
|
|
Chris Willis-Ford
|
744076babf
|
Merge pull request #4162 from cwillisf/telemetry-opt-in
Add telemetry opt-in/opt-out dialog
|
2018-12-20 18:44:13 -08:00 |
|
|
greenkeeper[bot]
|
8aade78dba
|
chore(package): update scratch-l10n to version 3.1.20181220222259
Closes #4173
|
2018-12-21 00:53:50 +00:00 |
|
|
Christopher Willis-Ford
|
e3c205a9d1
|
Update telemetry image placeholder
|
2018-12-20 16:23:18 -08:00 |
|
|
Andrew Sliwinski
|
3ba85ebd74
|
Merge pull request #4172 from ericrosenbaum/bugfix/another-library-update
More library updates
|
2018-12-20 17:37:59 -05:00 |
|
|
Eric Rosenbaum
|
fb6da98bfd
|
More library updates
|
2018-12-20 17:23:25 -05:00 |
|
|
Christopher Willis-Ford
|
f4daec5160
|
Don't bundle telemetry modal event handlers
|
2018-12-20 13:51:26 -08:00 |
|
|
Christopher Willis-Ford
|
ee80e07ade
|
Add telemetry opt-in/opt-out dialog
The playground now displays this on startup when in Scratch Desktop
simulation mode.
|
2018-12-20 13:50:36 -08:00 |
|
|
Karishma Chadha
|
46b5e41352
|
Merge pull request #4136 from kchadha/accept-sb
The file uploader file input should accept .sb files as well.
|
2018-12-20 16:01:29 -05:00 |
|
|
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 |
|