Commit Graph

66 Commits (9818186afc8441289c5dbf2c53770e0606a734bf)

Author SHA1 Message Date
Berkeley Martinez 2422663f34 add comments migration to loopback script 2015-06-25 21:47:25 -07:00
Berkeley Martinez 95b0884df5 Merge pull request #1073 from NatashaHaggard/NatashaHaggard-1036
Issue 1036 - Fixed minor grammatical mistake
2015-06-24 10:43:12 -07:00
Berkeley Martinez c3d9598d18 Merge pull request #1102 from NatashaHaggard/patch-2
Issue 1080
2015-06-24 10:32:58 -07:00
LumenTeun c8c03aae10 'Slack' to 'Gitter or Slack' 2015-06-24 10:29:52 -07:00
LumenTeun 95f47de9f0 'Slack' to 'Gitter' 2015-06-24 10:29:52 -07:00
Natasha Haggard bd0a517144 Issue 1080
Changed "Twitter Bootstrap" to "Bootstrap". It used to be it's name but it's not any more. It's in their brand guidelines to not refer to it as Twitter Bootstrap any more: http://getbootstrap.com/about/#name
2015-06-23 22:55:52 -05:00
Natasha Haggard 1e84751a0f Issue 1094 - Field Guide Error
"Contact Jason Ruekert - he's @jsonify in Slack."

Since freecodecamp is now using Gitter again, changed it to say "Contact Jason Ruekert - he's @jsonify in Gitter."
2015-06-23 22:46:28 -05:00
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
terakilobyte 7aff6dd285 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-22 10:31:24 -04:00
terakilobyte 7004e81b4a 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
brandenbyers 5db883346e Change eqls to equal 2015-06-21 00:56:20 -05:00
Quincy Larson 5212173c61 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-20 18:12:24 -07:00
Quincy Larson dd3d445054 add new chat challenge 2015-06-20 18:12:12 -07: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 fe1b3f4d2a fix broken test from recent pull request 2015-06-19 17:53:59 -07:00
Quincy Larson cd63977687 Merge branch 'master' into staging
Conflicts:
	seed/challenges/basic-bonfires.json
2015-06-19 17:39:11 -07:00
Quincy Larson 5a0d38eb5e Merge pull request #984 from rcw271828/staging
Fixed typo in field-guides.json
2015-06-19 17:36:19 -07:00
Quincy Larson 93ed1cfb1f 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 5f7443c91e Merge pull request #960 from 1hella/1hella-959
1hella 959
2015-06-19 17:31:14 -07:00
Quincy Larson 25f4d4c30e Merge pull request #958 from LumenTeun/lumenteun-941
'No repeats please' test fix.
2015-06-19 17:29:25 -07:00
Quincy Larson 6078b54393 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-19 16:18:56 -07:00
Quincy Larson d5ea05e448 Merge branch 'Lemony-Andrew-master' into staging
Conflicts:
	server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
Quincy Larson 93e96643fb Merge pull request #940 from LumenTeun/lumenteun-907
Check fix in 'Bootstrap Grid'.
2015-06-19 16:07:48 -07:00
Quincy Larson 40a1ff835c 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 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 c2c64b153a Merge pull request #937 from LumenTeun/lumenteun-918
Fixed Zipline jQuery.getJSON() links.
2015-06-19 16:03:17 -07:00
Quincy Larson f200a6f8a3 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 adbbbf3743 fix name and dashed name switched
close #975
2015-06-18 20:02:32 -07:00
Stephen Wanhella 9342503873 Added new test with different max number to Bonfire: Truncate a String
Issue 959
2015-06-18 17:48:30 -07:00
Brett Guillory d6db51355e 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 8ade99b5d7 Fixed a word 2015-06-18 17:48:29 -07:00
rcw271828 7735f19fcc Update field-guides.json
Fixed a typo in languages section of field guides.
2015-06-18 20:36:33 -04:00
LumenTeun 842a2efe64 More test cases for 'Seek and Destroy' #942 2015-06-18 11:56:13 +02:00
LumenTeun d1a12fc894 'No repeats please' test fix. #941 2015-06-17 23:30:08 +02:00
Quincy Larson d615e94c29 fix minor typo in html challenge 2015-06-16 18:00:17 -07:00
terakilobyte e319652373 Fix wikipedia viewer zipline naming 2015-06-16 08:36:54 -04:00
terakilobyte 4fa1f25cc2 Fix challenge map display for loopback updated models. Update loopback migration script to auto complete and catch all records. 2015-06-15 20:53:43 -04:00
Berkeley Martinez 3d8b8e4c73 rename flattenUser to loopbackMigration
add stories migration to script
2015-06-15 16:47:50 -07:00
terakilobyte d6ddd632d0 Remove excess debug statements from flattenUser.js 2015-06-15 19:12:48 -04:00
terakilobyte 76811b9215 Fix json typo 2015-06-15 18:59:56 -04:00
terakilobyte 988242df03 Ensure build process is part of npm install 2015-06-15 18:10:48 -04:00
LumenTeun 663492c582 Check fix in 'Bootstrap Grid'. #907 2015-06-15 18:26:44 +02:00
LumenTeun 480c5dec0a Test for almost palindromes. #911 2015-06-15 18:14:55 +02:00
LumenTeun 0038c48875 Improves check for catphotoapp.com. Fixes #914 2015-06-15 18:06:09 +02:00
LumenTeun 00c1cdef5b Fixed Zipline jQuery.getJSON() links. Fixes #918 #919 2015-06-15 17:43:52 +02:00
LumenTeun f50cee119c More 'Convert HTML Entities' test cases. Fixes #924 2015-06-15 17:26:37 +02:00
Quincy Larson b6fc2551d9 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 2b7177e856 add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00
Quincy Larson 2c8a134e80 first challenge json file updated with dashedname 2015-06-13 23:50:36 -07:00