Quincy Larson fb3a116fff Merge branch 'master' into mobile-news ...

Conflicts:
	controllers/story.js
	seed_data/field-guides.json
	views/coursewares/showVideo.jade

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

..

bonfire.js

Remove some debug/console.log statements.

2015-04-25 12:28:14 -04:00

challengeMap.js

redirect user to bonfires if has completed waypoints but not bonfires gulp

2015-04-24 02:02:02 -07:00

courseware.js

Merge pull request #363 from FreeCodeCamp/root

2015-04-24 19:16:43 -04:00

fieldGuide.js

Fully remove remnant of errant debug statement

2015-04-25 14:36:34 -04:00

home.js

make all navbar layouts wide style, redirect logo to challenge map, improve navbar collapse

2015-04-24 01:31:59 -07:00

nonprofits.js

make new landing pages and forms for project managers and nonprofits

2015-04-27 16:17:29 -07:00

resources.js

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

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

resources.json

remove references to meeting from announcements and notification modal

2015-03-28 10:14:49 -07:00

story.js

Merge branch 'master' into mobile-news

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

user.js

Clean up more linting errors and split out returns from Mongo.

2015-04-24 13:15:15 -04:00