Commit graph

5305 commits

Author SHA1 Message Date
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 #292 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 #259 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 #286 from mewtaylor/bugfix/hoc-translation-updates
Some translations cleanup [master]
2015-12-10 09:43:17 -05:00
Matthew Taylor
738749977d Merge pull request #287 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 #284 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 #281 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 #285 from mewtaylor/bugfix/update-translations-dependency-repo-develop
Update translations dependency repo (for develop branch)
2015-12-09 09:52:49 -05:00
Matthew Taylor
25288ddca7 Revert "Add code.org tracking pixel"
This reverts commit a09c37fed8.
2015-12-09 09:41:56 -05:00
Matthew Taylor
42672378dd Update where scratchr2_translations points to
I forgot that I had a PR opened to do this, my bad.
2015-12-08 18:52:13 -05:00
Andrew Sliwinski
66d9c390fe Change 'View All' link in news component to redirect towards announcements. Resolves GH-280 2015-12-08 14:05:03 -05:00
Andrew Sliwinski
fc59793aff Merge pull request #244 from thisandagain/feature/about
Migrate - About View
2015-12-08 13:52:27 -05:00
Andrew Sliwinski
64546a2410 Merge pull request #245 from thisandagain/feature/credits
Migrate - Credits View
2015-12-08 13:52:18 -05:00
Andrew Sliwinski
2fdc6458e0 Address feedback from review 2015-12-08 10:53:12 -05:00
Andrew Sliwinski
aa7efc7e4f Merge branch 'develop' of github.com:llk/scratch-www into feature/about 2015-12-08 10:31:48 -05:00
Andrew Sliwinski
2970502c25 Merge pull request #269 from mewtaylor/issue/265-refactor-build-locales-defaults
Fix gh-265: Default to msgid string if no localization found
2015-12-08 10:29:17 -05:00
Matthew Taylor
82008c3fa1 Update for rename 2015-12-08 09:51:27 -05:00
Matthew Taylor
ebc306a673 Add some extra info to readme
1. note on installing node/npm before getting started
2. note emphasizing that default setup means pointing to real data on the Scratch website.
2015-12-08 09:50:50 -05:00
Matthew Taylor
6285c3f755 Add contribution mardown file
This is also the homepage of the wiki.
2015-12-08 09:50:50 -05:00
Matthew Taylor
1ab7a27929 Add apache 2.0 license 2015-12-08 09:50:50 -05:00
Matthew Taylor
20695b21c1 Merge pull request #274 from mewtaylor/bugfix/rename-proxy-host-fallback
Rename `PROXY_HOST` to `FALLBACK`
2015-12-04 13:56:18 -05:00
Andrew Sliwinski
5a03780b36 Merge pull request #277 from thisandagain/hotfix/hoc
Hotfix - Add code.org tracking pixel
2015-12-04 13:50:43 -05:00
Andrew Sliwinski
a09c37fed8 Add code.org tracking pixel 2015-12-04 13:37:06 -05:00
Ray Schamp
b85775b20f Merge pull request #276 from thisandagain/hotfix/hoc
Hotfix - Legal fixes for HOC page
2015-12-04 13:01:21 -05:00
Andrew Sliwinski
b23e9b0dc1 Merge pull request #275 from thisandagain/hotfix/hoc
Hotfix - Legal fixes for HOC page
2015-12-04 11:22:48 -05:00
Andrew Sliwinski
30f4feff48 Hotfix for HOC legal notices 2015-12-04 10:41:25 -05:00
Matthew Taylor
d0f5dbeb07 Rename PROXY_HOST to FALLBACK
Thanks @rschamp!
2015-12-04 09:52:10 -05:00
Matthew Taylor
13456f6dd9 Merge pull request #272 from mewtaylor/ergonomics/make-fallback-optional
[Ergonomics] Add `shouldFallback` process env variable
2015-12-04 05:45:41 -05:00
Matthew Taylor
2bd97255b0 Some updates to readme, fallback system
ht @rschamp for the suggestions!
2015-12-03 15:53:51 -05:00
Matthew Taylor
d630efb23c Add shouldFallback process env variable
So that it's clear to newcomers what things are not yet completed in scratch-www as we build it out.
2015-12-03 10:44:47 -05:00
Hannah Cole
92dc1727e2 fixed tests, formatting 2015-12-01 16:14:37 -05:00
Hannah Cole
97877b1fbd jobs page styling changes 2015-12-01 16:00:52 -05:00
Hannah Cole
1eadc19d5e localized jobs page 2015-12-01 15:50:29 -05:00
Matthew Taylor
75dc3ee630 Default to msgid string if not found 2015-12-01 11:25:03 -05:00
Matthew Taylor
cf2a5cc477 Merge pull request #268 from mewtaylor/feature/remove-fr-ca-locale
Remove fr-ca from language list
2015-12-01 09:21:21 -05:00
Matthew Taylor
5752884f1d Merge pull request #267 from mewtaylor/issue/263-mobile-layout
Fix gh-263: Remove `width=device-width` until mobile nav/footer completed
2015-12-01 08:46:05 -05:00
Matthew Taylor
c6507b0eeb Remove fr-ca from language list
See https://github.com/LLK/scratchr2/pull/3108. Also fix typo with `forParents` intro string
2015-12-01 08:44:39 -05:00
Ray Schamp
6adb6dd210 Merge pull request #260 from rschamp/bugfix/GH-237
Fix GH-237: Show My Classes in nav to educators
2015-11-30 16:30:17 -05:00
Ray Schamp
961d97eb67 Use FormattedMessage for My Classes text
I had matched it to My Stuff, but that's different since the top nav needs the text for a title attribute. h/t @mewtaylor
2015-11-30 16:25:11 -05:00
Matthew Taylor
a65253ffb2 remove width=device-width until mobile nav/footer 2015-11-30 16:22:52 -05:00
Ray Schamp
e6448ae4bf Merge pull request #261 from rschamp/feature/better-proxy-fallback
Fall back to scratchr2 in development
2015-11-30 12:04:17 -05:00
Ray Schamp
10669cab01 Merge pull request #262 from mewtaylor/issue/scratchr2-3093-add-uzbek
Add Uzbek to language list
2015-11-30 09:14:23 -05:00
Hannah Cole
6ec9f7da11 created jobs page 2015-11-29 13:53:03 -05:00
Hannah Cole
c82aecf1f7 created jobs page 2015-11-29 13:42:26 -05:00