423 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
chrisgarrity	4347cac225	Merge pull request #229 from LLK/translations ... Update translations	2019-10-31 14:48:52 -04:00
Chris Garrity	e95a3b27e8	Update translations	2019-10-31 14:47:53 -04:00
chrisgarrity	e925c1beab	Merge pull request #227 from LLK/revert-ios-scroll ... revert ios scroll fix	2019-10-31 13:14:57 -04:00
Chris Garrity	8914c15493	revert ios scroll fix ... The ‘fix’ for the ios scrolling bug prevented scrolling of the library. Things need to be refactored.	2019-10-31 13:04:37 -04:00
chrisgarrity	64c5575bda	Merge pull request #224 from LLK/revert-android-paint ... Revert paint change for android	2019-10-31 08:08:24 -04:00
Chris Garrity	abc78daca6	Revert paint change for android ... This didn’t fix the paint issue, just changed which kind of devices see the problem. Reverted the change to work for cheaper, regular density tablets.	2019-10-31 07:48:58 -04:00
chrisgarrity	a5686e9111	Merge pull request #221 from LLK/ios-scroll-bug ... Fixes the iOS scrolling problem	2019-10-25 16:24:59 -04:00
Chris Garrity	d71df52d6b	Don’t allow overscroll ... The iOS change seems to have a side effect on Android of adding an“Edge Effect” to the web view whenever dragging a block. (Edge effects are the grey curved shadow that appears at the top or bottom of a container when you overscroll. When you drag a block they appear at the top or bottom of the screen) Adding the `android:overScrollMode=“never”` attribute to the webview means the edge effect doesn’t appear.	2019-10-25 16:19:41 -04:00
Chris Garrity	d97d075959	Check in empty Firebase configuration	2019-10-25 15:30:38 -04:00
Chris Garrity	5a5e5bdf12	remove duplicate ontouchmove	2019-10-25 13:49:31 -04:00
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
chrisgarrity	3dba10580b	Merge pull request #220 from LLK/firebase-analytics ... Firebase analytics	2019-10-25 12:38:40 -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
chrisgarrity	a55c231ce1	Update README.md	2019-10-21 13:03:41 -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
Andrey Beskrovnykh	bbba46c143	Add forgotten input stream initialization	2018-11-23 19:21:01 +07:00
Andrey Beskrovnykh	1a2433885d	Fix possible backward compatibility issue	2018-11-23 10:50:56 +07:00
Andrey Beskrovnykh	d7bd9789dd	Fix can't import sjr	2018-11-22 21:23:36 +07: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