Quincy Larson 52f7dcc96b Merge remote-tracking branch 'upstream/staging' ...

Conflicts:
	views/account/show.jade

2015-05-05 16:41:28 -07:00

..

account

Merge remote-tracking branch 'upstream/staging'

2015-05-05 16:41:28 -07:00

bonfire

add tips to all bonfire views

2015-05-02 18:56:42 -07:00

challengeMap

remove Saturday Summit announcement modal

2015-05-02 18:52:15 -07:00

coursewares

Merge branch 'master' into mobile-news

2015-04-30 19:10:10 -07:00

field-guide

fix some issues with @terakilobyte and beautify the camper news index view

2015-04-30 14:55:00 -07:00

nonprofits

fix some issues with @terakilobyte and beautify the camper news index view

2015-04-30 14:55:00 -07:00

partials

Hotfix fontawesome for site layout. Update package.json to lock to major version #

2015-05-04 17:37:29 -04:00

resources

Merge pull request #419 from QuincyLarson/point-fix

2015-05-05 12:48:32 -04:00

stories

improvements to portfolios and heatmaps

2015-05-03 00:34:46 -07:00

home.jade

improvements to portfolios and heatmaps

2015-05-03 00:34:46 -07:00

layout-wide.jade

finish moving away from connectAssets

2015-05-03 16:45:34 -07:00

layout.jade

finish moving away from connectAssets

2015-05-03 16:45:34 -07:00