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

..

challenges

Add challenge type 5 to all bonfires

2015-05-20 11:13:55 -04:00

bonfireMDNlinks.js

update bonfires and mdn links

2015-05-21 18:59:55 -07:00

bonfires.json

Merge branch 'staging' into nonprofit-improvements

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

challenge-migration.js

start work on challenge-migraiton

2015-04-08 18:03:06 -07:00

challengeMapping.json

start work on challenge-migraiton

2015-04-08 18:03:06 -07:00

challenges.json

Updated to show how json should be modeled, fleshed out resources to load new challengeMap stub

2015-05-18 22:03:27 -04:00

coursewares.json

Merge branch 'staging' into nonprofit-improvements

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

field-guides.json

fix typo on bonfire

2015-05-22 09:08:21 -07:00

future-coursewares.json

start integrating html css coursewares

2015-05-11 13:43:12 -07:00

nonprofits.json

add jobs page

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

seed.js

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

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

storyCleanup.js

more camper news improvements

2015-04-30 15:56:14 -07:00

userMigration.js

Migration script written.

2015-05-20 23:35:32 -04:00