Commit Graph

533 Commits (8b6607ec96e19de2db254a80dc5ead98f059793b)

Author SHA1 Message Date
Berkeley Martinez 996c3e7816 fix make email optional 2015-06-10 15:12:48 -07:00
Berkeley Martinez cd38a2d88e fix user local signin 2015-06-09 17:22:14 -07:00
Berkeley Martinez a8494b29da add user signup through loopback 2015-06-09 16:45:14 -07:00
Berkeley Martinez b34646dd6b remove passport file
remove unneeded comments
2015-06-09 16:45:14 -07:00
terakilobyte 5ec532f3d9 Remove debug statements from story.js and clean up one linting error. Rename href in navbar from news to stories to unify API names. 2015-06-09 16:57:23 -04:00
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
Berkeley Martinez 78dac937f7 remove email verification. 2015-06-07 22:07:38 -07:00
terakilobyte 1a27c133c5 Update user account fetching for profile view 2015-06-05 15:57:27 -04:00
terakilobyte 6b6de50ad4 Update story query for loopback. 2015-06-05 15:00:54 -04:00
terakilobyte 21b9405f06 Update links for new api model in views for stories. 2015-06-05 14:58:42 -04:00
terakilobyte 4f9061bffb Sort out story model. 2015-06-05 14:53:12 -04: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
terakilobyte 8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -04:00
Quincy Larson 3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Quincy Larson b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
Berkeley Martinez 7a2bcc06f7 add passport stuff back
Because Berkeley really needs to wait for his coffee to kick in before
commiting anything...
2015-06-04 12:03:53 -07:00
Berkeley Martinez 075d851374 refactor resources to utils 2015-06-03 17:14:45 -07:00
Berkeley Martinez e349797a4b rename boot utility
remove subrouter use in server.js
2015-06-03 16:56:48 -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 e7d01424e9 refactor challenge and challengeMap 2015-06-02 19:02:54 -07:00
Berkeley Martinez 956a2b915e initial move to loopback server 2015-06-02 17:27:02 -07:00
Berkeley Martinez 279f953628 Move models to common/models
closes #795
2015-06-02 15:05:26 -07:00
Quincy Larson f6596d2654 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/challengeMap.js
	controllers/resources.js
	server/views/partials/field-guide.jade
	server/views/partials/github.jade
	server/views/partials/nonprofit-application-progress-bar.jade
	server/views/partials/nonprofits.jade
2015-06-02 13:44:53 -07:00
Berkeley Martinez 7643f1cabe fix FCC running using router syntax 2015-06-01 17:01:54 -07:00
Berkeley Martinez 7bb11e9fbe fix linting errors in server/boot/utilities 2015-06-01 16:48:16 -07:00
Berkeley Martinez d67f7c666d refactor challenge controller to router syntax 2015-06-01 16:45:21 -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