From 24dbee7257b5de16aeb256743a8018f00aefcaab Mon Sep 17 00:00:00 2001 From: Arsen Melikyan Date: Fri, 21 Aug 2015 18:38:43 +0400 Subject: [PATCH 01/19] fixed missing URL scheme #1063 --- seed/challenges/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index e5e376317d..10d1302ef9 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -750,7 +750,7 @@ "difficulty": 1.17, "description": [ "You can add images to your website by using the img element, and point to a specific image's URL using the src attribute.", - "An example of this would be <img src=\"www.your-image-source.com/your-image.jpg\">. Note that in most cases, img elements are self-closing.", + "An example of this would be <img src=\"http://www.your-image-source.com/your-image.jpg\">. Note that in most cases, img elements are self-closing.", "Try it with this image: https://bit.ly/fcc-relaxing-cat." ], "tests": [ From 37b4530df2b350378432efef1c12ff2807687a94 Mon Sep 17 00:00:00 2001 From: Arsen Melikyan Date: Sat, 22 Aug 2015 17:11:44 +0400 Subject: [PATCH 02/19] Fixes info buttons' text in Camper News search results In Camper News search results "more info..." buttons' text changes to "more info.more info...". This commit fixes that. --- server/views/stories/news-nav.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/views/stories/news-nav.jade b/server/views/stories/news-nav.jade index a3360dd45d..af3e038143 100644 --- a/server/views/stories/news-nav.jade +++ b/server/views/stories/news-nav.jade @@ -103,7 +103,7 @@ script. "" + "" + "
" + - "more info.more info... · " + + "more info... · " + rank + (rank > 1 ? " points" : " point") + " · posted " + moment(data[i].timePosted).fromNow() + " by @" + data[i].author.username + From fa31b38083419d45f28d3fc90a85f81d9034c91f Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 22 Aug 2015 22:09:49 -0700 Subject: [PATCH 03/19] Update README.md Added some additional steps for getting started with the repo --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index d62477d7bd..bf1b7a6679 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,8 @@ bower install # Create a .env file and populate it with the necessary API keys and secrets: touch .env +# Install Gulp globally +npm install -g gulp ``` Edit your .env file with the following API keys accordingly (if you only use email login, only the MONGOHQ_URL, SESSION_SECRET, MANDRILL_USER and MANDRILL_PASSWORD fields are necessary. Keep in mind if you want to use more services you'll have to get your own API keys for those services. @@ -112,6 +114,11 @@ DEBUG=true # Start the mongo server mongod +# Create your mongo database. +Type "mongo" in your terminal to access the mongo shell +run this command: use freecodecamp +then quit with control+d + # Seed your database with the challenges node seed/ From a6175aa47a6180646b4277cecfb2c3279c9328a6 Mon Sep 17 00:00:00 2001 From: Ben Schenker Date: Sun, 23 Aug 2015 07:19:21 +0000 Subject: [PATCH 04/19] Fix Link to Bug Reporting Guidelines in Contributing.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 78e8e395da..ba4e245107 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,2 +1,2 @@ We're getting a lot of duplicate issues and bug reports that just aren't reporting actual bugs. -So, before you submit your issue, please read the [Help! I've Found a Bug](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help!-I've-Found-a-Bug) wiki page. +So, before you submit your issue, please read the [Help I've Found a Bug](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help-I've-Found-a-Bug) wiki page. From ba0ff4060446a7556dd264ea80766fd4e1e5c4e6 Mon Sep 17 00:00:00 2001 From: Aryan Jabbari Date: Sun, 23 Aug 2015 05:19:45 -0400 Subject: [PATCH 05/19] Fixed #1876; fixed some grammar issues; adhered to JS comment conventions --- seed/challenges/basic-javascript.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 5aeecfdae6..5f6c188555 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -670,8 +670,8 @@ "function functionName (a, b) {", "  return(a + b);", "}", - "We can \"call\" our function like this: functionName();, and it will run and return it's return value to us.", - "Create and call a function called myFunction." + "We can \"call\" our function like this: functionName();, and it will run and return its return value to us.", + "Create and call a function called myFunction that returns the sum of a and b." ], "tests":[ "assert((function(){if(typeof(f) !== \"undefined\" && typeof(f) === \"number\" && f === a + b && editor.getValue().match(/return/gi).length >= 1 && editor.getValue().match(/a/gi).length >= 1 && editor.getValue().match(/b/gi).length >= 1 && editor.getValue().match(/\\+/gi).length >= 1){return(true);}else{return(false);}})(), 'Your function should return the value of a + b');" @@ -684,9 +684,9 @@ " return a - b;", "};", "", - "//Don't modify above this line", - "//Create a function called myFunction that returns the value of a plus b.", - " // Only change code below this line.", + "// Don't modify above this line", + "// Create a function called myFunction that returns the value of a plus b.", + "// Only change code below this line.", "", "", "", From 7d1398d01db724399709ae2500e376aab7ca5d44 Mon Sep 17 00:00:00 2001 From: dokkillo Date: Sun, 23 Aug 2015 12:14:03 +0200 Subject: [PATCH 06/19] issue 2308 --- seed/challenges/bootstrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json index 610919a282..c8fa530760 100644 --- a/seed/challenges/bootstrap.json +++ b/seed/challenges/bootstrap.json @@ -177,7 +177,7 @@ "difficulty": 2.03, "description": [ "Now that we're using Bootstrap, we can center our heading elements to make them look better. All we need to do is add the class text-center to our h1 and h2 elements.", - "Remember that you can add several classes to the same element by separating each of them with a space, like this: <h2 class=\"text-red text-center\">your text</h2>." + "Remember that you can add several classes to the same element by separating each of them with a space, like this: <h2 class=\"red-text text-center\">your text</h2>." ], "tests": [ "assert($(\"h2\").hasClass(\"text-center\"), 'Your h2 element should be centered by applying the class text-center')" From e960cbd9b103b05b113905930cc0d561dfe6612f Mon Sep 17 00:00:00 2001 From: Arsen Melikyan Date: Sun, 23 Aug 2015 16:38:38 +0400 Subject: [PATCH 07/19] Fixes a typo #2311 --- seed/challenges/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index e5e376317d..6067e2bb1e 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -3281,7 +3281,7 @@ "Let's override your pink-text and blue-text classes, and make your h1 element orange, by giving the h1 element an id and then styling that id.", "Give your h1 element the id attribute of orange-text. Remember, id styles look like this: <h1 id=\"orange-text\">", "Leave the blue-text and pink-text classes on your h1 element.", - "Create a CSS declaration for your orange-text id in your style element. Here's and example of what this looks like: #brown-text { color: brown; }" + "Create a CSS declaration for your orange-text id in your style element. Here's an example of what this looks like: #brown-text { color: brown; }" ], "tests": [ "assert($(\"h1\").hasClass(\"pink-text\"), 'Your h1 element should have the class pink-text.')", From d85eded058b0f202c0333fead3987978a31eb2b5 Mon Sep 17 00:00:00 2001 From: Isabell Long Date: Sun, 23 Aug 2015 13:51:13 +0100 Subject: [PATCH 08/19] Consistently capitalize GitHub in the account settings text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Also remove the capital D from Delete in the confirmation line—it's not the start of a sentence. --- server/views/account/account.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/views/account/account.jade b/server/views/account/account.jade index e6a8c961df..d4d00c46ce 100644 --- a/server/views/account/account.jade +++ b/server/views/account/account.jade @@ -14,7 +14,7 @@ block content else a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github') i.fa.fa-github - | Update my profile from Github + | Update my profile from GitHub if (!user.twitter) .col-xs-12 @@ -72,4 +72,4 @@ block content input(type='hidden', name='_csrf', value=_csrf) button.btn.btn-danger.btn-block(type='submit') span.ion-trash-b - | Yes, Delete my account + | Yes, delete my account From 84f976c0d85105bda95908fad1855f83719ba868 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sun, 23 Aug 2015 08:18:40 -0700 Subject: [PATCH 09/19] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bf1b7a6679..dba5013540 100644 --- a/README.md +++ b/README.md @@ -115,9 +115,9 @@ DEBUG=true mongod # Create your mongo database. -Type "mongo" in your terminal to access the mongo shell -run this command: use freecodecamp -then quit with control+d +# Type "mongo" in your terminal to access the mongo shell +use freecodecamp +# Exit the mongo shell with control + d # Seed your database with the challenges node seed/ From 2cc09ce374e04965dadec43bec0732528ac5221f Mon Sep 17 00:00:00 2001 From: suhussai Date: Sun, 23 Aug 2015 12:20:28 -0600 Subject: [PATCH 10/19] Typo Fix. Closes #2592 Changed "greater then" to "greater than" in Waypoint 30, http://freecodecamp.com/challenges/waypoint-generate-random-whole-numbers-with-javascript --- seed/challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 5aeecfdae6..dd7c322d9d 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -903,7 +903,7 @@ "tests":[ "assert(typeof(myFunction()) === \"number\", 'The result of myFunction should be a number');", "assert(editor.getValue().match(/Math.random/g), 'You should be using Math.random to create a random number');", - "assert(!(''+myFunction()).match(/\\./g), 'You should have multiplied the result of Math.random by 10 to make it a number that\\'s greater then zero');", + "assert(!(''+myFunction()).match(/\\./g), 'You should have multiplied the result of Math.random by 10 to make it a number that\\'s greater than zero');", "assert(editor.getValue().match(/Math.floor/g), 'You should use Math.floor to remove the decimal part of the number');" ], "challengeSeed":[ From 8136443f8708a83e3c9e37289d27ff080dcd9fee Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Mon, 24 Aug 2015 00:22:35 +0100 Subject: [PATCH 11/19] Fix #2605 --- seed/challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 5aeecfdae6..ea4ec2a0e7 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -606,7 +606,7 @@ "Take the myArray array and shift() the first value off of it." ], "tests": [ - "assert((function(d){if(d[0] == 23 && d[1][0] == 'dog' && d[1][1] == 3 && d[2] == undefined){return(true);}else{return(false);}})(myArray), 'myArray should only have the first two values left([\"John\", 23])');", + "assert((function(d){if(d[0] == 23 && d[1][0] == 'dog' && d[1][1] == 3 && d[2] == undefined){return(true);}else{return(false);}})(myArray), 'myArray should only have the last two values left([23, [\"dog\", 3]])');", "assert((function(d){if(d === 'John' && typeof(myRemoved) === 'string'){return(true);}else{return(false);}})(myRemoved), 'myRemoved should contain \"John\"');" ], "challengeSeed": [ From f0a783c9df58189627700409293fc579d032d617 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Mon, 24 Aug 2015 00:29:34 +0100 Subject: [PATCH 12/19] Added some leniency to the test so that it doesn't require a new line --- seed/challenges/jquery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json index 8576e4bc0d..54d1ea88a9 100644 --- a/seed/challenges/jquery.json +++ b/seed/challenges/jquery.json @@ -17,7 +17,7 @@ "assert(editor.match(/