Michael Q Larson 2328cc2927 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp ...

Conflicts:
	controllers/user.js

2015-03-31 15:11:06 -07:00

..

api.js

Major refactor. Add error handlers everywhere.

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

bonfire.js

Merge branch 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261

2015-03-31 13:43:58 -07:00

challenges.js

Merge branch 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261

2015-03-31 13:43:58 -07: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 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261

2015-03-31 13:43:58 -07:00

home.js

update the about page and make it the root

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

resources.js

Merge branch 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261

2015-03-31 13:43:58 -07:00

resources.json

remove references to meeting from announcements and notification modal

2015-03-28 10:14:49 -07:00

story.js

refactor passport so that emails aren't fired if there are errors in save actions

2015-03-31 15:07:34 -07:00

user.js

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

2015-03-31 15:11:06 -07:00