Quincy Larson 61486c2d7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging ... Conflicts: app.js controllers/fieldGuide.js controllers/story.js seed/challenges/basic-html5-and-css.json seed/challenges/bootstrap.json seed/field-guides.json server/views/partials/navbar.jade views/resources/jobs-form.jade views/resources/nonprofits-form.jade views/resources/pmi-acp-agile-project-managers-form.jade		2015-06-09 13:48:29 -07:00
..
authentication.js	use app instead of server in boot directories	2015-06-03 12:26:11 -07:00
challenge.js	change _id to id everywhere that seems relevant to loopback	2015-06-04 13:20:42 -07:00
challengeMap.js	change _id to id everywhere that seems relevant to loopback	2015-06-04 13:20:42 -07:00
explorer.js	use app instead of server in boot directories	2015-06-03 12:26:11 -07:00
fieldGuide.js	Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging	2015-06-09 13:48:29 -07:00
home.js	flatten user object references throughout controllers and views	2015-06-04 12:54:41 -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	flatten user object references throughout controllers and views	2015-06-04 12:54:41 -07:00
passport.js	add passport stuff back	2015-06-04 12:03:53 -07:00
randomAPIs.js	flatten user object references throughout controllers and views	2015-06-04 12:54:41 -07:00
redirects.js	Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging	2015-06-09 13:48:29 -07:00
restApi.js	use app instead of server in boot directories	2015-06-03 12:26:11 -07:00
story.js	Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging	2015-06-09 13:48:29 -07:00
user.js	remove email verification.	2015-06-07 22:07:38 -07:00