Commit graph

14391 commits

Author SHA1 Message Date
Matthew Taylor
4821383d00 Merge pull request from mewtaylor/issue/gh-289-overlapping-text
Fix GH-289: Allow white space to wrap in welcome text
2016-01-12 10:30:02 -05:00
Andrew Sliwinski
029a27dcce Merge pull request from thisandagain/bugfix/316
Fix error in parsing count from updated API route
2016-01-12 08:12:42 -05:00
Andrew Sliwinski
3721ecfd14 Fix error in parsing count from updated API route. Re: GH-316 2016-01-11 19:10:38 -05:00
morant
2cf6befeaf add hip hop and fashion JSONs, and minor fixes to microworlds.jsx 2016-01-11 18:38:15 -05:00
Matthew Taylor
c88fc6f27d Make general nowrap more specific to paragraphs
And remove the overrides that were already there. ht @rschamp and @carljbowman!
2016-01-11 14:58:55 -05:00
Andrew Sliwinski
04766a82af Merge pull request from thisandagain/bugfix/316
Migrate to new API route for message count
2016-01-11 14:23:05 -05:00
Andrew Sliwinski
86c93df740 Migrate to new API route for message count. Resolves GH-316 Resolves GH-95 2016-01-11 14:13:34 -05:00
Matthew Taylor
d578d4a800 Allow white space to wrap in welcome text
It's in an href, so override the default and include wrapping. Fixes .
2016-01-11 09:11:13 -05:00
Matthew Taylor
4ab7cfef6b Merge pull request from mewtaylor/issue/gh-251-ban-undefined
Fix GH-251: log error for session request if there
2016-01-11 08:26:54 -05:00
Matthew Taylor
1382fc48f6 log error for session request if there
And only try to update the session if a body is present
2016-01-11 08:15:08 -05:00
morant
6aa93b1711 Error Handling - when a component isn't declared, don't show it. 2016-01-08 18:35:17 -05:00
morant
2593d7aaf5 Generic version of the Microworlds.
No arts specific features anymore.
Still fails when a component is missing
2016-01-08 16:18:51 -05:00
morant
cca175154c First version of generic microworlds.
Reads videos information from JSON, other parts still not generic.
2016-01-08 14:43:39 -05:00
morant
5c919506cf Add tips 2016-01-08 14:42:35 -05:00
Matthew Taylor
ceec694b2a Revert "Migrate to using a loader method"
This reverts commit 214430b0c4.
2016-01-08 13:50:58 -05:00
Matthew Taylor
214430b0c4 Migrate to using a loader method
This moves all locale/translation building to a dependency, `scratch-www-intl-loader`, as well as tests associated with it. Also gets rid of the `make translations` step.
2016-01-07 17:01:57 -05:00
Matthew Taylor
d5ffd9fcc0 Flatten messages for components into one object
thanks @rschamp!
2016-01-07 11:02:14 -05:00
Matthew Taylor
398f9cb95a Move component strings into views
Handle localization and string loading in views only. Components should just of default text, but not the actual text for the page itself – all text handling should be at the view level.
2016-01-07 10:11:03 -05:00
Matthew Taylor
f88984f254 Merge pull request from mewtaylor/issue/gh-273-ptbr-default
default to pt-br if browser is set to pt
2016-01-06 16:02:46 -05:00
Matthew Taylor
21668d6915 Fix tests 2016-01-06 15:08:54 -05:00
Matthew Taylor
f8cadf498e Use strong etag for build files
express's default is to do a "weak" etag (only looks for semantic changes, not byte-level), which might be partially responsible for not having updates to our files in browsers happen as soon as we deploy. Try strong instead.
2016-01-06 14:25:27 -05:00
Matthew Taylor
448ca0b103 Remove main bundle
Render footer and nav on each view directly instead of globally in a separate bundle
2016-01-06 14:23:47 -05:00
Matthew Taylor
8ae98d703f Make localizations view-based
1. Load locale strings into `window._messages` in a separate file added to `template.html`, which contains view-specific and general strings
2. Update build-locales to compile separate files
2016-01-06 14:09:32 -05:00
Ray Schamp
e2ff0cd63d Merge pull request from rschamp/hotfix/add-kreyol
Hotfix: Add Kreyòl
2016-01-05 15:26:13 -05:00
Ray Schamp
d90ebdbdd4 Merge pull request from rschamp/hotfix/add-kreyol
Hotfix: Add Kreyòl
2016-01-05 14:13:16 -05:00
Ray Schamp
4ed37a4671 ️ Thanks @mewtaylor 2016-01-05 13:24:47 -05:00
Ray Schamp
deec63e3de Add Kreyòl 2016-01-05 13:21:14 -05:00
Matthew Taylor
0a313ad29b default to pt-br if browser is set to pt
If the user has not yet set their own language, but has pt in their browser, use pt-br for now, to accommodate for our large Brasilian base. Fixes .
2016-01-04 14:18:55 -05:00
Andrew Sliwinski
0e82f99515 Merge pull request from mewtaylor/feature/open-source-docs
Open source docs
2015-12-23 14:54:52 -05:00
morant
77a4bd2d10 adding tips to the microworld 2015-12-21 13:30:22 -05:00
Ray Schamp
5f7f3a6f4d Merge pull request from LLK/release/2.2.4
Release 2.2.4
2015-12-21 12:45:11 -05:00
Matthew Taylor
76bab4c915 Some fixes based on feedback
Thanks @thisandagain!
2015-12-16 15:51:18 -05:00
Matthew Taylor
25948c9a7b Merge pull request from mewtaylor/issue/gh-293
Fix gh293 – Add custom languages explicitly
2015-12-16 14:13:06 -05:00
Matthew Taylor
f52ac1f17f Move intl loading into separate, overridden file
ht @rschamp, thanks!
2015-12-16 12:00:42 -05:00
Matthew Taylor
8c374e096d Move custom loader to main.jsx
So that it's only done once.
2015-12-16 10:43:37 -05:00
Matthew Taylor
6ff652e788 Revert "Move custom-locales.js to static/js/lib"
This reverts commit 4f541b8831.
2015-12-16 10:09:15 -05:00
Matthew Taylor
4f541b8831 Move custom-locales.js to static/js/lib
So it can be loaded ahead of time and cached. Also remove the json since it's being loaded outside of react now, and put it into the js file directly.
2015-12-16 08:32:25 -05:00
Matthew Taylor
b495beaeba Also add Latin, Aragonés 2015-12-15 18:06:03 -05:00
Matthew Taylor
08a91f8521 Add custom languages explicitly 2015-12-15 17:55:44 -05:00
Matthew Taylor
429ad54349 Merge pull request from mewtaylor/issue/gh-263-again
Fix gh-263: Set width in viewport tag to desktop width
2015-12-15 11:49:54 -05:00
Matthew Taylor
085479a351 Set width in viewport tag to desktop width
Desktop width retrieved from `_frameless`
2015-12-15 11:43:46 -05:00
Ray Schamp
458c112e6c Merge pull request from rschamp/bugfix/GH-238
Support redirect responses from API calls
2015-12-11 09:41:57 -05:00
Ray Schamp
68bcbf7511 Explain strange redirect behavior 2015-12-10 17:11:25 -05:00
Matthew Taylor
e688d62c6e Merge pull request from mewtaylor/bugfix/hoc-translation-updates
Some translations cleanup [master]
2015-12-10 09:43:17 -05:00
Matthew Taylor
738749977d Merge pull request from mewtaylor/bugfix/hoc-translation-updates-develop
Some translations cleanup [develop]
2015-12-10 09:19:14 -05:00
Matthew Taylor
1c802f9230 Some translations cleanup
A couple missing translations
2015-12-09 14:03:30 -05:00
Matthew Taylor
d80e9feda5 Some translations cleanup
A couple missing translations
2015-12-09 14:02:45 -05:00
Matthew Taylor
df6818371e Merge pull request from mewtaylor/bugfix/update-translations-dependency-repo
Update where `scratchr2_translations` points to
2015-12-09 10:45:09 -05:00
Andrew Sliwinski
9aaf7c4009 Merge pull request from thisandagain/bugfix/280
Change 'View All' link in news component to direct towards forums
2015-12-09 09:57:00 -05:00
Matthew Taylor
40b41a0227 Merge pull request from mewtaylor/bugfix/update-translations-dependency-repo-develop
Update translations dependency repo (for develop branch)
2015-12-09 09:52:49 -05:00