scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-11-25 08:38:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
130 commits 73 branches 4 tags 34 MiB
Commit graph

130 commits

This branch
This branch
All branches
Author SHA1 Message Date
chrisgarrity
6502ec4581 Merge pull request #40 from chrisgarrity/master 
Increment android version code for 1.2 beta 1
 2016-03-01 15:08:12 -05:00
chrisgarrity
f778a02333 Increment Android version code 2016-03-01 15:00:10 -05:00
chrisgarrity
2523f0718e Update Sample project localizations 2016-02-17 15:18:59 -05:00
chrisgarrity
018dd50358 Merge branch 'master' of github.com:chrisgarrity/scratchjr 2016-02-10 14:43:49 -05:00
chrisgarrity
7c258cda56 Friends Sample Project localization update 2016-02-10 14:41:20 -05:00
Tim Mickel
72cfb19254 License, CONTRIBUTING, update README, package.json 2016-02-10 14:38:18 -05:00
chrisgarrity
39a281793c Merge pull request #12 from tmickel/docs 
License, CONTRIBUTING, update README, package.json
 2016-02-10 14:35:45 -05:00
chrisgarrity
e38d057f12 Friends Sample Project localization update 2016-02-10 12:13:05 -05:00
Tim Mickel
6278b387eb License, CONTRIBUTING, update README, package.json 2016-02-09 12:49:52 -05:00
Tim Mickel
2d819b86a3 Merge pull request #11 from tmickel/js-bundle 
Only include app.bundle.js in app bundles
 2016-02-08 14:29:42 -05:00
Tim Mickel
4c98de9dc7 Only include app.bundle.js in app bundles 2016-02-08 14:28:55 -05:00
Tim Mickel
4720b15a7f Merge pull request #10 from tmickel/ios-emailer-mimetype 
Fix mimeType string for official/free iOS email sharing
 2016-02-08 13:36:41 -05:00
Tim Mickel
cb2fdccbcb Fix mimeType string for official/free iOS emails 2016-02-08 13:35:09 -05:00
Tim Mickel
65d81e66e8 Merge pull request #9 from tmickel/android-webpack-fixes 
Fix JS incompatibilities in Android webview
 2016-02-08 13:04:36 -05:00
Tim Mickel
6676b37a80 Remove for-of loop which requires Symbol polyfill 2016-02-08 12:43:12 -05:00
Tim Mickel
db3724072f Only polyfill window.Intl when it doesn't exist 
The Chrome Webview already had an existing window.Intl. This was causing an assignment error.
 2016-02-08 12:33:33 -05:00
Tim Mickel
5a36ea263b Merge pull request #7 from tmickel/lobby-settings-disable-switch 
Add config for disabling the lobby settings page
 2016-02-03 15:51:44 -05:00
Tim Mickel
9f45c2f7a8 Add config for disabling the lobby settings page 
In some editions we may not have completed translations. For these, the settings page can be hidden.
 2016-02-03 15:51:16 -05:00
Tim Mickel
ef09a72724 Merge pull request #6 from LLK/language-analytics 
Add analytics event for changing the language
 2016-02-03 15:38:18 -05:00
Tim Mickel
09773e3186 Add analytics event for changing the language 2016-02-03 15:34:41 -05:00
Tim Mickel
b7c5a92f51 Merge pull request #5 from tmickel/modules 
Modules
 2016-02-03 15:26:32 -05:00
Tim Mickel
91848c6ea1 Merge pull request #1 from tmickel/exif-camera-rotation 
Rotate Android photos to account for JPEG/EXIF rotation
 2016-02-03 15:26:17 -05:00
Tim Mickel
9360e6d9d2 Bumping version codes to 1.2.0 2016-02-03 15:00:55 -05:00
Tim Mickel
5ed3220a34 Updating bundle-compile.sh and adding gradle task 2016-02-03 14:13:32 -05:00
Tim Mickel
71d48d56da Bump free version to 1.2.0 2016-02-03 12:03:34 -05:00
Tim Mickel
1a6c8966a2 Add npm build to free edition XCode project 2016-02-03 12:03:27 -05:00
Tim Mickel
f715c5054c Fix IO.refreshLobby for modules 2016-02-03 12:02:57 -05:00
Tim Mickel
de99fabacc Fixing broken iOS import in ScratchAudio 2016-02-03 11:32:46 -05:00
Tim Mickel
6cde452728 Add getter for currentLocale to Localization.js #465 2016-02-03 11:19:28 -05:00
Tim Mickel
ad7e80adfd Adding about page localizations for PBS KIDS 2016-02-02 18:31:27 -05:00
Tim Mickel
1a0801b74d Reconciliation of PBS KIDS edition splash page 2016-02-02 18:19:06 -05:00
Tim Mickel
1da87914cc Refactor app.js entry-point to have different JS files for each page 2016-02-02 17:43:22 -05:00
Tim Mickel
9814b2a7ce Provide top-level window.ScratchAudio to iframes 2016-02-02 17:31:16 -05:00
Tim Mickel
b8f4e84bc9 Restructure of entry/app.js to load CSS first 2016-02-02 16:51:40 -05:00
Tim Mickel
ce419f1b7a Moving inappAbout call out of iOS.waitForInterface 2016-02-02 16:41:02 -05:00
Tim Mickel
7b28c13f84 blocks.html, interface.html, paint.html remaining scripts 
Moved to app.js entry
 2016-02-02 16:38:31 -05:00
Tim Mickel
fdbf07b6d9 Includes and code stubs for rest of in-app help 2016-02-01 12:05:40 -05:00
Tim Mickel
def37de218 Adding module about page and include roots 
Localization, MediaLib, and Settings loads need an adjustable path for now because inapp/ pages are in a subdirectory.
 2016-02-01 11:57:41 -05:00
Tim Mickel
b102d7a100 Use app bundle JS for getting started video 2016-01-22 16:44:46 -05:00
Tim Mickel
2f2d36dd86 Merge entry-points and bundles for editor, home, index 2016-01-22 16:20:18 -05:00
Tim Mickel
3e0a600953 Fixing window.Settings in Localization util 2016-01-22 16:20:03 -05:00
Tim Mickel
1849431ccd Asynchronous loading of MediaLib 2016-01-22 16:19:51 -05:00
Tim Mickel
d062dbf4ac Make Localization.includeLocales async 2016-01-22 15:42:56 -05:00
Tim Mickel
0c65882bd0 Moving Settings to window.Settings 2016-01-22 15:42:42 -05:00
Tim Mickel
efb7d3f226 Moving Settings.js to settings.json 2016-01-22 15:23:42 -05:00
Tim Mickel
4525954f43 Removing extra JS includes from editor.html, index.html 2016-01-22 15:02:06 -05:00
Tim Mickel
13b983bd57 Adding ontouchstart function to trigger focus for spriteform 2016-01-22 14:52:31 -05:00
Tim Mickel
8c2a26a070 Adding Camera and iOS to window globals 2016-01-22 14:15:15 -05:00
Tim Mickel
5ba2f40efc Fixing Paint splash and splashshade requests 2016-01-22 14:01:50 -05:00
Tim Mickel
527d8d7129 Disambiguation of Paint vs. editor frame 2016-01-21 16:53:03 -05:00