258 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Chris Garrity	c4ea194df7	Fix scrolling while dragging ... This is the fix from Paula for #217 based on the firebase-analytics branch, so only merge after that PR (or cherry pick this commit)	2019-10-25 12:46:11 -04:00
chrisgarrity	3fed0ede1a	Update README.md	2019-10-25 12:46:11 -04:00
Chris Garrity	c8f655447a	Address comments	2019-10-25 12:27:32 -04:00
Chris Garrity	2c4520e9e1	improve paint_editor event ... There was only one paint editor event and it only distig,nuished between character or background. This change distinguishes between editing a background from the library vs user-created. For characters it distinguishes between new and edit, and between library assets or user-created.	2019-10-23 08:58:53 -04:00
Chris Garrity	b6a1569438	Fix analytics issues ... * Pass value `0` for email analytics event (everything was being reported as airdrop even when it was email) * Use `id` for assets (corresponds to the asset file name, e.g. Star.svg) instead of `fieldname` which is localized.	2019-10-22 15:55:55 -04:00
Chris Garrity	1ba161e3b1	Update iOS to use Firebase Analytics	2019-10-21 13:00:37 -04:00
Chris Garrity	f885202c8e	Update Cocoapods to use Firebase ... I also decided to add the Pods directory to gitignore. It bloats the ScratchJr repo. This does mean that people will need to install cocoapods and run `pod install` the first time they build scratchjr.	2019-10-21 12:58:36 -04:00
Chris Garrity	b965440709	Switch to firebase analytics ... * Remove ScratchJrApplication class - it was only being used to initialize the old Google Analytics. * Change AppUsage (home, school, other, noanswer) from being a prefix on `label` to being a Firebase user property. * Set the user property when loading the index page - it shouldn’t change for the rest of the session.	2019-10-21 10:48:03 -04:00
Chris Garrity	1be3feb791	ensure ‘switchToFree’ gets run before generating PNGs ... The assemble.depends on doens’t seem to ensure that the correct sources are copied to the HTML5 directory	2019-10-18 10:55:27 -04:00
chrisgarrity	564dc296d3	Merge pull request #219 from LLK/updateGradle5 ... Update gradle5	2019-10-18 08:36:13 -04:00
Chris Garrity	63112f4ca8	Add files to gitignore	2019-09-25 13:36:21 +01:00
DD Liu	57bcffea6c	Update to gradle 5 and update support dependencies	2019-09-09 16:15:24 -04:00
chrisgarrity	743f1974c5	Merge pull request #212 from chrisgarrity/hide-parents-button ... Hide parents button after succesful parental gate	2019-04-23 08:06:58 -04:00
chrisgarrity	cd2503768e	Hide parents button after succesful parental gate	2019-04-22 10:40:48 -04:00
chrisgarrity	32f7f5174d	Merge pull request #210 from chrisgarrity/feature/revised-share-flow ... Move the parental gate before the share buttons	2019-04-16 11:35:54 -04:00
chrisgarrity	1db48319c3	Merge pull request #203 from yueyuzhao/expose-scratchjr ... Expose scratchjr to global	2019-04-15 09:42:08 -07:00
chrisgarrity	49d8b5a3df	Move the parental gate before the share buttons ... Change the share flow to have a ‘For Parents’ button that brings up the Parental Gate. Share buttons only become visible after a successful challenge.	2019-04-06 16:44:37 -04:00
Donald	b8109b8a8f	expose scratchjr to global	2018-11-02 20:23:32 +08:00
chrisgarrity	f90b6840e3	Merge pull request #198 from chrisgarrity/min-width ... revise minimum screen width	2018-10-29 15:22:43 -04:00
chrisgarrity	184b5ba6f9	revise minimum screen width ... The previous change removed the legacy screen sizes, but left the `requiresSmallestWidthDp` at 500. According to https://developer.android.com/guide/topics/manifest/supports-screens-element#requiresSmallest, a 7-inch tablet corresponds to 600dp.	2018-10-29 15:21:58 -04:00
chrisgarrity	366835b34e	Merge pull request #197 from chrisgarrity/fix-build ... Fix iOS build time warnings	2018-10-29 10:28:23 -04:00
chrisgarrity	bc4f8f85d5	Fix iOS build time warnings ... * add required new app icon size * add `LSSupportsOpeningDocumentsInPlace` property (false) * set minimum iOS version to 8.0 (minimum allowed by this version of xCode)	2018-10-29 10:24:38 -04:00
chrisgarrity	a7dbb1e3c2	Merge pull request #196 from chrisgarrity/fix-build ... Fix Android (gradle) build error	2018-10-29 09:40:00 -04:00
chrisgarrity	19699e18b4	Fix Android (gradle) build error ... Builds that worked one day, suddenly fail the next. The error is: `Could not find play-services-basement.aar (com.google.android.gms:play-services-basement:15.0.1).` Re-ordering the repositories fixes the issue (from Stack Overflow): https://stackoverflow.com/questions/50563407/could-not-find-play-services-basement-aar	2018-10-29 09:35:57 -04:00
chrisgarrity	2da0c818bf	Merge pull request #192 from Murkantilism/develop ... Replaced hardcoded value of 136 with a variable.	2018-10-29 09:05:17 -04:00
Deniz Ozkaynak	ae0d60cb43	Replaced hardcoded value of 136 with a variable.	2018-10-13 20:36:29 -04:00
Deniz Ozkaynak	844765bde6	Created a variable to replace a hardcoded value ... In ../src/editor/ui/UI.js there's a random hardcoded value of 136 that helps determine the scale of fullscreen mode. Not sure what this number represents but it should be a variable.	2018-10-13 20:35:10 -04:00
chrisgarrity	b79fc90fb9	Merge pull request #189 from chrisgarrity/update-translations ... update translations and languages	2018-10-03 14:01:43 -04:00
chrisgarrity	02ebb629c1	update translations and languages	2018-10-03 13:58:37 -04:00
chrisgarrity	c0bdc36268	Merge pull request #187 from chrisgarrity/rebuild-versions ... Rebuild versions	2018-10-02 08:17:45 -04:00
chrisgarrity	1fcdff79f2	Remove unnecessary screen settings from manifest	2018-10-01 17:12:03 -04:00
chrisgarrity	21bb1a1eb6	Updated versions to allow building	2018-10-01 16:32:29 -04:00
chrisgarrity	c90c1ce37f	Merge pull request #162 from yida921/develop ... updated android SDK versions	2018-09-27 08:22:37 -04:00
chrisgarrity	6d022384de	Merge pull request #180 from jndrm/typescript ... Add .editorconfig file & upgrade webpack	2018-09-26 11:28:25 -04:00
chrisgarrity	85a68eb017	Merge pull request #179 from jndrm/develop ... Fix Runtime Issues:	2018-09-26 09:28:27 -04:00
Donald	29ebbeece6	Code format & sort npm script params	2018-09-11 14:27:15 +08:00
Donald	d60ea5e7cb	Upgrade webpack to 4.18.0 ... Add 'watch' and 'dev' npm scripts	2018-09-11 14:13:38 +08:00
Donald	ee48c72922	Add .editorconfig file	2018-09-11 12:59:48 +08:00
Donald	2da2fad26c	Fix Runtime Issues: ... ScratchJr.m: runtime: UI API called from background thread: -[UIView removeFromSuperview] must be used from main thread only IO.m: runtime: UI API called from background thread: -[UIWebView stringByEvaluatingJavaScriptFromString:] must be used from main thread only	2018-09-11 09:32:02 +08:00
chrisgarrity	6f59d224e7	Merge pull request #176 from apple502j/patch-1 ... Change 日本語 to にほんご	2018-08-14 12:15:35 -04:00
apple502j	8ab8fefb55	Change 日本語 to にほんご	2018-08-05 20:46:48 +09:00
Andrew Sliwinski	3622608970	Update TRADEMARK	2018-06-18 13:19:00 -04:00
chrisgarrity	d19d63dc73	Merge pull request #170 from chrisgarrity/issue/gh137-paint-calibration ... Don’t adjust paintEditor point on Android	2018-05-03 09:30:17 -04:00
chrisgarrity	a4737a4399	Don’t adjust paintEditor point on Android ... Fixes the issue where the editor doesn’t draw where the finger is touching on Android.	2018-05-02 15:01:45 -04:00
Practical Education Network	8908e40915	updated android SDK versions	2018-04-04 12:47:32 -04:00
Andrew Sliwinski	fdd930ee50	Merge pull request #150 from VutonDesign/develop ... Markdown files clean-up	2017-09-25 09:26:40 -04:00
Vuton Design	6a1fdc962c	Clean-Up	2017-09-25 14:24:31 +01:00
Vuton Design	ec0e28bbda	Clean-Up	2017-09-25 12:29:09 +01:00
Vuton Design	8fa91d05a0	Clean-Up	2017-09-25 12:24:45 +01:00
chrisgarrity	827d8b1508	Merge pull request #148 from chrisgarrity/feature/add-languages ... Add languages	2017-09-19 11:42:45 -04:00