Commit Graph

10 Commits (6bd0b563211fe03d5d4ed25611bbcdad29e03dcb)

Author SHA1 Message Date
Quincy Larson 7e2d5c91e2 minor ui improvements 2015-06-26 01:28:02 -07:00
Quincy Larson 378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
2015-06-26 01:08:40 -07:00
Berkeley Martinez 310bf7f6fb fix navbar should point to /news not /stories 2015-06-25 23:43:02 -07:00
Quincy Larson 6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Berkeley Martinez 8f445b58f2 fix chat links go to Gitter Room 2015-06-20 23:11:33 -07:00
terakilobyte 5ec532f3d9 Remove debug statements from story.js and clean up one linting error. Rename href in navbar from news to stories to unify API names. 2015-06-09 16:57:23 -04: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
terakilobyte 8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -04:00
Quincy Larson b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
terakilobyte d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00