From d80ed9f366aa158fb3f45a16e7468215f16bcc6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Djordje=20Lacmanovi=C4=87?= <djordje.lacmanovic@gmail.com>
Date: Sun, 16 Aug 2015 00:37:31 +0200
Subject: [PATCH 01/33] fixes issue #1005

---
 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 7cbb0d11c7..506ee7f30c 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -483,7 +483,7 @@
       "description": [
         "Apply the \"red-text\" class to your <code>h2</code> and <code>p</code> elements.",
         "Remember that you can attach classes to HTML elements by using <code>class=\"your-class-here\"</code> within the relevant element's opening tag.",
-        "Remember that CSS selectors require a period at the beginning like this: <code>.blue-text { color: blue; }</code>, but that class declarations don't use a period, like this: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;h2&#62;</code>."
+        "Remember that CSS class selectors require a period at the beginning like this: <code>.blue-text { color: blue; }</code>, but that class declarations don't use a period, like this: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;h2&#62;</code>."
       ],
       "tests": [
         "assert($('h2').css('color') === 'rgb(255, 0, 0)', 'Your <code>h2</code> element should be red.')",

From 1790b14808af637469b498d0a0ae88133df469e8 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Sun, 16 Aug 2015 20:06:47 -0400
Subject: [PATCH 02/33] Fixes #1801

---
 seed/challenges/basic-javascript.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index fa59afe650..9b3944f236 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -726,10 +726,10 @@
       ],
       "challengeSeed":[
         "//var ourDog = {",
-        "//   \"name\": \"Camper\"",
-        "//   \"legs\": 4",
-        "//   \"tails\": 1",
-        "//   \"friends\": [\"everything!\"]",
+        "//   \"name\": \"Camper\",",
+        "//   \"legs\": 4,",
+        "//   \"tails\": 1,",
+        "//   \"friends\": [\"everything!\"],",
         "//};",
         "",
         "// add the name(string), legs(number), tails(number) and friends(array) properties to myDog.",
@@ -766,10 +766,10 @@
       ],
       "challengeSeed":[
         "// var ourDog = {",
-        "//   \"name\": \"Camper\"",
-        "//   \"legs\": 4",
-        "//   \"tails\": 1",
-        "//   \"friends\": [\"everything!\"]",
+        "//   \"name\": \"Camper\",",
+        "//   \"legs\": 4,",
+        "//   \"tails\": 1,",
+        "//   \"friends\": [\"everything!\"],",
         "// };",
         "",
         "// ourDog.bark(\"arf!\");",

From ae4ec8e9fd443260ffce6c99ebc893fbc40de162 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Sun, 16 Aug 2015 20:08:37 -0400
Subject: [PATCH 03/33] Deleted extra comma

---
 seed/challenges/basic-javascript.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 9b3944f236..75fde692ad 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -729,7 +729,7 @@
         "//   \"name\": \"Camper\",",
         "//   \"legs\": 4,",
         "//   \"tails\": 1,",
-        "//   \"friends\": [\"everything!\"],",
+        "//   \"friends\": [\"everything!\"]",
         "//};",
         "",
         "// add the name(string), legs(number), tails(number) and friends(array) properties to myDog.",
@@ -769,7 +769,7 @@
         "//   \"name\": \"Camper\",",
         "//   \"legs\": 4,",
         "//   \"tails\": 1,",
-        "//   \"friends\": [\"everything!\"],",
+        "//   \"friends\": [\"everything!\"]",
         "// };",
         "",
         "// ourDog.bark(\"arf!\");",

From 854406e5fad736dc8ff79aebe2a2780cca22b939 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Sun, 16 Aug 2015 20:14:12 -0400
Subject: [PATCH 04/33] Fixes #1807

---
 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 fa59afe650..048a99f311 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -992,7 +992,7 @@
       "title": "Sift through Text with Regular Expressions",
       "difficulty":"9.984",
       "description":[
-        "<code>Regular expressions</code> are way to find certain words or patterns inside of <code>strings</code>.",
+        "<code>Regular expressions</code> are used to find certain words or patterns inside of <code>strings</code>.",
         "For example, if we wanted to find the number of times the word <code>the</code> occurred in the string <code>The dog chased the cat</code>, we could use the following <code>regular expression</code>: <code>\/the+\/gi</code>",
         "Let's break this down a bit:",
         "<code>the</code> is the pattern we want to match.",

From e4e13cf676196e14172ca7a4cdc6517732ad3f18 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Sun, 16 Aug 2015 20:38:49 -0400
Subject: [PATCH 05/33] Fixed issue #1806

---
 seed/challenges/advanced-bonfires.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json
index f71370c238..62a5f2cd3c 100644
--- a/seed/challenges/advanced-bonfires.json
+++ b/seed/challenges/advanced-bonfires.json
@@ -80,7 +80,7 @@
         "sym([1, 2, 3], [5, 2, 1, 4]);"
       ],
       "tests": [
-        "expect(sym([1, 2, 3], [5, 2, 1, 4])).to.equal([3, 5, 4]);",
+        "assert.deepEqual(sym([1, 2, 3], [5, 2, 1, 4]), [3, 5, 4], 'should return an array of unique values');",
         "assert.deepEqual(sym([1, 2, 5], [2, 3, 5], [3, 4, 5]), [1, 4, 5], 'should return the symmetric difference of the given arrays');",
         "assert.deepEqual(sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]), [1, 4, 5], 'should return an array of unique values');",
         "assert.deepEqual(sym([1, 1]), [1], 'should return an array of unique values');"

From fda754f187605f28f7d860cdac8e406d8864f4f6 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Sun, 16 Aug 2015 20:47:43 -0400
Subject: [PATCH 06/33] Fixed #1813

---
 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 fa59afe650..a62a77a5ed 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -902,7 +902,7 @@
       ],
       "challengeSeed":[
         "function myFunction(){",
-        "  // Make myFunction return a random number between zero and nine instead of a decimal",
+        "  // Make myFunction return a random number between 'min' and 'max' instead of a decimal",
         "",
         "  // Only change code below this line.",
         "",

From 1be07e73c118cd60f7189e0a89d71e24bd4c7ab7 Mon Sep 17 00:00:00 2001
From: Michael Krebs <vault742@gmail.com>
Date: Sun, 16 Aug 2015 20:59:17 -0400
Subject: [PATCH 07/33] fix #935

---
 seed/challenges/intermediate-bonfires.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index 10c1c35bcf..e4811bcb1c 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -71,10 +71,10 @@
       ],
       "MDNlinks": [
         "Comparison Operators",
-        "String.slice()",
+        "Array.slice()",
         "Array.filter()",
         "Array.indexOf()",
-        "String.concat()"
+        "Array.concat()"
       ],
       "type": "bonfire",
       "challengeType": 5,

From af22c6c6abb324b3524aa0fa5da831ff80c9acb9 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Sun, 16 Aug 2015 21:27:22 -0400
Subject: [PATCH 08/33] Fixed #1820

---
 seed/challenges/html5-and-css.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 4d4ae95cad..926676c9e4 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -3681,8 +3681,8 @@
         "Make the <code>body</code> element's background color a dark gray by giving it the hex code value of <code>#111111</code>."
       ],
       "tests": [
-        "assert($(\"body\").css(\"background-color\") === \"rgb(17, 17, 17)\", 'Give your <code>body</code> element the <code>background-color</code> of a light gray.')",
-        "assert(editor.match(/#111111/g) && editor.match(/#111111/g).length > 0, 'Use <code>hex code</code> to make a light gray. For example <code>body { color&#58; #111111; }</code>.')"
+        "assert($(\"body\").css(\"background-color\") === \"rgb(17, 17, 17)\", 'Give your <code>body</code> element the <code>background-color</code> of a dark gray.')",
+        "assert(editor.match(/#111111/g) && editor.match(/#111111/g).length > 0, 'Use <code>hex code</code> to make a dark gray. For example <code>body { color&#58; #111111; }</code>.')"
       ],
       "challengeSeed": [
         "<style>",

From 9681534f24203ce23c596dab6d376ad0f0f98a9b Mon Sep 17 00:00:00 2001
From: ahstro <anton@lutic.org>
Date: Mon, 17 Aug 2015 10:20:26 +0200
Subject: [PATCH 09/33] Ignore case in HTML/CSS hex color waypoints. #1830

---
 seed/challenges/html5-and-css.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 4d4ae95cad..9e44be3454 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -3508,7 +3508,7 @@
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(255, 0, 0)\", 'Give your <code>body</code> element the <code>background-color</code> of red.')",
-        "assert(editor.match(/#FF0000/g) && editor.match(/#FF0000/g).length > 0, 'Use the <code>hex code</code> for the color red instead of the word <code>red</code>. For example <code>body { color&#58; #FF0000; }</code>.')"
+        "assert(editor.match(/#FF0000/ig) && editor.match(/#FF0000/ig).length > 0, 'Use the <code>hex code</code> for the color red instead of the word <code>red</code>. For example <code>body { color&#58; #FF0000; }</code>.')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3578,7 +3578,7 @@
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 255)\", 'Give your <code>body</code> element the <code>background-color</code> of blue.')",
-        "assert(editor.match(/#0000FF/g) && editor.match(/#0000FF/g).length > 0, 'Use the <code>hex code</code> for the color blue instead of the word <code>blue</code>. For example <code>body { color&#58; #0000FF; }</code>.')"
+        "assert(editor.match(/#0000FF/ig) && editor.match(/#0000FF/ig).length > 0, 'Use the <code>hex code</code> for the color blue instead of the word <code>blue</code>. For example <code>body { color&#58; #0000FF; }</code>.')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3613,7 +3613,7 @@
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(255, 165, 0)\", 'Give your <code>body</code> element the <code>background-color</code> of orange.')",
-        "assert(editor.match(/#FFA500/g) && editor.match(/#FFA500/g).length > 0, 'Use the <code>hex code</code> for the color orange instead of the word <code>orange</code>. For example <code>body { color&#58; #FFA500; }</code>.')"
+        "assert(editor.match(/#FFA500/ig) && editor.match(/#FFA500/ig).length > 0, 'Use the <code>hex code</code> for the color orange instead of the word <code>orange</code>. For example <code>body { color&#58; #FFA500; }</code>.')"
       ],
       "challengeSeed": [
         "<style>",

From c39189eab0a4f3e5d3ad8ffd454f5b5e75da4168 Mon Sep 17 00:00:00 2001
From: Ionut Costica <ionut.costica@aem.ro>
Date: Mon, 17 Aug 2015 15:04:53 +0300
Subject: [PATCH 10/33] Fix for Issue #1828

---
 server/views/challengeMap/show.jade | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade
index 0853a44f82..ec33939ae7 100644
--- a/server/views/challengeMap/show.jade
+++ b/server/views/challengeMap/show.jade
@@ -30,7 +30,6 @@ block content
                                     .col-xs-12.col-sm-9.col-md-10
                                         li.large-p.faded.negative-10
                                             a(href='#' + challengeBlock.dashedName)= challengeBlock.name
-                                        h3= challengeBlock
                                 else
                                     .hidden-xs.col-sm-3.col-md-2
                                         .progress.progress-bar-padding.text-center.thin-progress-bar

From 11f62a7cbf6db56eac74f17219a522a3be81fda3 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Mon, 17 Aug 2015 09:01:48 -0400
Subject: [PATCH 11/33] Fixed #1848

---
 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 4d4ae95cad..d83a173539 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -2530,7 +2530,7 @@
       "difficulty": 1.392,
       "description": [
         "One cool thing about <code>id</code> attributes is that, like classes, you can style them using CSS.",
-        "Here's an example of how you can take your element with the <code>id</code> attribute of <code>cat-photo-element</code> and give it the background color of green. In your <code>style</code> element: <code>#cat-photo-element { background-color: green; }></code>",
+        "Here's an example of how you can take your element with the <code>id</code> attribute of <code>cat-photo-element</code> and give it the background color of green. In your <code>style</code> element: <code>#cat-photo-element { background-color: green; }</code>",
         "Note that inside your <code>style</code> element, you always reference classes by putting a <code>.</code> in front of their names. You always reference ids by putting a <code>#</code> in front of their names.",
         "Try giving your form, which now has the <code>id</code> attribute of <code>cat-photo-form</code>, a green background."
       ],

From fe102bdf51ae0b8ffcceab682d78d63cf75d2898 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 14:04:12 +0100
Subject: [PATCH 12/33] fix #1840

---
 server/views/coursewares/showHTML.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade
index 9b703804a0..a1e0770a8d 100644
--- a/server/views/coursewares/showHTML.jade
+++ b/server/views/coursewares/showHTML.jade
@@ -73,7 +73,7 @@ block content
                                 textarea#codeEditor(autofocus=true, style='display: none;')
         .col-md-4.col-lg-3
             .hidden-xs.hidden-sm
-                img.iphone-position.iframe-scroll(src="https://s3.amazonaws.com/freecodecamp/iphone6-frame.png")
+                img.iphone-position.iframe-scroll(src="https://s3.amazonaws.com/freecodecamp/iphone6-frame.png", style = "z-index: -2;")
             iframe.iphone.iframe-scroll#preview
             .spacer
         #complete-courseware-dialog.modal(tabindex='-1')

From 1ce1c75c4daf1bb33534ddf2ec153b339dce6e2e Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 14:11:49 +0100
Subject: [PATCH 13/33] Fix #1835

---
 .../object-oriented-and-functional-programming.json           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json
index 5a4587dca5..307563795b 100644
--- a/seed/challenges/object-oriented-and-functional-programming.json
+++ b/seed/challenges/object-oriented-and-functional-programming.json
@@ -233,13 +233,13 @@
       "difficulty":0,
       "description":[
         "filter is a useful method that can filter out values that don't match a certain criteria",
-        "Let's remove all the values greater than six",
+        "Let's remove all the values greater than five",
         "<code>array = array.filter(function(val) {</code>",
         "<code>&thinsp;&thinsp;return(val<4);</code>",
         "<code>});</code>"
       ],
       "tests":[
-        "assert.deepEqual(array, [1,2,3,4,5], 'You should have removed all the values from the array that are less than six');",
+        "assert.deepEqual(array, [1,2,3,4,5], 'You should have removed all the values from the array that are greater than five');",
         "assert(editor.getValue().match(/array\\.filter\\(/gi), 'You should be using the filter method to remove the values from the array');",
         "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\,6\\,7\\,8\\,9\\,10\\]/gi), 'You should only be using .filter to modify the contents of the array');"
       ],

From d4b3b0c3368c1874ff63c8495f49b402a28c1398 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Mon, 17 Aug 2015 09:12:04 -0400
Subject: [PATCH 14/33] Fixed #1849

---
 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 4d4ae95cad..99ac4eea80 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -2537,7 +2537,7 @@
       "tests": [
         "assert($(\"form\").attr(\"id\") === \"cat-photo-form\", 'Give your <code>form</code> element the id of <code>cat-photo-form</code>.')",
         "assert($(\"#cat-photo-form\").css(\"background-color\") === \"rgb(0, 128, 0)\", 'Your <code>form</code> element should have the <code>background-color</code> of green.')",
-        "assert(editor.match(/<form.*cat-photo-form.*>/gi) && editor.match(/<form.*cat-photo-form.*>/gi).length > 0, 'Make sure your <code>form</code> element has both an <code>id</code> attribute.')",
+        "assert(editor.match(/<form.*cat-photo-form.*>/gi) && editor.match(/<form.*cat-photo-form.*>/gi).length > 0, 'Make sure your <code>form</code> element has an <code>id</code> attribute.')",
         "assert(!editor.match(/<form.*style.*>/gi) && !editor.match(/<form.*class.*>/gi), 'Do not give your <code>form</code> any <code>class</code> or <code>style</code> attributes.')"
       ],
       "challengeSeed": [

From 06c3d78c64579fe228b54124643cd77f5a55b9c6 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 14:16:16 +0100
Subject: [PATCH 15/33] Update basic-javascript.json

---
 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 897174ad88..dbf816ab85 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -902,7 +902,7 @@
       ],
       "challengeSeed":[
         "function myFunction(){",
-        "  // Make myFunction return a random number between 'min' and 'max' instead of a decimal",
+        "  // Make myFunction return a random number between <code>min</code> and <code>max</code> instead of a decimal",
         "",
         "  // Only change code below this line.",
         "",

From 946717fc65d9f010a72e9b453ac00cc6ba6e46a0 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 14:28:30 +0100
Subject: [PATCH 16/33] Fix #1838

---
 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 75fde692ad..453c0bfe7b 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -1092,7 +1092,7 @@
       ],
       "tests":[
         "assert(test === 36, 'Your RegEx should have found seven spaces in the <code>testString</code>.');",
-        "assert(editor.getValue().match(/\\/\\\\S\\/gi/gi), 'You should be using the following expression <code>/\\S+/gi</code> to find the spaces in the <code>testString</code>.');"
+        "assert(editor.getValue().match(/\\/\\\\S\\/gi/gi), 'You should be using the following expression <code>/\\\\S/gi</code> to find the spaces in the <code>testString</code>.');"
       ],
       "challengeSeed":[
         "var test = (function(){",

From a11064ba74ea0b5c6ae9a994c8c51d908344dfb0 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 14:30:57 +0100
Subject: [PATCH 17/33] Small CSS hack to fix a display glitch

---
 public/css/main.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/main.less b/public/css/main.less
index bc060791d5..82dec41a83 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -1163,6 +1163,10 @@ hr {
   font: normal normal normal 14px/1 FontAwesome !important;
 }
 
+#testSuite > div >.row {
+  margin: 0!important;
+}
+
 //uncomment this to see the dimensions of all elements outlined in red
 //* {
 //  border-color: red;

From 4b05626ce336fe1a4fe3c0158caec809a6c0d1f3 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 14:34:19 +0100
Subject: [PATCH 18/33] fix #1847

---
 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 8d1ed23a7f..a58be9f38b 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -898,7 +898,7 @@
         "<img class=\"img-responsive\" src=\"https://www.evernote.com/l/AHTFU358y71AV6mokPeuTEgrZVdUJ4A8v3AB/image.png\" alt=\"An \"inline\" button is as small as the text it contains. In this image, it's centered. Below it is a \"block-level\" button, which stretches to fill the entire horizontal space.'>",
         "By using the <code>span</code> element, you can put several elements together, and even style different parts of the same element differently.",
         "Nest the word \"love\" in your \"Things cats love\" element below within a <code>span</code> element. Then give that <code>span</code> the class <code>text-danger</code> to make the text red.",
-        "Here's how you would do this with the \"Top 3 things cats hate\" element: <code>&#60;p&#62;Top 3 things cats &#60;span class\"text-danger\"&#62;hate&#60;/span&#62;&#60;/p&#62;</code>"
+        "Here's how you would do this with the \"Top 3 things cats hate\" element: <code>&#60;p&#62;Top 3 things cats &#60;span class = \"text-danger\"&#62;hate&#60;/span&#62;&#60;/p&#62;</code>"
       ],
       "tests": [
         "assert($(\"p span\") && $(\"p span\").length > 0, 'Your <code>span</code> element should be inside your <code>p</code> element.')",

From 6cf25e6a35e34fd61d37e22d2202599231269e88 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Mon, 17 Aug 2015 09:52:34 -0400
Subject: [PATCH 19/33] Fixes #1856

---
 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 dbf816ab85..2c5c768186 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -157,7 +157,7 @@
         "assert((function(){if(typeof(firstLetterOfLastName) !== \"undefined\" && editor.getValue().match(/\\[0\\]/gi) && typeof(firstLetterOfLastName) === \"string\" && firstLetterOfLastName === \"L\"){return(true);}else{return(false);}})(), 'The first letter of firstLetterOfLastName should be a L');"
       ],
       "challengeSeed": [
-        "var firstLetterOfLastName = \"\";",
+        "var firstLetterOfFirstName = \"\";",
         "var firstLetterOfLastName = \"\";",
         "",
         "var firstName = \"Ada\";",

From 1bdb40bcafaffc666c43bc7b685b7c1fb4daed68 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 15:43:36 +0100
Subject: [PATCH 20/33] The FCC editor will now catch un-closed comments! This
 can be extended to catch quotes as well if needed. Fix #1839

---
 .../coursewares/coursewaresHCJQFramework_0.1.9.js | 11 +++++++++++
 .../coursewares/coursewaresJSFramework_0.0.6.js   | 15 ++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js
index 94d8bb7e93..6b004bafe6 100644
--- a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js
+++ b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js
@@ -71,6 +71,17 @@ editor.on("keyup", function () {
 var nodeEnv = prodOrDev === 'production' ? 'http://www.freecodecamp.com' : 'http://localhost:3001';
 function updatePreview() {
   editorValueForIFrame = editor.getValue();
+  var failedCommentTest = false;
+  if(editorValueForIFrame.match(/\<\!\-\-/gi) && editorValueForIFrame.match(/\-\-\>/gi) == null){
+    failedCommentTest = true;
+  }
+  else if(editorValueForIFrame.match(/\<\!\-\-/gi) && editorValueForIFrame.match(/\<\!\-\-/gi).length > editorValueForIFrame.match(/\-\-\>/gi).length){
+    failedCommentTest = true;
+  }
+  if(failedCommentTest){
+      editor.setValue(editor.getValue()+ "-->");
+      editorValueForIFrame = editorValueForIFrame + "-->";
+  }
   goodTests = 0;
   var previewFrame = document.getElementById('preview');
   var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
diff --git a/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js b/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js
index 564b9decae..712811c9c1 100644
--- a/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js
+++ b/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js
@@ -100,12 +100,25 @@ function bonfireExecute() {
   userTests = null;
   $('#codeOutput').empty();
   var userJavaScript = myCodeMirror.getValue();
+  var failedCommentTest = false;
+  if(userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\*\//gi) == null){
+      failedCommentTest = true;
+  }
+  else if(!failedCommentTest && userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\/\*/gi).length > userJavaScript.match(/\*\//gi).length){
+      failedCommentTest = true;
+  }
   userJavaScript = removeComments(userJavaScript);
   userJavaScript = scrapeTests(userJavaScript);
   // simple fix in case the user forgets to invoke their function
 
   submit(userJavaScript, function(cls, message) {
-    if (cls) {
+    if(failedCommentTest){
+      myCodeMirror.setValue(myCodeMirror.getValue() + "*/");
+      console.log('Caught Unfinished Comment');
+      codeOutput.setValue("Unfinished mulit-line comment");
+      failedCommentTest = false;
+    }
+    else if (cls) {
       codeOutput.setValue(message.error);
       runTests('Error', null);
     } else {

From 973c9e67c2d631f80b599747e4707fd213b7aaa8 Mon Sep 17 00:00:00 2001
From: patlanders <patlanders@users.noreply.github.com>
Date: Mon, 17 Aug 2015 13:20:15 -0400
Subject: [PATCH 21/33] Change "opps!" to "Oops!" in error-handlers.js

---
 server/middlewares/error-handlers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/middlewares/error-handlers.js b/server/middlewares/error-handlers.js
index 2563852653..359d713272 100644
--- a/server/middlewares/error-handlers.js
+++ b/server/middlewares/error-handlers.js
@@ -22,7 +22,7 @@ export default function prodErrorHandler() {
     var accept = accepts(req);
     var type = accept.type('html', 'json', 'text');
 
-    var message = 'opps! Something went wrong. Please try again later';
+    var message = 'Oops! Something went wrong. Please try again later';
     if (type === 'html') {
       if (typeof req.flash === 'function') {
         req.flash('errors', {

From 93a7fa1c34f8d7bedbcee3afac293d69e54ac9e7 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 20:08:21 +0100
Subject: [PATCH 22/33] Fix #1870 #1874 and there was another issue but  i cant
 find it related to the arithmetic on decimals challenge

---
 seed/challenges/basic-javascript.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 7e33e57474..ce7ec4949e 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -398,7 +398,8 @@
         "Replace the <code>0.0</code> with the correct number so that you get the result mentioned in the comments."
       ],
       "tests": [
-        "assert((function(){if(product === 5.0 && editor.getValue().match(/\\*/g)){return(true);}else{return(false);}})(), 'Make the variable <code>product</code> equal 5.0.');"
+        "assert((function(){if(product === 5.0 && editor.getValue().match(/\\*/g)){return(true);}else{return(false);}})(), 'Make the variable <code>product</code> equal 5.0.');",
+        "assert((function(){if(quotient === 2.2 && editor.getValue().match(/\\//g)){return(true);}else{return(false);}})(), 'Make the variable <code>quotient</code> equal 2.2.');"
       ],
       "challengeSeed": [
         "var quotient = 4.4 / 2.0; // equals 2.2",
@@ -553,9 +554,9 @@
         "//console.log(removed); // logs 3",
         "",
         "var myArray = [\"John\", 23, [\"cat\", 2]];",
-        "var removed = myArray; // This should be [\"cat\", 2] and myArray should now be [\"John\", 23]",
         "// Only change code below this line.",
         "",
+        "var removed = myArray; // This should be [\"cat\", 2] and myArray should now be [\"John\", 23]",
         "",
         "// Only change code above this line.",
         "// We use this function to show you the value of your variable in your output box.",
@@ -902,7 +903,7 @@
       ],
       "challengeSeed":[
         "function myFunction(){",
-        "  // Make myFunction return a random number between <code>min</code> and <code>max</code> instead of a decimal",
+        "  // Make myFunction return a random number betweenzero and nine> instead of a decimal",
         "",
         "  // Only change code below this line.",
         "",
@@ -1092,7 +1093,7 @@
       ],
       "tests":[
         "assert(test === 36, 'Your RegEx should have found seven spaces in the <code>testString</code>.');",
-        "assert(editor.getValue().match(/\\/\\\\S\\/gi/gi), 'You should be using the following expression <code>/\\\\S/gi</code> to find the spaces in the <code>testString</code>.');"
+        "assert(editor.getValue().match(/\\/\\\\S\\/gi/gi), 'You should be using the following expression <code>/\\+S/gi</code> to find the spaces in the <code>testString</code>.');"
       ],
       "challengeSeed":[
         "var test = (function(){",

From b35c77deb7c443af6d018816c86788d0e5b4ed63 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 20:11:04 +0100
Subject: [PATCH 23/33] Fix #1871

---
 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 ce7ec4949e..e1fd9b08eb 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -336,7 +336,7 @@
         "// Only change code above this line.",
         "// We use this function to show you the value of your variable in your output box.",
         "// You'll learn about functions soon.",
-        "(function(z){return('product='+z);})(product)"
+        "(function(z){return('product='+z);})(product);"
       ],
       "type": "waypoint",
       "challengeType": 1

From 7f4aa5487f573616f7f765fe948f667aad60af04 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 20:16:11 +0100
Subject: [PATCH 24/33] Fix #1895

---
 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 f2dfcb08e1..3e5e600db4 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -624,7 +624,7 @@
         "Here's an example of how you would use the <code>parent()</code> function: <code>$(\"#left-well\").parent().css(\"background-color\", \"blue\")</code>"
       ],
       "tests": [
-        "assert($(\"#left-well\").css(\"background-color\") === 'rgb(255, 0, 0)', 'Your <code>left-well</code> element should have a red background.')",
+        "assert($(\"#left-well\").css(\"background-color\") === 'rgb(255, 0, 0)' || $(\"#left-well\").css(\"background-color\") === '#ff0000' $(\"#left-well\").css(\"background-color\") === 'red', 'Your <code>left-well</code> element should have a red background.')",
         "assert(editor.match(/\\.parent\\(\\)\\.css/g), 'You should use the <code>parent()</code> function to modify this element.')",
         "assert(editor.match(/<div class=\"well\" id=\"left-well\">/g), 'Only use jQuery to add these classes to the element.')"
       ],

From f0f75eeae54ef194c534a0be74358b6845a5bc7c Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 21:09:40 +0100
Subject: [PATCH 25/33] fixed the tests on a challenge

---
 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 3e5e600db4..e6fd81b14d 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -624,7 +624,7 @@
         "Here's an example of how you would use the <code>parent()</code> function: <code>$(\"#left-well\").parent().css(\"background-color\", \"blue\")</code>"
       ],
       "tests": [
-        "assert($(\"#left-well\").css(\"background-color\") === 'rgb(255, 0, 0)' || $(\"#left-well\").css(\"background-color\") === '#ff0000' $(\"#left-well\").css(\"background-color\") === 'red', 'Your <code>left-well</code> element should have a red background.')",
+        "assert($(\"#left-well\").css(\"background-color\") === 'red', 'Your <code>left-well</code> element should have a red background.')",
         "assert(editor.match(/\\.parent\\(\\)\\.css/g), 'You should use the <code>parent()</code> function to modify this element.')",
         "assert(editor.match(/<div class=\"well\" id=\"left-well\">/g), 'Only use jQuery to add these classes to the element.')"
       ],

From 0bbb5cf1223dc05ad547265bd55d9738ef6ebb9c Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 21:11:01 +0100
Subject: [PATCH 26/33] fixed the moved some comments in a seed that were
 causing confusion

---
 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 ee865796a3..2d96a91589 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -615,9 +615,9 @@
         "// ourArray now equals [\"J\", [\"cat\"]]",
         "",
         "var myArray = [\"John\", 23, [\"dog\", 3]];",
-        "var myRemoved = myArray; // This should be [\"John\"] and myArray should now be [23, [\"dog\", 3]]",
         "// Only change code below this line.",
         "",
+        "var myRemoved = myArray; // This should be [\"John\"] and myArray should now be [23, [\"dog\", 3]]",
         "",
         "// Only change code above this line.",
         "// We use this function to show you the value of your variable in your output box.",

From 7c360285aa963c61d6d7eaa5ceee754d5d6bee7e Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 21:12:19 +0100
Subject: [PATCH 27/33] Spaced out code a bit more on the shift challenge

---
 seed/challenges/basic-javascript.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 2d96a91589..ed2b25e443 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -620,6 +620,7 @@
         "var myRemoved = myArray; // This should be [\"John\"] and myArray should now be [23, [\"dog\", 3]]",
         "",
         "// Only change code above this line.",
+        "",
         "// We use this function to show you the value of your variable in your output box.",
         "// You'll learn about functions soon.",
         "(function(y, z){return('myArray = ' + JSON.stringify(y) + ' & myRemoved = ' + JSON.stringify(z));})(myArray, myRemoved);"

From 8722a0a29476d5afd0f0be21bf11d5e14a7ac794 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Mon, 17 Aug 2015 16:19:02 -0400
Subject: [PATCH 28/33] Fixes #1878

---
 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 ed2b25e443..24318e8477 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -963,7 +963,7 @@
         "<code>}</code>",
         "<code>else {</code>",
         "<code>&thinsp;&thinsp;return(false);</code>",
-        "<code>}</code>",
+        "<code>}</code></code>",
         "Let's use <code>if</code> and <code>else</code> statements to make a coin-flip game.",
         "Create an <code>if-else statement</code> to return <code>heads</code> if the flip var is zero and to return <code>tails</code> if it's not."
       ],

From 0cab1ebfe58245887e15fd9ebc234dcba591bf23 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Mon, 17 Aug 2015 16:34:45 -0400
Subject: [PATCH 29/33] Moved closing code to line 961

---
 seed/challenges/basic-javascript.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 24318e8477..3416cd2240 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -958,12 +958,12 @@
         "We can use if statements in JavaScript to only execute code if a certain condition is met.",
         "if statements require some sort of boolean condition evaluate.",
         "Example:",
-        "<code> if (1 == 2) {",
+        "<code> if (1 == 2) {</code>",
         "<code>&thinsp;&thinsp;return(true);</code>",
         "<code>}</code>",
         "<code>else {</code>",
         "<code>&thinsp;&thinsp;return(false);</code>",
-        "<code>}</code></code>",
+        "<code>}</code>",
         "Let's use <code>if</code> and <code>else</code> statements to make a coin-flip game.",
         "Create an <code>if-else statement</code> to return <code>heads</code> if the flip var is zero and to return <code>tails</code> if it's not."
       ],

From 4d56972e216723ff430cc3a2896d4289562aa569 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Mon, 17 Aug 2015 16:42:20 -0400
Subject: [PATCH 30/33] Fixed #1926

---
 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 3416cd2240..1096e02868 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -924,7 +924,7 @@
       "title": "Generate Random Whole Numbers within a Range",
       "difficulty":"9.9829",
       "description":[
-        "We can use a certain mathematical expression to get a random number between between two numbers.",
+        "We can use a certain mathematical expression to get a random number between two numbers.",
         "<code>Math.floor(Math.random() * (max - min + 1)) + min</code>",
         "By using this we can control the output of a random number."
       ],

From 7c80d64d083987a4f30b77c3bfc2849da777bc0d Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Mon, 17 Aug 2015 22:57:25 +0100
Subject: [PATCH 31/33] Fix #1942

---
 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 e6fd81b14d..2e4fca0f9c 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -624,7 +624,7 @@
         "Here's an example of how you would use the <code>parent()</code> function: <code>$(\"#left-well\").parent().css(\"background-color\", \"blue\")</code>"
       ],
       "tests": [
-        "assert($(\"#left-well\").css(\"background-color\") === 'red', 'Your <code>left-well</code> element should have a red background.')",
+        "assert($(\"#left-well\").css(\"background-color\") === 'red' || $(\"#left-well\").css(\"background-color\") === 'rgb(255, 0, 0)' || $(\"#left-well\").css(\"background-color\").toLowerCase() === '#ff0000' || $(\"#left-well\").css(\"background-color\").toLowerCase() === '#f00', 'Your <code>left-well</code> element should have a red background.')",
         "assert(editor.match(/\\.parent\\(\\)\\.css/g), 'You should use the <code>parent()</code> function to modify this element.')",
         "assert(editor.match(/<div class=\"well\" id=\"left-well\">/g), 'Only use jQuery to add these classes to the element.')"
       ],

From 2b080ec2b718a89d5a4e9a062b74465392747d58 Mon Sep 17 00:00:00 2001
From: Abhisek Pattnaik <crownabhisek007@gmail.com>
Date: Tue, 18 Aug 2015 04:17:24 +0530
Subject: [PATCH 32/33] Problem Instruction clarrification

Replaced with correct instruction to the problem.
---
 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 2e4fca0f9c..d6a6fa0fb0 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -730,7 +730,7 @@
       "description": [
         "You've seen why id attributes are so convenient for targeting with jQuery selectors. But you won't always have such neat ids to work with.",
         "Fortunately, jQuery has some other tricks for targeting the right elements.",
-        "jQuery has a function called <code>:nth-child()</code> that will allow you select the nth element of a certain class or element type.",
+        "jQuery uses CSS Selectors to target elements. <code>target:nth-child(n)</code> css selector allows you to select all the nth element with the target class or element type.",
         "Make the second child in each of your well elements bounce.",
         "Here's how you would give the third element in each well bounce: <code>$(\".target:nth-child(3)\").addClass(\"animated bounce\");</code>"
       ],

From 495aac8233d8b7970559e629e1325808d06c185f Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Mon, 17 Aug 2015 19:21:57 -0700
Subject: [PATCH 33/33] remove part of note about email signin

---
 server/views/account/signin.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/views/account/signin.jade b/server/views/account/signin.jade
index fb1b7bd962..548f1151f8 100644
--- a/server/views/account/signin.jade
+++ b/server/views/account/signin.jade
@@ -18,7 +18,7 @@ block content
             i.fa.fa-linkedin
             | Sign in with LinkedIn
         br
-        p Email sign in is temporarily disabled - we are working to fix this ASAP. Try logging in with an above service that uses the same email address as you normally use to sign in with (other than Twitter).
+        p Email sign in is temporarily disabled - we are working to fix this ASAP.
         //p
         //    a(href="/email-signup") Or sign up using your email address here.
         //p