Commit Graph

8 Commits

Author SHA1 Message Date
Quincy Larson
1cc82ab469 restructure entire curriculum sequence and json files 2015-07-23 15:49:03 -07:00
benmcmahon100
90f7e33f42 almost complete js challenges 2015-07-13 00:48:58 +01:00
Quincy Larson
25c5bd769a add an ajax challenge 2015-07-02 17:31:08 -07:00
Quincy Larson
9589b6abeb add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00
Quincy Larson
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
Quincy Larson
323ec3d587 change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Quincy Larson
67d35540cd Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-04 12:24:30 -07:00
Berkeley Martinez
9032880e27 Update seed directory to use loopback 2015-06-02 20:32:10 -07:00