Quincy Larson 5fd95c584c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging ...

Conflicts:
	seed/challenges/basic-javascript.json

2015-07-28 23:11:00 -07:00

..

account

major challenges refactor

2015-06-20 19:55:07 -07:00

challengeMap

more minor updates

2015-07-23 15:50:47 -07:00

coursewares

fix modal closing a on showJS view

2015-07-10 10:12:53 -07:00

field-guide

update split field guide view into categories

2015-07-23 15:50:47 -07:00

jobs

Merge branch 'master' into staging

2015-06-16 06:08:25 -07:00

nonprofits

update emails and refine sponsor view

2015-06-25 23:35:48 -07:00

partials

about to start priority and !important waypoints

2015-07-28 17:11:51 -07:00

resources

add more cities and move the bootcamp calculator to field guide entries (still untested).

2015-07-02 13:59:13 -07:00

sponsors

update emails and refine sponsor view

2015-06-25 23:35:48 -07:00

stories

minor ui improvements

2015-06-26 01:28:02 -07:00

home.jade

update landing page

2015-07-07 10:45:56 -07:00

layout-react.jade

Hide body overflow

2015-07-23 16:03:50 -07:00

layout-wide.jade

Begin shaping codebase for loopback migration.

2015-06-01 18:30:43 -04:00

layout.jade

Merge branch 'interview' into staging

2015-06-14 01:02:39 -07:00

redirect-https.jade

add redirect for https

2015-07-01 14:35:15 -07:00