scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
809 commits 218 branches 1 tag 463 MiB
Commit graph

809 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
fd1016059b Merge branch 'patch-8' of https://github.com/TheGrits/scratch-www into TheGrits-patch-8 
* 'patch-8' of https://github.com/TheGrits/scratch-www:
  Indent p element
  Edit spacing
  Whoops
  Squash and Merge
  Add DMCA route

# Conflicts:
#	src/routes.json
 2016-05-03 10:23:34 -04:00
Ray Schamp
64f91601f0 Merge branch 'hotfix/analytics' 2016-05-02 14:54:18 -04:00
Ray Schamp
c20a93dc96 Merge branch 'hotfix/analytics' into develop 2016-05-02 14:53:53 -04:00
Ray Schamp
12447823f2 Fix defaults for fastly and analytics 2016-05-02 14:53:19 -04:00
Ray Schamp
765e68b282 Merge pull request #465 from LLK/hotfix/analytics 
[Master] Hotfix: Add missing env variables needed for the build
 2016-05-02 14:02:04 -04:00
Ray Schamp
fb292f3773 Merge pull request #466 from LLK/hotfix/analytics 
[Develop] Hotfix: Add missing env variables needed for the build
 2016-05-02 14:01:55 -04:00
Ray Schamp
3833c07518 Define all environment variables by branch name 2016-05-02 13:44:55 -04:00
Ray Schamp
e48b04f907 Add missing env variables needed for build 2016-05-02 11:57:46 -04:00
Matthew Taylor
47d7257895 Merge pull request #462 from mewtaylor/hotfix/add-register-faq 
[Develop] Hotfix: Add Registration to FAQ
 2016-05-01 12:48:41 -04:00
Matthew Taylor
cc58f999f8 Merge pull request #461 from mewtaylor/hotfix/add-register-faq 
[Master] Hotfix: Add registration to FAQ
 2016-04-30 11:29:35 -04:00
Matthew Taylor
c28f90857b Add registration faq question 2016-04-29 17:37:41 -04:00
Matthew Taylor
07bbc38822 Merge pull request #433 from TheGrits/patch-7 
Fix gh-19: Migrate Community Guidelines
 2016-04-29 17:32:35 -04:00
The_Grits
20dcf8eb4f switch 2016-04-29 17:27:39 -04:00
The_Grits
64143704d5 Thanks Travis 
Got rid of a trailing space
 2016-04-29 17:22:49 -04:00
The_Grits
aaf4ee5b49 oops lol 
Gotta love those duplicate lines!
 2016-04-29 17:18:09 -04:00
The_Grits
09775ad4a5 Squash and Merge 2016-04-29 17:15:26 -04:00
Matthew Taylor
f7d31b547b Merge branch 'TheGrits-patch-3' into develop 
* TheGrits-patch-3:
  Disable mobile Safari phone numbers
 2016-04-29 16:40:54 -04:00
Matthew Taylor
cc8f53939d Merge branch 'patch-3' of https://github.com/TheGrits/scratch-www into TheGrits-patch-3 
* 'patch-3' of https://github.com/TheGrits/scratch-www:
  Disable mobile Safari phone numbers
 2016-04-29 16:39:42 -04:00
Matthew Taylor
87009babae Merge pull request #431 from TheGrits/patch-6 
Fix gh-426: Update Project Count
 2016-04-29 16:38:02 -04:00
Ray Schamp
82d35884ce Merge pull request #458 from LLK/hotfix/s3cmd 
[Master] Use s3cmd for S3 deployment
 2016-04-29 16:27:03 -04:00
Ray Schamp
32677659c3 Merge pull request #459 from LLK/hotfix/s3cmd 
[Develop] Use s3cmd for S3 deployment
 2016-04-29 16:26:53 -04:00
Ray Schamp
fce7c0cd9b Purge all after configuring Fastly 2016-04-29 15:52:16 -04:00
Ray Schamp
dd1c2c1627 Use s3cmd to sync with S3 2016-04-29 15:52:15 -04:00
Colby Gutierrez-Kraybill
06cd20ca8f Move warnings info closer to instructions 2016-04-29 11:51:14 -04:00
Colby Gutierrez-Kraybill
e6404d58eb Add info about warnings 2016-04-29 11:50:13 -04:00
Ray Schamp
c41c40340a Merge pull request #452 from rschamp/hotfix/clean-s3-uploads 
[Master] Remove deleted files from S3 on build
 2016-04-29 10:01:48 -04:00
Ray Schamp
5105ac75ff Merge pull request #453 from rschamp/hotfix/clean-s3-uploads 
[Develop] Remove deleted files from S3 on build
 2016-04-29 09:23:59 -04:00
Ray Schamp
62ff7f615a Remove deleted files from S3 on build 2016-04-28 17:07:11 -04:00
Ray Schamp
d48072d018 Merge pull request #450 from rschamp/hotfix/webpack-tag 
[Master] Mark version with webpack
 2016-04-28 15:57:25 -04:00
Ray Schamp
f0475bc1ae Merge branch 'hotfix/webpack-tag' into develop 2016-04-28 15:56:42 -04:00
Ray Schamp
8370a9d86c Fix double = 2016-04-28 15:55:08 -04:00
Ray Schamp
b3b34e4980 Merge pull request #451 from rschamp/hotfix/webpack-tag 
[Develop] Mark version with webpack
 2016-04-28 15:48:59 -04:00
Ray Schamp
669a8c9ae3 Mark version with webpack 2016-04-28 15:40:50 -04:00
Ray Schamp
26ee49e9d8 Merge pull request #448 from rschamp/hotfix/shorten-pass 
[Master] Consolidate pass condition to one `req.url~` check
 2016-04-28 14:32:14 -04:00
Ray Schamp
c6dfb0f7f5 Merge pull request #449 from rschamp/hotfix/shorten-pass 
[Develop] Consolidate pass condition to one `req.url~` check
 2016-04-28 14:23:14 -04:00
Ray Schamp
fbaa2d2ed9 Consolidate pass condition to one req.url~ check 2016-04-28 14:18:42 -04:00
Ray Schamp
05fa43b2fc Merge pull request #447 from LLK/release/2.2.8 
[Develop] Release 2.2.8
 2016-04-28 14:04:12 -04:00
Ray Schamp
eb7656c2ad Merge pull request #430 from LLK/release/2.2.8 
[Master] Release 2.2.8
 2016-04-28 13:38:38 -04:00
Ray Schamp
e21f9514ab Merge pull request #445 from rschamp/bugfix/rewrite-priority 
Raise priority of rewrite conditions
 2016-04-28 09:44:34 -04:00
The_Grits
9ae31c132f Indent p element 2016-04-28 09:18:26 -04:00
Matthew Taylor
59f149370b Merge pull request #446 from mewtaylor/cleanup/update-images-conf 
final content update for conference
 2016-04-28 08:49:05 -04:00
Matthew Taylor
cf71520875 final content update for conference 
"coming soon" image for schedule, and schedule reference on landing page. Also background image for the landing page.
 2016-04-27 23:23:43 -04:00
Ray Schamp
a08f56230a Raise priority of rewrite conditions 
This avoids a situation where going to http://staging.scratch.mit.edu/hoc will redirect to https://staging.scratch.mit.edu/hoc.html.
 2016-04-27 15:27:45 -04:00
Matthew Taylor
34d9dbcfd5 Merge pull request #444 from mewtaylor/bugfix/change-viewportwidth 
Make viewport width a variable value
 2016-04-27 13:50:39 -04:00
Ray Schamp
df24eb2d63 Merge pull request #443 from LLK/revert-432-patch-5 
Revert "Fix gh-427: Footer Wiki Link not working"
 2016-04-26 16:45:22 -04:00
Ray Schamp
01f8f97118 Revert "Fix gh-427: Footer Wiki Link not working" 2016-04-26 16:45:05 -04:00
Matthew Taylor
5ea59cb1ec Make viewport width a variable value 
So that we can allow some pages to be responsive
 2016-04-26 14:19:21 -04:00
Matthew Taylor
a408a765c5 Merge pull request #439 from mewtaylor/cleanup/edits-for-conference 
Cleanup for scratch conference
 2016-04-26 12:29:15 -04:00
Matthew Taylor
7d7fb9797d Cleanup for scratch conference 
1. s/collaborators/sponsors
2. open footer links in new window
3. remove superfluous require statement
4. increase spacing for scratch family links
 2016-04-26 12:24:55 -04:00
The_Grits
df8c036daf Edit spacing 
As per @mewtaylor 's suggestions on #435
 2016-04-26 09:09:07 -04:00