Michael Q Larson 4d3337df32 Merge branch 'ziplines' into ux-improvements ...

Conflicts:
	views/coursewares/showJS.jade

2015-03-28 00:24:41 -07:00

..

account

Merge branch 'master' into ux-improvements

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

bonfire

Merge branch 'ziplines' into ux-improvements

2015-03-28 00:24:41 -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

Merge branch 'ziplines' into ux-improvements

2015-03-28 00:24:41 -07: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-27 10:28:31 -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