Michael Q Larson 70f812dc78 Merge branch 'master' into ux-improvements ...

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

2015-03-29 13:05:39 -07:00

..

api.js

Major refactor. Add error handlers everywhere.

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

basejumps.js

half way done with the initial views and controllers

2015-03-24 19:08:26 -07:00

bonfire.js

Merge branch 'master' into ux-improvements

2015-03-29 13:05:39 -07: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

Zipline/Basejump view with controller logic to serve. Will have to change based upon json

2015-03-29 00:09:50 +09:00

home.js

update the about page and make it the root

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

nonprofits.js

apply Nathan's insights into multistep form'

2015-03-27 12:36:21 -07:00

resources.js

Merge branch 'master' into ux-improvements

2015-03-29 13:05:39 -07:00

resources.json

remove references to meeting from announcements and notification modal

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

story.js

Error handling

2015-03-26 02:28:04 +09:00

user.js

resolve merge conflicts

2015-03-29 00:51:09 +09:00

ziplines.js

half way done with the initial views and controllers

2015-03-24 19:08:26 -07:00