Quincy Larson 378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging ...

Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json

2015-06-26 01:08:40 -07:00

..

a-extendUser.js

remove email verification step.

2015-06-15 15:43:12 -07:00

authentication.js

use app instead of server in boot directories

2015-06-03 12:26:11 -07:00

challenge.js

fix mismatch property in challenge controller

2015-06-23 16:45:35 -07:00

explorer.js

remove passport file

2015-06-09 16:45:14 -07:00

fieldGuide.js

refactor rxify fieldguides

2015-06-23 16:22:07 -07:00

home.js

add pull in user image on signup when available

2015-06-11 11:38:08 -07:00

jobs.js

fix use app.use(router) to add sub router

2015-06-03 16:31:42 -07:00

middlewares.js

initial move to loopback server

2015-06-02 17:27:02 -07:00

nonprofits.js

update emails and refine sponsor view

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

randomAPIs.js

update emails and refine sponsor view

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

redirects.js

remove challangeMap

2015-06-19 14:49:10 -07:00

restApi.js

use app instead of server in boot directories

2015-06-03 12:26:11 -07:00

story.js

fix story upvote should happen at end of stream

2015-06-26 00:35:13 -07:00

user.js

major challenges refactor

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