Michael Q Larson 8210cb927e Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into coderbye ...

Conflicts:
	seed_data/challenges.json

2015-02-14 12:32:50 -08:00

..

bonfires.json

Building out new challenge framework to allow controller to determine view type for challenge

2015-02-13 20:55:49 -05:00

challenge-hashes

Fixed bonfire to not overwrite user entry point but still allow user error by not defining entry point, create web form to give challenge json back, improved layout of bonfire even more

2015-01-25 23:56:04 -05:00

challenges.json

Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into coderbye

2015-02-14 12:32:50 -08:00

coursewares.json

update the showVideo view

2015-02-13 18:40:39 -08:00

seed.js

start adding Courseware controllers, routes etc.

2015-02-01 14:22:34 -08:00