Commit Graph

12 Commits

Author SHA1 Message Date
Natasha Haggard
e3aee8f421 Issue 1036 - Fixed minor grammatical mistake
Fixed minor grammatical mistake - changed "Your app should have an text field input element" to "Your app should have a text field input element"
2015-06-22 22:13:21 -05:00
Quincy Larson
883a561d73 finishing touches on calculator 2015-06-19 21:24:04 -07:00
Quincy Larson
88286d366f fix a bunch of github issues regarding waypoints 2015-06-19 18:31:21 -07:00
Quincy Larson
a339c1b60b Merge pull request #938 from LumenTeun/lumenteun-914
Improves check for catphotoapp.com in 'Link to External Pages with Anchor Elements'
2015-06-19 16:05:23 -07:00
Quincy Larson
d615e94c29 fix minor typo in html challenge 2015-06-16 18:00:17 -07:00
terakilobyte
76811b9215 Fix json typo 2015-06-15 18:59:56 -04:00
LumenTeun
0038c48875 Improves check for catphotoapp.com. Fixes #914 2015-06-15 18:06:09 +02:00
Quincy Larson
2b7177e856 add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00
Quincy Larson
5fb89cb091 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:16:31 -07: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
3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Berkeley Martinez
272d9b4ad5 Update seed directory to use loopback 2015-06-02 20:32:10 -07:00