scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 02:56:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
432 commits 217 branches 1 tag 479 MiB
Commit graph

432 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
1c802f9230 Some translations cleanup 
A couple missing translations
 2015-12-09 14:03:30 -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
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
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
Matthew Taylor
0190e034e4 Add Uzbek to language list 2015-11-28 10:59:41 -05:00
Ray Schamp
f1fd84e7c7 Fall back to scratchr2 in development 
There's no reason to proxy individual paths when we want all of them to fall back to what we haven't migrated yet. This mirrors the behavior of production.

Resolves GH-194
 2015-11-26 23:34:21 -08:00
Ray Schamp
9c6cf5f449 Fix GH-237: Show My Classes in nav to educators 2015-11-26 12:08:28 -08:00
Ray Schamp
4547c2b4c1 Merge pull request #247 from rschamp/issue/GH-133 
Add version.txt file to build directory on build
 2015-11-24 19:59:53 -05:00
Matthew Taylor
0d724ec0ad Merge pull request #255 from carljbowman/HOC-Collab-Update 
Add Made with Code Logo
 2015-11-23 12:28:11 -05:00
Matthew Taylor
45b44204b4 Merge pull request #250 from carljbowman/HOC-Collab-Update 
Hoc collab update
 2015-11-20 17:41:59 -05:00
Ray Schamp
70a0a2d4c4 Rename version to tag to match scratch-api 2015-11-20 11:08:42 -05:00
Ray Schamp
7983d7601b Quiet EB config status check command 2015-11-20 11:07:39 -05:00
Ray Schamp
82fe07ed8b Add version.txt file to build directory on build 2015-11-20 11:07:39 -05:00
Ray Schamp
fafff50401 Merge pull request #209 from rschamp/feature/developers-developers-developers 
Use webpack-dev-middleware for assets in dev
 2015-11-20 11:04:10 -05:00
carljbowman
ba2902f979 Add Made with Code Logo 2015-11-20 09:56:10 -05:00
Ray Schamp
3afcd7fd9f Remove watch and stop targets, update README 2015-11-19 15:59:30 -05:00
Matthew Taylor
7bc85bec0d Merge pull request #223 from mewtaylor/cleanup/locale-updates 
Clean up `build-locales` and add tests for it.
 2015-11-19 15:40:42 -05:00
Matthew Taylor
d9936af58f Remove Dedupe plugin from webpack 
https://webpack.github.io/docs/list-of-plugins.html#dedupeplugin – it's still experimental. This allows `make watch` to update correctly.
 2015-11-19 15:30:19 -05:00
Ray Schamp
ae8d4d8990 Use webpack-dev-middleware for assets in dev 2015-11-19 15:25:39 -05:00
Ray Schamp
c065df3faa Use webpack for static assets 2015-11-19 15:25:39 -05:00
Matthew Taylor
133e42de06 Update to beta 1 
locales configuration not loaded automatically anymore, so we need to load react-intl with locales included into the browser ahead of time
 2015-11-19 15:25:39 -05:00
Matthew Taylor
fc834b8817 Move scripts to new lib folder 
Thanks @thisandagain for the tip!
 2015-11-19 10:05:38 -05:00
Andrew Sliwinski
167353c68d Migrate credits page. Resolves GH-30. Resolves GH-174. Resolves GH-215 2015-11-18 21:14:54 -05:00
Andrew Sliwinski
731f6a93d4 Merge pull request #242 from mewtaylor/update-dependencies 
Version Bump: Upgrade react modules for 0.14 compatibility
 2015-11-18 20:14:40 -05:00