scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
718 commits 216 branches 1 tag 464 MiB
Commit graph

718 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
e2ff0cd63d Merge pull request #302 from rschamp/hotfix/add-kreyol 
Hotfix: Add Kreyòl
 2016-01-05 15:26:13 -05:00
Ray Schamp
d90ebdbdd4 Merge pull request #303 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 #273.
 2016-01-04 14:18:55 -05:00
Andrew Sliwinski
0e82f99515 Merge pull request #279 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 #291 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 #294 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 #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