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
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
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
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
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
8370a9d86c
Fix double =
2016-04-28 15:55:08 -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
fbaa2d2ed9
Consolidate pass condition to one req.url~ check
2016-04-28 14:18:42 -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
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
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
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
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
Matthew Taylor
eed6f1fc08
Restructure src
...
1. Put formatting-specific components into the `presentation` subdir of `components`
2. Put content-specific components into the `container` subdir of `components`
3. Put views that are sub-urls of the site into a subdir of `views` (i.e. `microworlds`, and eventually `conference`)
2016-04-21 15:46:32 -04:00
Ray Schamp
d3d8d34848
Merge pull request #425 from LLK/s3
...
Move app to S3 hosting
2016-04-21 15:27:51 -04:00
Ray Schamp
39be1b2085
Prepend env to avoid error 127, remove s3 branch
...
Using env provides the environment needed by the script provider to run make.
Removing s3 branch from the staging deployment list so that this is ready to merge.
2016-04-21 09:50:17 -04:00
Ray Schamp
5cd3998c1c
Use after_success for deployment
...
The script provider seems to be unusable right now: https://github.com/travis-ci/travis-ci/issues/5538
2016-04-20 09:47:55 -04:00
Ray Schamp
b8bfe46890
Configure redirect routes in Fastly
2016-04-19 18:42:03 -04:00
Ray Schamp
b4a7a2884f
Rename to dev-server after merge
2016-04-19 16:57:02 -04:00
Ray Schamp
59227e3272
Merge branch 'add_redirects' of github.com:sclements/scratch-www into s3
...
# Conflicts:
# .eslintrc
# server/handler.js
2016-04-19 16:56:22 -04:00
Ray Schamp
27cd27c35f
WIP rename for merge
2016-04-19 16:50:44 -04:00
Ray Schamp
ff70324fb5
Use s3 module to deploy to S3
2016-04-19 16:35:51 -04:00
Ray Schamp
494085247d
Activate after configuring Fastly
2016-04-19 13:04:45 -04:00
Ray Schamp
f90adfcadb
Be explicit, direct app requests to S3
2016-04-19 10:50:57 -04:00
Ray Schamp
303b5c44a8
Lint bin subdirectories
2016-04-19 10:47:33 -04:00
Ray Schamp
eb5edc293d
Linting
2016-04-18 14:07:27 -04:00
