Michael Q Larson 88e261ccf6 Merge branch 'master' into ux-improvements ... Conflicts: controllers/resources.js controllers/user.js seed_data/challenges.json views/account/show.jade views/coursewares/showHTML.jade views/coursewares/showJS.jade views/partials/bonfires.jade		2015-03-21 16:25:39 -07:00
..
Bonfire.js	Building out new challenge framework to allow controller to determine view type for challenge	2015-02-13 20:55:49 -05:00
BonfireCompletion.js	Major refactor of bonfireFramework to differentiate tests, refactor tests in Bonfire schema to remove public/private tests and only have tests, fire modal on successful run of all tests in bonfire/show, added bonfiresHash to User schema, and we should have committed a while ago because there is too much too list	2015-01-24 00:44:08 -05:00
Challenge.js	Major refactor. Add error handlers everywhere.	2014-12-23 08:48:28 -08:00
Comment.js	comment submit time bug fixed	2015-03-08 18:48:20 +09:00
Courseware.js	subtle completed challenge button for courseware and add completionMessage to coursewares	2015-02-12 16:48:35 -08:00
Story.js	Merge branch 'master' of https://github.com/freecodecamp/freecodecamp	2015-03-09 18:45:21 +09:00
User.js	start refactoring points into progressTimestamps which is essentially points with timestamps	2015-02-22 18:16:26 -08:00