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

..

account

Streak display in account/show.jade, refactor courseware.json for error handling and linting

2015-03-28 23:42:07 +09:00

bonfire

Merge branch 'master' into ux-improvements

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

challenges

add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces

2015-03-08 01:36:09 -08:00

contact

add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces

2015-03-08 01:36:09 -08:00

coursewares

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

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

nonprofits

apply Nathan's insights into multistep form'

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

partials

apply Nathan's insights into multistep form'

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

resources

Merge branch 'master' into ux-improvements

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

stories

apply Nathan's insights into multistep form'

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

home.jade

half way done with the initial views and controllers

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

layout-wide.jade

fix issue with chat page showing 304 in firefox

2015-03-07 01:37:41 -08:00

layout.jade

fix issue with chat page showing 304 in firefox

2015-03-07 01:37:41 -08:00