scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-14 17:51:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14320 commits 220 branches 1 tag 511 MiB
Commit graph

14320 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
c274de7295 Make template variables a bit less verbose 
Move the rest of the configuration into template-config.js.  This way the options are explicitly in the same namespace so we won't be surprised when we add a variable with the same name as an html-webpack-plugin option.

Rename template extension to ejs for syntax-coloring purposes.
 2016-09-09 09:21:03 -04:00
Ray Schamp
3256164fdf Merge pull request #910 from rschamp/bugfix/787 
Add Cache-Control header to all S3 uploads
 2016-09-08 17:46:58 -04:00
Ray Schamp
b5870e006d Reduce cache expiration to one hour 2016-09-08 17:36:57 -04:00
Ray Schamp
c0eb1608bd Don't set state to undefined API response bodies 
This resolves the "Cannot read property 'x' of undefined" errors that occur when the API returns non-JSON responses. For instance if the proxy endpoints return 500 error responses from scratchr2.
 2016-09-08 17:23:49 -04:00
morant
89faccfc6f Remove caret from routhAlias 2016-09-08 17:06:24 -04:00
Ray Schamp
e44e958fe0 Move permissions storage to client-side cookie 
Instead of retrieving the permission from the session cookie, store permission data from /session/, and cache it in a cookie.  On subsequent page loads, the permission information will be retrieved from the cookie more quickly than the /session/ endpoint returns. When the session changes, the cookie and permissions state is updated to reflect the new state.
 2016-09-08 12:53:05 -04:00
Ray Schamp
a497fed338 Remove token storage 
We're not using it yet, and it won't be coming from the cookie when we do.
 2016-09-08 12:48:07 -04:00
Ray Schamp
3fbd9fab36 Use html-webpack-plugin for html rendering 
This plugin will likely be updated when webpack is updated.
 2016-09-08 09:59:37 -04:00
Ray Schamp
d303509336 Add Cache-Control header to all S3 uploads 2016-09-08 09:13:04 -04:00
morant
850def5cf0 - Remove commented out content from microword pages, as they are not displayed. 
- Change art microworld text to not refer to videos.
 2016-09-07 16:27:46 -04:00
morant
96c52dc223 Fixing route alias + adding new line 2016-09-07 13:35:14 -04:00
Matthew Taylor
a4a2688084 Merge pull request #909 from mewtaylor/bugfix/albanian-name 
Rename Albanian correctly
 2016-09-07 07:40:45 -04:00
Matthew Taylor
b60442ccd2 Rename Albanian correctly 
My bad on the misunderstanding!
 2016-09-06 15:48:55 -04:00
Matthew Taylor
1b4eaf0f0f Merge pull request #902 from TheGrits/patch-3 
Fix gh-894: Community Guidelines Image
 2016-09-06 11:28:51 -04:00
Matthew Taylor
e454544abd Merge pull request #901 from St19Galla/patch-1 
Fix gh-900 // Update Credits
 2016-09-06 10:56:20 -04:00
Matthew Taylor
243c579b49 Merge pull request #907 from mewtaylor/issue/gh-872 
Fix GH-872: Check for username before sending
 2016-09-02 12:52:55 -04:00
Matthew Taylor
2e3aee25d9 cover undefined case as well 
thanks @rschamp!
 2016-09-01 16:22:45 -04:00
Matthew Taylor
ffa249c3c5 Check for username before sending 
the `//` for an empty username that gets sent to the backend causes a 500 error. This is an edge case in formsy, as it has not detected a change value yet, so handle it in the username validation method. Fixes #872
 2016-09-01 14:59:02 -04:00
The_Grits
c224284d81 oops 
Just realized I took the whole footer off, not just the image.
 2016-08-31 21:24:10 -04:00
The_Grits
bf24d592ad Update guidelines.scss 
Update to hide page's footer image when the screen is too small.
 2016-08-31 21:11:19 -04:00
St19_Galla
f2c176a521 Update Credits 2016-08-31 14:59:03 -04:00
Matthew Taylor
07d7750b9c Merge pull request #898 from mewtaylor/bugfix/safari-8-prefixes 
Bugfix: Add webkit prefixes for safari 8
 2016-08-31 14:47:53 -04:00
Matthew Taylor
b750ab8cf7 Add webkit prefixes for safari 8 
`caniuse` updated their api recently, and it appears that support for safari 8 is no longer in the last 3 versions (and it appears that safari 8 is not listed as supported there in general). explicitly add the version back in to make sure the proper `-webkit` prefixes are included for that browser.
 2016-08-30 11:12:11 -04:00
Matthew Taylor
ee088e6384 Merge pull request #896 from mewtaylor/issue/gh-825-zip 
Fix GH-825: Only require zip code for US addresses
 2016-08-29 13:14:22 -04:00
Ray Schamp
940ec21d38 Merge pull request #882 from St19Galla/patch-3 
Fix gh-844 // Update Readme
 2016-08-29 13:13:57 -04:00
morant
ecdc544dff Disable lint on require('react') lines as they are required implicitly. 2016-08-29 12:40:17 -04:00
Matthew Taylor
33d06e9721 Merge pull request #865 from St19Galla/patch-2 
Fix gh-864 // Update Conference Text
 2016-08-29 11:57:48 -04:00
morant
2af34efa98 Fix some failed tests. 2016-08-26 15:51:42 -04:00
Matthew Taylor
e7b0415a6b Only require zip code for US addresses 
Since we only check for the US, only require for that country. Other countries have zip codes, but it seems better to do it this way than codify which countries do/do not have zip codes (in case local practices are not the same as international information). Fixes #825
 2016-08-26 11:14:26 -04:00
Matthew Taylor
fae45f191e Merge pull request #873 from TheGrits/patch-2 
Fix gh-853: Update Community Guidelines
 2016-08-26 10:27:47 -04:00
Matthew Taylor
45d206315f Merge pull request #863 from St19Galla/patch-1 
Fix gh-860 // Update FAQ
 2016-08-26 10:27:00 -04:00
Matthew Taylor
85630ffeb4 Merge pull request #880 from LLK/release/2.2.12 
[Develop] Release 2.2.12
 2016-08-26 08:05:00 -04:00
St19_Galla
9a825099a1 update readme 2016-08-25 17:06:10 -04:00
Matthew Taylor
6f8a6eca42 Merge pull request #881 from LLK/release/2.2.12 
[Master] Release 2.2.12
 2016-08-25 15:48:26 -04:00
St19_Galla
5ca03b4e3a remove on from anchor 2016-08-25 08:05:32 -04:00
Matthew Taylor
ab6f8e1049 Add in an Oxford Comma 
*whistles as he commits

see https://github.com/LLK/scratch-www/pull/819#issuecomment-242195194
 2016-08-24 16:39:03 -04:00
Matthew Taylor
846c302abf Merge pull request #877 from mewtaylor/bugfix/grid-alignment 
Bugfix: Align projects in grid to the left
 2016-08-24 11:09:40 -04:00
Matthew Taylor
5dd80c1020 additional reformatting 2016-08-24 10:55:13 -04:00
Matthew Taylor
fb5d9788f8 Re-structure grid styling a bit 
combine stylings where possible, re-name some of the variables to be used more often
 2016-08-24 10:24:01 -04:00
Matthew Taylor
28f96a1d0d Align grid items on the left 
use `flex-start` with margins to ensure proper spacing between, while still starting at the left of each row.
 2016-08-24 10:23:26 -04:00
Matthew Taylor
515bb59bc8 Merge pull request #874 from mewtaylor/bugfix/mobile-meta 
Bugfix: Add `device-width` by default
 2016-08-24 09:07:48 -04:00
Matthew Taylor
9a11e49444 Add device-width by default 
Now that we have mobile nav/footer
 2016-08-24 07:54:08 -04:00
The_Grits
c0c7a1a7e0 Update Community Guidelines 
As per @Paddle2See on #853
 2016-08-23 16:31:43 -04:00
Matthew Taylor
acb363f93f Merge pull request #871 from technoboy10/new-explore-release 
Redesign Explore and Search pages
 2016-08-23 14:28:48 -04:00
Technoboy10
32ef37e3bf remove unused variable 2016-08-23 11:10:02 -06:00
Technoboy10
f0703b9f46 fix styling error 2016-08-23 09:26:22 -06:00
Technoboy10
55f95bb2a8 remove inactive class on tabs 2016-08-23 09:26:22 -06:00
Technoboy10
f27e99f1a4 move card styling to grid.scss, use card as default grid style 2016-08-23 09:26:22 -06:00
Technoboy10
6394d3e8cf make search bar on 4 column layout look right 2016-08-23 09:26:22 -06:00
Technoboy10
647c925a1c search redesign 2016-08-23 09:26:22 -06:00