Nathan Leniz e2ab4438f5 Merge branch 'master' into courseware ...

Conflicts:
	controllers/bonfire.js
	controllers/resources.json
	views/bonfire/show.jade

2015-02-06 14:39:16 -05:00

..

api.js

Major refactor. Add error handlers everywhere.

2014-12-23 08:48:28 -08:00

bonfire.js

Merge branch 'master' into courseware

2015-02-06 14:39:16 -05:00

challenges.js

Refactor random verbs, phrases, and compliments so that only the resources controller is concerned with how to fetch them and how to make them randomly. Remove debug statement from bonfire/show.jade

2015-01-25 10:02:41 -05:00

contact.js

remove term code campers from codebase - replace with camper. Move bulky function from app.js to bonfire.js

2015-02-01 22:39:59 -08:00

courseware.js

Fixed routing for unfound coursewares

2015-02-06 14:28:28 -05:00

home.js

make Mark Howard's SEO changes, make navbar look better, hide footer on landing page, update meta tags'

2015-01-21 14:12:19 -08:00

resources.js

add courseware controller and routes

2015-02-01 23:35:27 -08:00

resources.json

Merge branch 'master' into courseware

2015-02-06 14:39:16 -05:00

user.js

Merge branch 'master' into courseware

2015-02-02 23:32:46 -08:00