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

Conflicts:
	server/boot/randomAPIs.js
	server/views/coursewares/showBonfire.jade
	server/views/partials/navbar.jade

2015-06-21 15:53:16 -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 mainjs resetEditor

2015-06-20 22:48:59 -07:00

explorer.js

remove passport file

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

fieldGuide.js

Debug statement for fieldguide ID

2015-06-15 23:35:29 -04: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

fix use gt not $gt

2015-06-20 00:36:28 -07:00

randomAPIs.js

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

2015-06-21 15:53:16 -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

remove passport file

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

user.js

major challenges refactor

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