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
771 commits 216 branches 1 tag 464 MiB
Commit graph

771 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
43788eb7d8 Split server and routes/config 
Turn HtmlGeneratorPlugin into a module
Turn server into dev-server and simplify it
 2016-04-18 14:07:11 -04:00
Ray Schamp
707af8dbe9 Use async.auto to make dependencies clearer 
Thanks @thisandagain — now I know why you said async.auto is so awesome.

Also throw the error so we get a stacktrace, and make the bucket name and service ID into constants.
 2016-04-18 13:23:23 -04:00
Ray Schamp
32611c9cba Fix rewrite priority 
The order of the rewrite conditions needs to be internally consistent so we can control specificity with routes.json
 2016-04-16 14:08:53 -04:00
Ray Schamp
c6abc2ae7b Fix cache_settings request 2016-04-16 14:05:16 -04:00
Ray Schamp
ab0979b958 Add docstrings 2016-04-16 13:46:03 -04:00
Ray Schamp
5846dcacc8 Use constants instead of functions for strings 2016-04-16 13:01:39 -04:00
Ray Schamp
0aa9b7c587 Untangle the requests a bit with help from async 2016-04-16 12:49:48 -04:00
Ray Schamp
87da93f9ea Move some fastly-specific stuff into a module 2016-04-16 10:17:20 -04:00
Ray Schamp
de5f36b649 Add script for configuring Fastly for S3 
* Builds the Pass condition based on the static directory and view routes.
* Updates Fastly with new header and conditions based on the view routes.
* Uses a nice module for interacting with fastly :)

Needs some major cleanup but it works. Hopefully Travis will work too.
 2016-04-15 19:42:57 -04:00
Matthew Taylor
a6e199b5f4 Merge pull request #414 from TheGrits/patch-4 
Fix gh-413: Update supporting organizations
 2016-04-15 16:22:54 -04:00
The_Grits
c9492ae38b Update l10n.json 2016-04-15 16:12:17 -04:00
The_Grits
08ccaa7721 Spaces and Intel 2016-04-15 15:59:32 -04:00
The_Grits
1a2e30fccd mailto anchor 2016-04-15 15:58:11 -04:00
Ray Schamp
c8c681f8c0 Use S3 to deploy 
Temporarily deploy s3 branch to staging
 2016-04-14 16:22:13 -04:00
Ray Schamp
3bdb95d40d Set up static view rendering 2016-04-14 16:22:13 -04:00
Ray Schamp
0ee2234c08 Merge pull request #422 from rschamp/feature/upgrade-css-loader 
Upgrade css-loader and autoprefixer-loader
 2016-04-14 16:19:40 -04:00
The_Grits
d6b08a0bff Add Chris and Julia 
As per https://github.com/LLK/scratch-www/issues/413#issuecomment-209889924
 2016-04-14 12:36:20 -04:00
Ray Schamp
7aa05b1784 Upgrade css-loader and autoprefixer-loader 
These depended on postcss < 5, which caused the errors like

Container#eachAtRule is deprecated. Use Container#walkAtRules instead.
Container#eachRule is deprecated. Use Container#walkRules instead.
Container#eachDecl is deprecated. Use Container#walkDecls instead.
Node#style() is deprecated. Use Node#raw()
Node#_value was deprecated. Use Node#raws.value
Container#remove is deprecated. Use Container#removeChild

The autoprefixer-loader package is deprecated now and recommends using postcss-loader + autoprefixer itself.
 2016-04-13 15:21:25 -04:00
The_Grits
174b351845 Delete the extra space 2016-04-09 14:28:05 -04:00
Shane M. Clements
32e2fb5516 Fixed another lint issue. 2016-04-09 11:07:21 -06:00
Shane M. Clements
a6be92448b Fixed linting errors and webpack config for redirect routes. 2016-04-09 10:39:55 -06:00
Shane M. Clements
cbc58d2f11 Added code for redirects and now redirecting the donation URL to the proper location. Fixes #412. 2016-04-09 10:04:39 -06:00
Matthew Taylor
8a8513a5cd Merge pull request #416 from mewtaylor/hotfix/wedo-page 
[Master] Hotfix: Wrap wedo2 view in page component
 2016-04-07 17:31:00 -04:00
Matthew Taylor
8fd4b154b2 Merge pull request #417 from mewtaylor/hotfix/wedo-page 
[Develop] Hotfix: Wrap wedo2 view in page component
 2016-04-07 17:01:17 -04:00
Matthew Taylor
7aeaaeb480 Wrap wedo2 view in page component 2016-04-07 16:49:35 -04:00
The_Grits
855154edcf Update CN url 
As per https://github.com/LLK/scratch-www/pull/414#issuecomment-206880466
 2016-04-07 09:36:45 -04:00
The_Grits
6d349cb7f9 Update supporting organizations 
Changed according to #413
 2016-04-06 17:49:30 -04:00
The_Grits
09d095b963 Change supporting organizations 
As per #413.
Specific additions:
- Cartoon Network
- Lemann Foundation
 2016-04-06 17:42:05 -04:00
Ray Schamp
10455f980f Merge pull request #403 from LLK/release/2.2.7 
[develop] Release 2.2.7
 2016-04-05 15:27:11 -04:00
Ray Schamp
341e09acff Merge pull request #402 from LLK/release/2.2.7 
[master] Release 2.2.7
 2016-04-05 15:26:27 -04:00
Matthew Taylor
27b55082f0 Merge pull request #407 from mewtaylor/issue/gh-406-counselor-link 
GH-406: Add community counselor job
 2016-04-04 14:55:36 -04:00
Ray Schamp
53e508dd24 Merge pull request #411 from sayamindu/develop 
Add view for community blocks interview recruitment
 2016-04-01 16:34:57 -04:00
Andrew Sliwinski
a059aab829 Merge pull request #408 from sayamindu/develop 
Add view for community blocks interview recruitment
 2016-04-01 16:18:33 -04:00
Sayamindu Dasgupta
bd81438800 Add view for community blocks interview recruitment 
We are recruiting Scratchers for interviews on the Scratch Community
blocks feature; this is a part of my PhD disseration. This commit has
the PDF forms and the views that are needed for the recruitment.
 2016-04-01 13:23:48 -04:00
Matthew Taylor
7734ee8931 Add community counselor job 
Fixes #406
 2016-04-01 10:29:13 -04:00
Ray Schamp
122b97b2a9 Merge pull request #405 from rschamp/hotfix/production-modules 
[develop] Hotfix: Don't require dev dependencies in production
 2016-03-31 12:35:22 -04:00
Ray Schamp
4714b32fa9 Merge pull request #404 from rschamp/hotfix/production-modules 
[master] Hotfix: don't require dev dependencies in production
 2016-03-31 12:35:02 -04:00
Ray Schamp
8bc3e5e2a5 Don't require dev dependencies in production 2016-03-31 12:24:33 -04:00
Ray Schamp
4e99e701d5 Merge pull request #401 from rschamp/bugfix/nav-session-undefined 
Fix reference to session
 2016-03-29 18:39:54 -04:00
Ray Schamp
c9157e70b9 Fix reference to session 
Caused by merging an old branch which didn't have conflicts, but did have a different understanding of session.
 2016-03-29 18:38:39 -04:00
Matthew Taylor
1c20600272 Merge pull request #399 from mewtaylor/issue/gh-398-jobs-error 
Fix GH-398: Add page component to jobs view
 2016-03-28 14:27:34 -04:00
Matthew Taylor
1adb8ecf5b Add page component to jobs view 
Fixes #398
 2016-03-28 14:18:44 -04:00
Ray Schamp
78649b69e2 Merge pull request #353 from morantsur/feature/microworlds 
Moving Microworlds pages to scratch-www & adding arts
 2016-03-25 15:43:10 -04:00
Ray Schamp
ea04658b4a Merge pull request #387 from rschamp/feature/scratchr2#2937-student-nav 
Add "My Class" to student nav
 2016-03-25 14:32:22 -04:00
Ray Schamp
0fa50bfd73 Merge pull request #394 from rschamp/bugfix/nav-css 
Fix incorrect nesting in search styles
 2016-03-24 13:13:18 -04:00
Ray Schamp
6e0d35efaa Fix incorrect nesting in search styles 2016-03-24 13:12:41 -04:00
Ray Schamp
74d23d05dc Remove inline default messages 2016-03-24 12:29:40 -04:00
Ray Schamp
2d6a38800b Add "My Class" to student nav 2016-03-24 12:28:32 -04:00
Ray Schamp
29fa914b9a Merge pull request #391 from rschamp/feature/token-from-cookie 
Add method to retrieve token from session cookie and use it
 2016-03-24 12:27:07 -04:00
Ray Schamp
042ef65070 Merge pull request #393 from rschamp/feature/silence 
Upgrade sass-lint, quiet various warnings
 2016-03-24 12:02:40 -04:00