Quincy Larson 0a471b7847 Merge branch 'master' into staging

2015-06-01 13:55:53 -07:00

..

challenge.js

Fix display of zipline/basejump completion in account view for new solutions.

2015-05-26 11:30:06 -04:00

challengeMap.js

start adding completion to challengeMap

2015-05-31 16:41:04 -07:00

constantStrings.json

Fix Lint all the controllers

2015-05-21 11:07:40 -07:00

fieldGuide.js

revert breaking changes to field guide controller

2015-05-26 01:36:37 -07:00

home.js

Fix Lint all the controllers

2015-05-21 11:07:40 -07:00

jobs.js

add jobs

2015-05-28 16:40:22 -07:00

nonprofits.js

add jobs

2015-05-28 16:40:22 -07:00

resources.js

start adding completion to challengeMap

2015-05-31 16:41:04 -07:00

resources.json

remove references to meeting from announcements and notification modal

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

story.js

Fix dasherization for stories, closes #648

2015-05-31 18:43:11 -04:00

user.js

remove vestigial mention of camp counselor team

2015-06-01 12:18:45 -07:00