Merge branch 'google-cdns' into remove-angular

Conflicts:
	server/boot/user.js
	server/views/account/show.jade
	server/views/account/signin.jade
	server/views/coursewares/showBonfire.jade
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade

.gitignore

@@ -30,5 +30,20 @@ coverage
 .remote-sync.json
 
 server/*.bundle.js
-public/js/*.bundle.js
+public/js/bundle*
+
 *.map
+
+// revision manifest
+server/rev-manifest.json
+server/manifests/*
+!server/manifests/README.md
+
+public/js/main*
+public/js/commonFramework*
+public/js/sandbox*
+public/js/iFrameScripts*
+public/js/plugin*
+public/css/main*
+
+server/rev-manifest.json

CONTRIBUTING.md

@@ -0,0 +1,12 @@
+We're getting a lot of duplicate issues and bug reports that just aren't reporting actual bugs.
+So, before you submit your issue, please read the [Help I've Found a Bug](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help-I've-Found-a-Bug) wiki page.
+
+We welcome pull requests from Free Code Camp campers (our students) and seasoned JavaScript developers alike! Follow these steps to contribute:
+
+1.  Check our [public Waffle Board](https://waffle.io/freecodecamp/freecodecamp).
+2.  Pick an issue that nobody has claimed and start working on it. If your issue isn't on the board, open an issue. If you think you can fix it yourself, start working on it. Feel free to ask for help in our [Gitter](https://gitter.im/FreeCodeCamp/FreeCodeCamp).
+3.  Fork the project ([Need help with forking a project?](https://help.github.com/articles/fork-a-repo/)). You'll do all of your work on your forked copy.
+4.  Create a branch specific to the issue or feature you are working on. Push your work to that branch. ([Need help with branching?](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches))
+5.  Name the branch something like `fix/xxx` or `feature/xxx` where `xxx` is a short description of the changes or feature you are attempting to add. For example `fix/email-login` would be a branch where I fix something specific to email login.
+6.  You should have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html), and it will highlight anything doesn't conform to [Free Code Camp's JavaScript Style Guide](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Free-Code-Camp-JavaScript-Style-Guide) (you can find a summary of those rules [here](https://github.com/FreeCodeCamp/FreeCodeCamp/blob/staging/.eslintrc). Please do not ignore any linting errors, as they are meant to **help** you and to ensure a clean and simple code base. Make sure none of your JavaScript is longer than 80 characters per line.
+7.  Once your code is ready, submit a [pull request](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Pull-Request-Contribute) from your branch to Free Code Camp's `staging` branch. We'll do a quick code review and give you feedback, then iterate from there. It may also be helpful to read about git [rebasing](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/git-rebase).

README.md

@@ -1,4 +1,4 @@
-<img src="https://s3.amazonaws.com/freecodecamp/wide-social-banner.png">
+![](https://s3.amazonaws.com/freecodecamp/wide-social-banner.png)
 
 [![Throughput Graph](https://graphs.waffle.io/freecodecamp/freecodecamp/throughput.svg)](https://waffle.io/freecodecamp/freecodecamp/metrics)
 
@@ -7,7 +7,7 @@
 Welcome to Free Code Camp's open source codebase!
 =======================
 
-Free Code Camp is an open-source community of busy people who learn to code, then build projects for nonprofits.
+Free Code Camp is an open-source community of busy people who learn to code and build projects for nonprofits.
 
 Our campers (students) start by working through our free, self-paced, browser-based curriculum. Next, they build several practice projects. Finally, we pair two campers together with a stakeholder from a nonprofit organization, and help them build the solution the nonprofit has requested.
 
@@ -24,7 +24,7 @@ This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We
 Wiki
 ------------
 
-We would love your help expanding our [wiki](https://github.com/freecodecamp/freecodecamp/wiki) with more information about learning to code and getting a coding job.
+We would love your help expanding our [wiki](https://github.com/freecodecamp/freecodecamp/wiki). Our goal is to become a great resource for people learning to code, building local coding communities, and applying for coding jobs.
 
 Contributing
 ------------
@@ -35,10 +35,9 @@ We welcome pull requests from Free Code Camp campers (our students) and seasoned
 2.  Pick an issue that nobody has claimed and start working on it. If your issue isn't on the board, open an issue. If you think you can fix it yourself, start working on it. Feel free to ask for help in our [Gitter](https://gitter.im/FreeCodeCamp/FreeCodeCamp).
 3.  Fork the project ([Need help with forking a project?](https://help.github.com/articles/fork-a-repo/)). You'll do all of your work on your forked copy.
 4.  Create a branch specific to the issue or feature you are working on. Push your work to that branch. ([Need help with branching?](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches))
-5.  Name the branch something like  `user-xxx` where user is your username and xxx is the issue number you are addressing.
-6.  You should have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html), and it will highlight anything doesn't conform to [AirBnB's JavaScript Style Guide](https://github.com/airbnb/javascript).  Please do not ignore any linting errors, as they are meant to **help** you. Make sure none of your JavaScript is longer than 80 characters per line.
-7.  Once your code is ready, submit a pull request from your branch to Free Code Camp's `staging` branch. We'll do a quick code review and give you feedback, then iterate from there.
-8.  Once we accept one of your pull requests, one of the project owners (currently @quincylarson, @terakilobyte, and @berkeleytrue) will add you to our camper contributor group.
+5.  Name the branch something like `fix/xxx` or `feature/xxx` where `xxx` is a short description of the changes or feature you are attempting to add. For example `fix/email-login` would be a branch where I fix something specific to email login.
+6.  You should have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html), and it will highlight anything doesn't conform to [Free Code Camp's JavaScript Style Guide](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Free-Code-Camp-JavaScript-Style-Guide) (you can find a summary of those rules [here](https://github.com/FreeCodeCamp/FreeCodeCamp/blob/staging/.eslintrc). Please do not ignore any linting errors, as they are meant to **help** you and to ensure a clean and simple code base. Make sure none of your JavaScript is longer than 80 characters per line.
+7.  Once your code is ready, submit a [pull request](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Pull-Request-Contribute) from your branch to Free Code Camp's `staging` branch. We'll do a quick code review and give you feedback, then iterate from there. It may also be helpful to read about git [rebasing](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/git-rebase).
 
 Prerequisites
 -------------
@@ -66,12 +65,13 @@ bower install
 # Create a .env file and populate it with the necessary API keys and secrets:
 touch .env
 
+# Install Gulp globally
+npm install -g gulp
 ```
 
-Edit your .env file with the following API keys accordingly (if you only use email login, only the MONGOHQ_URL, SESSION_SECRET, MANDRILL_USER and MANDRILL_PASSWORD fields are necessary. Keep in mind if you want to use more services you'll have to get your own API keys for those services.
+Edit your `.env` file with the following API keys accordingly (if you only use email login, only the `MONGOHQ_URL`, `SESSION_SECRET`, `MANDRILL_USER` and `MANDRILL_PASSWORD` fields are necessary. Keep in mind if you want to use more services you'll have to get your own API keys for those services.
 
 ```
-
 MONGOHQ_URL='mongodb://localhost:27017/freecodecamp'
 
 FACEBOOK_ID=stuff
@@ -104,20 +104,22 @@ COOKIE_SECRET='this is a secret'
 
 PEER=stuff
 DEBUG=true
-
 ```
 
 ```bash
-
 # Start the mongo server
 mongod
 
+# Create your mongo database.
+# Type "mongo" in your terminal to access the mongo shell
+use freecodecamp
+# Exit the mongo shell with control + d
+
 # Seed your database with the challenges
 node seed/
 
 # start the application
 gulp
-
 ```
 
 License

bower.json

@@ -26,6 +26,7 @@
     "moment": "~2.10.2",
     "angular-bootstrap": "~0.13.0",
     "ramda": "~0.13.0",
-    "jshint": "~2.7.0"
+    "jshint": "~2.7.0",
+    "lightbox2": "~2.8.1"
   }
 }

client/README.md

@@ -1,4 +1,4 @@
-This is the entry point for the client
+This is the entry point for the client code
 Code that should only run on the client should be put here.
 
 NOTE(berks): For react specific stuff this should be the entry point

client/es6-shims.js

@@ -0,0 +1,2 @@
+require('object.assign').shim();
+require('es6-map/implement');

client/index.js

@@ -1,3 +1,4 @@
+import unused from './es6-shims'; // eslint-disable-line
 import Rx from 'rx';
 import React from 'react';
 import Fetchr from 'fetchr';

client/less/lib/bootstrap/variables.less

@@ -107,7 +107,7 @@
 @border-radius-small:       3px;
 
 //** Global color for active items (e.g., navs or dropdowns).
-@component-active-color:    #eee;
+@component-active-color:    @gray-lighter;
 //** Global background color for active items (e.g., navs or dropdowns).
 @component-active-bg:       @brand-primary;
 
@@ -145,26 +145,26 @@
 @btn-font-weight:                normal;
 
 @btn-default-color:              #333;
-@btn-default-bg:                 #eee;
+@btn-default-bg:                 @gray-lighter;
 @btn-default-border:             #ccc;
 
-@btn-primary-color:              #eee;
+@btn-primary-color:              @gray-lighter;
 @btn-primary-bg:                 @brand-primary;
 @btn-primary-border:             darken(@btn-primary-bg, 5%);
 
-@btn-success-color:              #eee;
+@btn-success-color:              @gray-lighter;
 @btn-success-bg:                 @brand-success;
 @btn-success-border:             darken(@btn-success-bg, 5%);
 
-@btn-info-color:                 #eee;
+@btn-info-color:                 @gray-lighter;
 @btn-info-bg:                    @brand-info;
 @btn-info-border:                darken(@btn-info-bg, 5%);
 
-@btn-warning-color:              #eee;
+@btn-warning-color:              @gray-lighter;
 @btn-warning-bg:                 @brand-warning;
 @btn-warning-border:             darken(@btn-warning-bg, 5%);
 
-@btn-danger-color:               #eee;
+@btn-danger-color:               @gray-lighter;
 @btn-danger-bg:                  @brand-danger;
 @btn-danger-border:              darken(@btn-danger-bg, 5%);
 
@@ -176,7 +176,7 @@
 //##
 
 //** `<input>` background color
-@input-bg:                       #eee;
+@input-bg:                       @gray-lighter;
 //** `<input disabled>` background color
 @input-bg-disabled:              @gray-lighter;
 
@@ -223,7 +223,7 @@
 //## Dropdown menu container and contents.
 
 //** Background for the dropdown menu.
-@dropdown-bg:                    #eee;
+@dropdown-bg:                    @gray-lighter;
 //** Dropdown menu `border-color`.
 @dropdown-border:                rgba(0,0,0,.15);
 //** Dropdown menu `border-color` **for IE8**.
@@ -359,10 +359,10 @@
 @navbar-default-border:            darken(@navbar-default-bg, 6.5%);
 
 // Navbar links
-@navbar-default-link-color:                #eee;
+@navbar-default-link-color:                @gray-lighter;
 @navbar-default-link-hover-color:          #4a2b0f;
-@navbar-default-link-hover-bg:             #eee;
-@navbar-default-link-active-color:         #eee;
+@navbar-default-link-hover-bg:             @gray-lighter;
+@navbar-default-link-active-color:         @gray-lighter;
 @navbar-default-link-active-bg:            darken(@navbar-default-bg, 6.5%);
 @navbar-default-link-disabled-color:       #ccc;
 @navbar-default-link-disabled-bg:          transparent;
@@ -386,7 +386,7 @@
 
 // Inverted navbar links
 @navbar-inverse-link-color:                 @gray-light;
-@navbar-inverse-link-hover-color:           #eee;
+@navbar-inverse-link-hover-color:           @gray-lighter;
 @navbar-inverse-link-hover-bg:              transparent;
 @navbar-inverse-link-active-color:          @navbar-inverse-link-hover-color;
 @navbar-inverse-link-active-bg:             darken(@navbar-inverse-bg, 10%);
@@ -395,12 +395,12 @@
 
 // Inverted navbar brand label
 @navbar-inverse-brand-color:                @navbar-inverse-link-color;
-@navbar-inverse-brand-hover-color:          #eee;
+@navbar-inverse-brand-hover-color:          @gray-lighter;
 @navbar-inverse-brand-hover-bg:             transparent;
 
 // Inverted navbar toggle
 @navbar-inverse-toggle-hover-bg:            #333;
-@navbar-inverse-toggle-icon-bar-bg:         #eee;
+@navbar-inverse-toggle-icon-bar-bg:         @gray-lighter;
 @navbar-inverse-toggle-border-color:        #333;
 
 
@@ -415,7 +415,7 @@
 @nav-disabled-link-color:                   @gray-light;
 @nav-disabled-link-hover-color:             @gray-light;
 
-@nav-open-link-hover-color:                 #eee;
+@nav-open-link-hover-color:                 @gray-lighter;
 
 //== Tabs
 @nav-tabs-border-color:                     #ddd;
@@ -440,19 +440,19 @@
 //##
 
 @pagination-color:                     @link-color;
-@pagination-bg:                        #eee;
+@pagination-bg:                        @gray-lighter;
 @pagination-border:                    #ddd;
 
 @pagination-hover-color:               @link-hover-color;
 @pagination-hover-bg:                  @gray-lighter;
 @pagination-hover-border:              #ddd;
 
-@pagination-active-color:              #eee;
+@pagination-active-color:              @gray-lighter;
 @pagination-active-bg:                 @brand-primary;
 @pagination-active-border:             @brand-primary;
 
 @pagination-disabled-color:            @gray-light;
-@pagination-disabled-bg:               #eee;
+@pagination-disabled-bg:               @gray-lighter;
 @pagination-disabled-border:           #ddd;
 
 
@@ -511,7 +511,7 @@
 //** Tooltip max width
 @tooltip-max-width:           200px;
 //** Tooltip text color
-@tooltip-color:               #eee;
+@tooltip-color:               @gray-lighter;
 //** Tooltip background color
 @tooltip-bg:                  #000;
 @tooltip-opacity:             .9;
@@ -527,7 +527,7 @@
 //##
 
 //** Popover body background color
-@popover-bg:                          #eee;
+@popover-bg:                          @gray-lighter;
 //** Popover maximum width
 @popover-max-width:                   276px;
 //** Popover border color
@@ -541,7 +541,7 @@
 //** Popover arrow width
 @popover-arrow-width:                 10px;
 //** Popover arrow color
-@popover-arrow-color:                 #eee;
+@popover-arrow-color:                 @gray-lighter;
 @popover-arrow-color:                 @popover-bg;
 
 //** Popover outer arrow width
@@ -570,9 +570,9 @@
 @label-danger-bg:             @brand-danger;
 
 //** Default label text color
-@label-color:                 #eee;
+@label-color:                 @gray-lighter;
 //** Default text color of a linked label
-@label-link-hover-color:      #eee;
+@label-link-hover-color:      @gray-lighter;
 
 
 //== Modals
@@ -588,7 +588,7 @@
 @modal-title-line-height:     @line-height-base;
 
 //** Background color of modal content area
-@modal-content-bg:                             #eee;
+@modal-content-bg:                             @gray-lighter;
 //** Modal content border color
 @modal-content-border-color:                   rgba(0,0,0,.2);
 //** Modal content border color **for IE8**
@@ -640,7 +640,7 @@
 //** Background color of the whole progress component
 @progress-bg:                 #f5f5f5;
 //** Progress bar text color
-@progress-bar-color:          #eee;
+@progress-bar-color:          @gray-lighter;
 
 //** Variable for setting rounded corners on progress bar.
 @progress-border-radius:      @border-radius-base;
@@ -662,7 +662,7 @@
 //##
 
 //** Background color on `.list-group-item`
-@list-group-bg:                 #eee;
+@list-group-bg:                 @gray-lighter;
 //** `.list-group-item` border color
 @list-group-border:             #ddd;
 //** List group border radius
@@ -695,7 +695,7 @@
 //
 //##
 
-@panel-bg:                    #eee;
+@panel-bg:                    @gray-lighter;
 @panel-body-padding:          15px;
 @panel-heading-padding:       10px 15px;
 @panel-footer-padding:        @panel-heading-padding;
@@ -709,7 +709,7 @@
 @panel-default-border:        #ddd;
 @panel-default-heading-bg:    #f5f5f5;
 
-@panel-primary-text:          #eee;
+@panel-primary-text:          @gray-lighter;
 @panel-primary-border:        @brand-primary;
 @panel-primary-heading-bg:    @brand-primary;
 
@@ -717,7 +717,7 @@
 @panel-success-border:        @state-success-border;
 @panel-success-heading-bg:    @state-success-bg;
 
-@panel-info-text:             #eee;
+@panel-info-text:             @gray-lighter;
 @panel-info-border:           darken(#4a2b0f, 5%);
 @panel-info-heading-bg:       #4a2b0f;
 
@@ -761,15 +761,15 @@
 //
 //##
 
-@badge-color:                 #eee;
+@badge-color:                 @gray-lighter;
 //** Linked badge text color on hover
-@badge-link-hover-color:      #eee;
+@badge-link-hover-color:      @gray-lighter;
 @badge-bg:                    @gray-light;
 
 //** Badge text color in active nav link
 @badge-active-color:          @link-color;
 //** Badge background color in active nav link
-@badge-active-bg:             #eee;
+@badge-active-bg:             @gray-lighter;
 
 @badge-font-weight:           bold;
 @badge-line-height:           1;
@@ -798,15 +798,15 @@
 
 @carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
 
-@carousel-control-color:                      #eee;
+@carousel-control-color:                      @gray-lighter;
 @carousel-control-width:                      15%;
 @carousel-control-opacity:                    .5;
 @carousel-control-font-size:                  20px;
 
-@carousel-indicator-active-bg:                #eee;
-@carousel-indicator-border-color:             #eee;
+@carousel-indicator-active-bg:                @gray-lighter;
+@carousel-indicator-border-color:             @gray-lighter;
 
-@carousel-caption-color:                      #eee;
+@carousel-caption-color:                      @gray-lighter;
 
 
 //== Close
@@ -815,7 +815,7 @@
 
 @close-font-weight:           bold;
 @close-color:                 #000;
-@close-text-shadow:           0 1px 0 #eee;
+@close-text-shadow:           0 1px 0 @gray-lighter;
 
 
 //== Code
@@ -825,7 +825,7 @@
 @code-color:                  #c7254e;
 @code-bg:                     #f9f2f4;
 
-@kbd-color:                   #eee;
+@kbd-color:                   @gray-lighter;
 @kbd-bg:                      #333;
 
 @pre-bg:                      #f5f5f5;