Commit Graph

59 Commits

Author SHA1 Message Date
9e44deda0c move get emails script to seed 2015-06-09 16:49:03 -07:00
3b861a5a7f 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
0e240ba630 save users into new user collection 2015-06-07 22:06:57 -07:00
38931dd23d initial script to flatten user object 2015-06-07 17:15:53 -07:00
b2124d7878 fix nonprofit ids should be unique 2015-06-04 14:32:16 -07:00
323ec3d587 change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
87f22a5b7e fix challengeSeeds should be arrays 2015-06-04 12:31:33 -07:00
67d35540cd Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-04 12:24:30 -07:00
9032880e27 Update seed directory to use loopback 2015-06-02 20:32:10 -07:00