Commit graph

155 commits

Author SHA1 Message Date
Tim Mickel
d928f81821 Merge pull request #55 from LLK/bugfix/autosave-disable
Disable autosave when onHold, Project.saving, or info box open
2016-04-11 14:31:28 -04:00
Tim Mickel
7fd14cc6d4 Add missing line-break in UI.js 2016-04-11 14:31:04 -04:00
Tim Mickel
ae52b67863 Disable autosave when onHold, Project.saving, or info box open 2016-04-11 14:01:26 -04:00
Andrew Sliwinski
9f14b53853 Merge pull request #53 from thisandagain/bugfix/500
Prevent crash bug edge case with sharing by email. Resolves GH-500
2016-04-08 13:00:17 -04:00
Andrew Sliwinski
fcbe425ea9 Merge pull request #54 from thisandagain/bugfix/36
Explicitly persist and accept cookies. Resolves GH-36
2016-04-08 12:59:43 -04:00
chrisgarrity
0867873405 Add store listing content as json for localization
First part of LLK/scratchjr-private#501
Still need to get actual translations from translators and upload to iTunes/Google Play
2016-04-07 16:49:50 -04:00
Andrew Sliwinski
289343373a Remove redundant 'setAcceptCookie' call 2016-04-06 19:39:16 -04:00
Andrew Sliwinski
a7ae9b586d Explicitly persist and accept cookies. Resolves GH-36 2016-04-06 19:35:20 -04:00
Andrew Sliwinski
56ee7f8b7c Prevent crash bug edge case with sharing by email. Resolves GH-500 2016-04-06 18:22:50 -04:00
chrisgarrity
3dc7e638ae Update Spanish translations from transifex 2016-03-31 16:18:09 -04:00
chrisgarrity
60e5f35caa Merge pull request #50 from chrisgarrity/master
localization css changes
2016-03-24 16:28:20 -04:00
chrisgarrity
ec6353a60d Patch for Blocks guide category header width
Increase the width of blocks guide category headers (the colored bar for each blocks section)
This will work until there's a language with even longer text. Probably should switch to a min-width with padding-right for the long term.
2016-03-24 16:23:26 -04:00
chrisgarrity
528e768453 Sharing button style changes for localization
change css for sharing buttons from min-height which only looks good when the text is one line, to padding-bottom to support localizations that are more than one line (e.g. Spanish)

FIxes #42
2016-03-24 16:23:26 -04:00
Tim Mickel
da2ecbd3f8 Merge pull request #49 from tmickel/GH-48
Implement gear icon on the splash page #48
2016-03-24 16:17:35 -04:00
Tim Mickel
56ff66b6a8 Include .gear CSS for taps 2016-03-24 15:57:51 -04:00
Tim Mickel
c49870dd6b Add link for gear icon to settings page 2016-03-24 15:57:36 -04:00
Tim Mickel
b9a232d90b Add gear icon to top right of splash page 2016-03-24 15:46:15 -04:00
Tim Mickel
687b9a5878 Merge pull request #46 from thisandagain/bugfix/41
Add check icon to language selection state
2016-03-24 15:31:41 -04:00
Tim Mickel
eb071e14c5 Merge pull request #47 from chrisgarrity/master
Pull in updated Spanish translations
2016-03-24 15:31:27 -04:00
chrisgarrity
aaec2743ae Merge pull request #44 from tmickel/bugfix/ios-sound
Set AVAudioSession category on viewDidLoad #35
2016-03-24 14:59:21 -04:00
chrisgarrity
882bb6aab8 Merge pull request #45 from tmickel/bugfix/GH-29
SVG2Canvas.processXMLnode to not getElementById
2016-03-24 14:58:29 -04:00
chrisgarrity
8f93e93127 Pull in updated Spanish translations
Include transifex updates from Paula and Marina.
2016-03-24 14:25:38 -04:00
Tim Mickel
693698c514 SVG2Canvas.processXMLnode to not getElementById
This addresses #29 in iOS, which was causing photos in thumbnails to not crop. A note about what was going on is included in the code.
2016-03-24 14:05:45 -04:00
Andrew Sliwinski
8254d0ed4d Add check icon to language selection state. Resolves GH-41 2016-03-24 14:03:49 -04:00
Tim Mickel
ba3f7513d2 Set AVAudioSession category on viewDidLoad #35 2016-03-24 11:52:17 -04:00
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