Quincy Larson 7279559c41 Merge branch 'staging' into nonprofit-improvements ...

Conflicts:
	controllers/resources.js
	seed_data/bonfires.json
	views/partials/navbar.jade

2015-05-22 19:36:15 -07:00

..

account

Merge pull request #466 from terakilobyte/challenge-restructure

2015-05-21 00:12:52 -07:00

challengeMap

Merge branch 'staging' into nonprofit-improvements

2015-05-22 19:36:15 -07:00

coursewares

Move bonfire view into courseware view folder. Update seed file to exit when finished.

2015-05-21 00:34:51 -04:00

field-guide

add facebook groups challenge, field guide and footer link

2015-05-09 10:52:02 -07:00

nonprofits

add jobs page

2015-05-22 19:30:56 -07:00

partials

Merge branch 'staging' into nonprofit-improvements

2015-05-22 19:36:15 -07:00

resources

Merge branch 'staging' into nonprofit-improvements

2015-05-22 19:36:15 -07:00

stories

add comic challenge

2015-05-21 23:55:47 -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