Commit Graph

26 Commits (edbab55c988d6e4dea7c728054171ca9f44731f0)

Author SHA1 Message Date
LumenTeun 5316b7ac07 Quite a few spelling and grammar fixes 2015-06-30 04:28:43 +02:00
Natasha Haggard e24144edaa Issue 923 - Grammatical error
"Your pair will have their own cursor, and will be able to type text on his or her and keyboard."

Removed the "and" after "his or her".

This closes #923
2015-06-24 22:40:10 -05:00
terakilobyte 96c3e41941 Fixes #1053
This changes the link to point to Free Code Camp's "Lets Pair" room on gitter and opens the link in a new tab/window depending on user browser preference.
2015-06-22 10:30:26 -04:00
Quincy Larson 31686e8250 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-20 18:12:24 -07:00
Quincy Larson fe9d1e97bb fix broken test from recent pull request 2015-06-19 17:53:59 -07:00
Quincy Larson 1bb9951d04 Merge branch 'master' into staging
Conflicts:
	seed/challenges/basic-bonfires.json
2015-06-19 17:39:11 -07:00
Quincy Larson 21de53de04 Merge pull request #961 from LumenTeun/lumenteun-942
More test cases for 'Seek and Destroy'
2015-06-19 17:32:31 -07:00
Quincy Larson d23ad5c121 Merge pull request #960 from 1hella/1hella-959
1hella 959
2015-06-19 17:31:14 -07:00
Quincy Larson db1233c7d4 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-19 16:18:56 -07:00
Quincy Larson 0e9ab5017b Merge branch 'Lemony-Andrew-master' into staging
Conflicts:
	server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
Quincy Larson a516a49e15 Merge pull request #939 from LumenTeun/lumenteun-911
Test for almost palindromes in 'Check for Palindromes'
2015-06-19 16:06:56 -07:00
Quincy Larson 2cb57d5fcc Merge pull request #936 from LumenTeun/lumenteun-924
More 'Convert HTML Entities' test cases. Fixes #924
2015-06-19 16:00:45 -07:00
Berkeley Martinez f248b3fb9f fix name and dashed name switched
close #975
2015-06-18 20:02:32 -07:00
Stephen Wanhella 78fa5449b4 Added new test with different max number to Bonfire: Truncate a String
Issue 959
2015-06-18 17:48:30 -07:00
Brett Guillory 92656fcf2f Added missing MDN Link
This bonfire "Missing letters"seems to be missing an important MDN link to "String.fromCharCode()", which is needed to get the missing character to return for the test. Since the missing character is obviously not in the string supplied, you cannot get the character code for it from the string.
2015-06-18 17:48:30 -07:00
Brett Guillory 07a54c9e0c Fixed a word 2015-06-18 17:48:29 -07:00
LumenTeun cddc1b6c6a More test cases for 'Seek and Destroy' #942 2015-06-18 11:56:13 +02:00
LumenTeun 667a37cac7 Test for almost palindromes. #911 2015-06-15 18:14:55 +02:00
LumenTeun 2911562888 More 'Convert HTML Entities' test cases. Fixes #924 2015-06-15 17:26:37 +02:00
Quincy Larson d5b5973326 Merge branch 'interview' into staging
Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json
2015-06-14 01:02:39 -07:00
Quincy Larson 9589b6abeb add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00
Quincy Larson fc7ac3b3ca Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:16:31 -07:00
Quincy Larson 3b861a5a7f 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 323ec3d587 change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Berkeley Martinez 87f22a5b7e fix challengeSeeds should be arrays 2015-06-04 12:31:33 -07:00
Berkeley Martinez 9032880e27 Update seed directory to use loopback 2015-06-02 20:32:10 -07:00