Commit Graph

10 Commits (7aeceaf97ec8fd8648eb2a036fbbedd74aecfe47)

Author SHA1 Message Date
Jacob Bearden fcf866906b fix image protocol 2016-03-16 20:32:12 -06:00
Quincy Larson 2f613ec216 shorten nonprofit testimonials 2016-02-22 15:30:08 -08:00
Quincy Larson f5260f7c21 add testimonial to nonprofit landing page 2016-02-19 17:09:35 -08:00
Quincy Larson 7f0be44f98 additional cleanup of nonprofit directory 2016-01-15 04:10:16 -08:00
Quincy Larson 09b4f1caa2 Update nonprofits structure and remove old directory 2016-01-15 04:10:16 -08:00
Quincy Larson 7eefcb0705 more redesign work on challenge views 2016-01-15 04:10:16 -08:00
Quincy Larson 5430ccc3be fix landing and nonprofit 2015-11-05 13:38:09 -08:00
Quincy Larson 61486c2d7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
Quincy Larson f6596d2654 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/challengeMap.js
	controllers/resources.js
	server/views/partials/field-guide.jade
	server/views/partials/github.jade
	server/views/partials/nonprofit-application-progress-bar.jade
	server/views/partials/nonprofits.jade
2015-06-02 13:44:53 -07:00
terakilobyte d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00