scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-22 13:32:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14442 commits 223 branches 1 tag 526 MiB
Commit graph

14442 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ray Schamp
c9ab68490b Merge pull request #436 from rschamp/bugfix/jsi18n 
End static directories with / in Pass condition
 2016-04-26 09:01:37 -04:00
Matthew Taylor
87ed5825ff Merge pull request #437 from mewtaylor/bugfix/remove-schedule-link 
Bugfix: Temporarily remove "View Full Schedule" link
 2016-04-26 07:56:24 -04:00
Matthew Taylor
a4e19a5edc Temporarily remove "View Full Schedule" link 
Since we don't have one yet
 2016-04-25 17:39:31 -04:00
Ray Schamp
39063ae76c End static directories with / in Pass condition 
Otherwise, any URL beginning with static path names go to S3.
 2016-04-25 14:32:52 -04:00
Ray Schamp
b5581948a2 Merge pull request #432 from TheGrits/patch-5 
Fix gh-427: Footer Wiki Link not working
 2016-04-25 09:00:20 -04:00
The_Grits
ac9717a095 Whoops 
Seems like Travis would rather not have the guidelines route included
 2016-04-25 08:00:36 -04:00
The_Grits
c657a4b5f9 Squash and Merge 2016-04-25 07:52:20 -04:00
The_Grits
4a31a7882b Add DMCA route 
I also included the guidelines route to avoid future branch conflict.
 2016-04-25 07:44:57 -04:00
The_Grits
117eed5eb3 Squash and Merge 2016-04-23 14:27:08 -04:00
The_Grits
c7a864450a Add guidelines route 2016-04-23 08:14:17 -04:00
The_Grits
278f5c2771 https -> http 2016-04-22 16:53:47 -04:00
The_Grits
e73d3fabcc All other references 2016-04-22 14:16:59 -04:00
The_Grits
123b366180 13mil -> 14mil 2016-04-22 14:11:25 -04:00
Ray Schamp
19a0ed3f4b Remove spaces from condition 
This condition exceeded 512 characters. We will have to rethink how to construct this.
 2016-04-22 09:54:14 -04:00
Matthew Taylor
e1a6be55c9 Merge pull request #429 from mewtaylor/feature/conference 
Add initial site for Scratch Conference
 2016-04-22 09:27:36 -04:00
Matthew Taylor
3c487163a0 Last minute copy updates 2016-04-22 09:07:32 -04:00
Matthew Taylor
14bb35e330 missed one view -> name change 2016-04-22 09:07:12 -04:00
Matthew Taylor
bf1a99fd63 use route name now with updated strucutre 
Thanks @rschamp for this!
 2016-04-21 18:16:49 -04:00
Matthew Taylor
2eb62e8ab3 move component convention back to what it was 
formerly presentation components such as `navigation` and `footer` have been nested, and renamed to `container` inside their respective component subdirs
 2016-04-21 18:13:21 -04:00
Matthew Taylor
9b52097c38 Update lint paths for new component structure 2016-04-21 16:49:32 -04:00
Matthew Taylor
66113e1c58 Add conference sub-site 2016-04-21 16:22:39 -04:00
Matthew Taylor
017d58fb1b Split out footer container/presentation 2016-04-21 16:22:16 -04:00
Matthew Taylor
f05cb39501 Add flex-row component 
Just a container with some default flexbox formatting.
 2016-04-21 16:21:22 -04:00
Matthew Taylor
3c8a7db834 Take margins out of typography 
They won't be the same margins for text-heavy and text-lite pages, so we should make thess view-specific for now
 2016-04-21 16:19:20 -04:00
Matthew Taylor
38c4566e2b Split out name and view for routes 
This will help for the conference urls, which will be sub-urls, all under `conference`
 2016-04-21 16:16:59 -04:00