Commit Graph

13 Commits

Author SHA1 Message Date
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
terakilobyte
d782ac9520 Update find method in fieldGuide.js 2015-06-05 13:25:28 -04:00
terakilobyte
a0b34c8e90 Redirect to home path on unsuccessful query rather than induce infinite redirect loop. 2015-06-05 09:41:53 -04:00
Quincy Larson
3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Berkeley Martinez
075d851374 refactor resources to utils 2015-06-03 17:14:45 -07:00
Berkeley Martinez
bfd33d8b40 fix use app.use(router) to add sub router 2015-06-03 16:31:42 -07:00
Berkeley Martinez
8165105b29 refactor all boot to export func and use loopback 2015-06-03 16:19:23 -07:00
Berkeley Martinez
65cde59f0d use app instead of server in boot directories 2015-06-03 12:26:11 -07:00
Berkeley Martinez
79cbe13c62 fix seed paths 2015-06-03 12:23:37 -07:00
Berkeley Martinez
279f953628 Move models to common/models
closes #795
2015-06-02 15:05:26 -07:00
Berkeley Martinez
28f0320f18 refactor fieldGuide controller to router 2015-06-01 16:32:54 -07:00
Berkeley Martinez
7c2f171d31 fix all the linting errors in boot 2015-06-01 16:23:53 -07:00
terakilobyte
d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00