Michael Q Larson 18a9818200 Merge branch 'master' into nonprofit-show ...

Conflicts:
	controllers/challenges.js
	controllers/courseware.js

2015-03-30 16:17:04 -07:00

..

bonfireMDNlinks.js

Added bonfire links for level 3.

2015-03-26 10:45:33 -04:00

bonfires.json

Merge branch 'master' into nonprofit-show

2015-03-30 16:17:04 -07:00

coursewares.json

Make Basejumps show up properly and get their github routes persisting in the database.

2015-03-29 18:13:04 -07:00

nonprofits.json

add nonprofit.json seed data from scrapped nonprofit branch

2015-03-29 15:29:14 -07:00

seed.js

able to seed and view wiki content

2015-03-30 13:48:54 -07:00

wikis.json

add a modal that allows one to scroll through all wiki pages

2015-03-30 15:55:00 -07:00