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

..

api.js

Major refactor. Add error handlers everywhere.

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

bonfire.js

start refactoring points into progressTimestamps which is essentially points with timestamps

2015-02-22 18:16:26 -08:00

challenges.js

fix an issue of unathenticated users not being able to access challenges

2015-03-06 17:49:14 -08:00

contact.js

Add hotkey to go to next challenge/bonfire from completion modal, keep editor in focus on exiting completion modal, allow for courseware to theoretically work in production and development.

2015-02-06 16:55:48 -08:00

courseware.js

Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements

2015-02-22 18:16:42 -08:00

home.js

update the about page and make it the root

2015-02-15 23:59:03 -08:00

resources.js

Merge branch 'master' into ux-improvements

2015-03-21 16:25:39 -07:00

resources.json

update announcements and move announcement modal back into learn-to-code view

2015-03-19 23:24:44 -07:00

story.js

try shorter decay rate

2015-03-21 00:47:21 -07:00

user.js

Merge branch 'master' into ux-improvements

2015-03-21 16:25:39 -07:00