Merge pull request #8822 from FreeCodeCamp/staging

Release staging

bower.json

@@ -22,7 +22,7 @@
     "jshint": "~2.9.0",
     "lightbox2": "~2.8.1",
     "rxjs": "~4.0.6",
-    "CodeMirror": "~5.8.0",
+    "CodeMirror": "~5.15.2",
     "chai": "~3.4.1",
     "clipboard": "~1.5.5",
     "mousetrap": "~1.5.3"

seed/challenges/01-front-end-development-certification/basic-bonfires.json

@@ -181,7 +181,8 @@
         "assert(palindrome(\"almostomla\") === false, 'message: <code>palindrome(\"almostomla\")</code> should return false.');",
         "assert(palindrome(\"My age is 0, 0 si ega ym.\") === true, 'message: <code>palindrome(\"My age is 0, 0 si ega ym.\")</code> should return true.');",
         "assert(palindrome(\"1 eye for of 1 eye.\") === false, 'message: <code>palindrome(\"1 eye for of 1 eye.\")</code> should return false.');",
-        "assert(palindrome(\"0_0 (: /-\\ :) 0-0\") === true, 'message: <code>palindrome(\"0_0 (: /-\\ :) 0-0\")</code> should return true.');"
+        "assert(palindrome(\"0_0 (: /-\\ :) 0-0\") === true, 'message: <code>palindrome(\"0_0 (: /-\\ :) 0-0\")</code> should return true.');",
+        "assert(palindrome(\"five|\\_/|four\") === false, 'message: <code>palindrome(\"five|\\_/|four\")</code> should return false.');"
       ],
       "type": "bonfire",
       "isRequired": true,

seed/challenges/01-front-end-development-certification/object-oriented-and-functional-programming.json

@@ -397,7 +397,7 @@
         "The following code is an example of using <code>filter</code> to remove array elements that are equal to five:",
         "Note: We omit the second and third arguments since we only need the value",
         "<blockquote>array = array.filter(function(val) {<br>&nbsp;&nbsp;return val !== 5;<br>});</blockquote>",
-        "Use <code>filter</code> to create a new array with all the values from <code>oldArray</code> which are less than 6.<br><code>oldArray</code> should not change."
+        "Use <code>filter</code> to create a new array with all the values from <code>oldArray</code> which are less than 6. The <code>oldArray</code> should not change."
       ],
       "challengeSeed": [
         "var oldArray = [1,2,3,4,5,6,7,8,9,10];",

seed/challenges/02-data-visualization-certification/data-visualization-certificate.json

@@ -83,7 +83,7 @@
         },
         {
           "id": "bd7198d8c242eddfaeb5bd13",
-          "title": "Show Relationships with a Force Directed Graph"
+          "title": "Show National Contiguity with a Force Directed Graph"
         },
         {
           "id": "bd7108d8c242eddfaeb5bd13",

seed/challenges/02-data-visualization-certification/data-visualization-projects.json

@@ -119,18 +119,16 @@
     },
     {
       "id": "bd7198d8c242eddfaeb5bd13",
-      "title": "Show Relationships with a Force Directed Graph",
+      "title": "Show National Contiguity with a Force Directed Graph",
       "description": [
-        "<strong>Objective:</strong> Build a <a href='https://codepen.io' target='_blank'>CodePen.io</a> app that is functionally similar to this: <a href='https://codepen.io/FreeCodeCamp/full/KVNNXY' target='_blank'>https://codepen.io/FreeCodeCamp/full/KVNNXY</a>.",
+        "<strong>Objective:</strong> Build a <a href='https://codepen.io' target='_blank'>CodePen.io</a> app that is functionally similar to this: <a href='https://codepen.io/FreeCodeCamp/full/xVopBo' target='_blank'>https://codepen.io/FreeCodeCamp/full/xVopBo</a>.",
         "<strong>Rule #1:</strong> Don't look at the example project's code. Figure it out for yourself.",
         "<strong>Rule #2:</strong> Fulfill the below <a href='https://en.wikipedia.org/wiki/User_story' target='_blank'>user stories</a>. Use whichever libraries or APIs you need. Give it your own personal style.",
         "<strong>Rule #3:</strong> You must use D3.js to build this project.",
-        "<strong>User Story:</strong> I can see a Force-directed Graph that shows which campers are posting links on Camper News to which domains.",
+        "<strong>User Story:</strong> I can see a Force-directed Graph that shows which countries share borders.",
-        "<strong>User Story:</strong> I can see each camper's icon on their node.",
+        "<strong>User Story:</strong> I can see each country's flag on its node.",
-        "<strong>User Story:</strong> I can see the relationship between the campers and the domains they're posting.",
+        "<strong>Hint:</strong> Here's a dataset you can use to build this: <a href='https://raw.githubusercontent.com/DealPete/forceDirected/master/countries.json' target='_blank'>https://raw.githubusercontent.com/DealPete/forceDirected/master/countries.json</a>",
-        "<strong>User Story:</strong> I can tell approximately how many times campers have linked to a specific domain from it's node size.",
+		"<strong>Hint:</strong> You can create a spritesheet of national flags at <a href='https://www.flag-sprites.com' target='_blank'>https://www.flag-sprites.com</a>.",
-        "<strong>User Story:</strong> I can tell approximately how many times a specific camper has posted a link from their node's size.",
-        "<strong>Hint:</strong> Here's the Camper News Hot Stories API endpoint: <code>https://www.freecodecamp.com/news/hot</code>.",
         "Remember to use <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/FreeCodeCamp-Get-Help' target='_blank'>Read-Search-Ask</a> if you get stuck.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ",
         "You can get feedback on your project by sharing it with your friends on Facebook."

seed/challenges/03-back-end-development-certification/mongodb.json

@@ -17,8 +17,9 @@
         "Click the \"Create workspace\" button.",
         "Once C9 builds and loads your workspace, you should see a terminal window in the lower right hand corner. In this window use the following commands. You don't need to know what these mean at this point.",
         "Install <code>learnyoumongo</code> with this command: <code>npm install learnyoumongo -g</code>",
+        "Set up your mongod alias by following the directions at <a href='https://community.c9.io/t/setting-up-mongodb/1717' target='_blank'>https://community.c9.io/t/setting-up-mongodb/1717</a>.",
         "Now start the tutorial by running <code>learnyoumongo</code>.",
-        "Whenever you run a command that includes <code>mongod</code> on c9.io, be sure to also use the <code>--nojournal</code> flag, like this: <code>mongod --nojournal</code>.",
+        "Whenever you run a command that includes <code>mongod</code> on c9.io, use <code>./mongod</code> instead.",
         "Note that you can resize the c9.io's windows by dragging their borders.",
         "Make sure that you are always in your project's \"workspace\" directory. You can always navigate back to this directory by running this command: <code>cd ~/workspace</code>.",
         "You can view this Node School module's source code on GitHub at <a href='https://github.com/evanlucas/learnyoumongo'>https://github.com/evanlucas/learnyoumongo</a>.",

seed/challenges/04-video-challenges/computer-basics.json

@@ -26,7 +26,7 @@
       ],
       "tests": [
         [
-          "The computer has 3 basic parts.",
+          "The computer only has 3 basic parts.",
           false,
           "The computer has 4 basic parts: input, output, CPU, and memory"
         ],
@@ -253,6 +253,49 @@
       ],
       "titleEs": "Fundamentos básicos del computador: decodificar un número binario"
     },
+    {
+      "id": "bd7122d8c441eddfbeb5bddf",
+      "title": "Computer Basics: Binary Bytes",
+      "description": [
+        "Binary does more than express numbers - through bytes, it can symbolize all alphanumeric symbols, which can then be interpreted into more complex code.",
+        "Let's talk about the most basic level that a computer can understand other languages like JavaScript.",
+        "The most basic thing is a bit, up or down, 1 or 0.",
+        "After that there's a byte, 8 bits.",
+        "All numbers (255 and less), letters, and symbols can be translated into bytes that the computer can understand.",
+        "So, all of the numbers, letters, and symbols in your JavaScript can be translated.",
+        "There are a lot of languages that computers can work with, and what I want you to get away from this video is that all data in your computer boils down to binary bytes."
+      ],
+      "challengeSeed": [
+        "wr7H6oUwYUU"
+      ],
+      "tests": [
+        [
+          "All digits, letters, and symbols have a binary byte translation.",
+          true
+        ],
+        [
+          "It's good practice to memorize these.",
+          false,
+          "You can just look these up as needed."
+        ],
+        [
+          "Everything can be expressed in binary, even pictures, sound, and video",
+          true
+        ]
+      ],
+      "type": "hike",
+      "challengeType": 6,
+      "descriptionEs": [
+        "En binario se puede hacer más que representar números - mediante bytes, puede simbolizar todos los símbolos alfanuméricos, los cuales pueden ser interpretados en códigos más complejos",
+        "Vamos a hablar sobre el nivel más básico que un computador puede comprender otros lenguajes como JavaScript.",
+        "Lo más básico es un bit, arriba o abajo, 1 ó 0.",
+        "Después de eso hay un byte de 8 bits.",
+        "Todos los números (255 y menos), las letras y símbolos se pueden traducir en bytes que el computador puede entender.",
+        "Por lo tanto, todos los números, letras y símbolos en su código JavaScript se puede traducir.",
+        "Hay una gran cantidad de lenguajes con los cuales los computadores pueden operar, y lo que quiero que te quede de este video es que todos los datos en tu computador se reducen a bytes binarios."
+      ],
+      "titleEs": "Fundamentos básicos del computador: Bytes en binario"
+    },
     {
       "id": "bd7124d8c441eddfbeb5bddf",
       "title": "Computer Basics: How To Measure Data Size",
@@ -353,49 +396,6 @@
       ],
       "titleEs": "Fundamentos básicos del computador: medición de la velocidad de datos"
     },
-    {
-      "id": "bd7122d8c441eddfbeb5bddf",
-      "title": "Computer Basics: Binary Bytes",
-      "description": [
-        "Binary does more than express numbers - through bytes, it can symbolize all alphanumeric symbols, which can then be interpreted into more complex code.",
-        "Let's talk about the most basic level that a computer can understand other languages like JavaScript.",
-        "The most basic thing is a bit, up or down, 1 or 0.",
-        "After that there's a byte, 8 bits.",
-        "All numbers (255 and less), letters, and symbols can be translated into bytes that the computer can understand.",
-        "So, all of the numbers, letters, and symbols in your JavaScript can be translated.",
-        "There are a lot of languages that computers can work with, and what I want you to get away from this video is that all data in your computer boils down to binary bytes."
-      ],
-      "challengeSeed": [
-        "wr7H6oUwYUU"
-      ],
-      "tests": [
-        [
-          "All digits, letters, and symbols have a binary byte translation.",
-          true
-        ],
-        [
-          "It's good practice to memorize these.",
-          false,
-          "You can just look these up as needed."
-        ],
-        [
-          "Everything can be expressed in binary, even pictures, sound, and video",
-          true
-        ]
-      ],
-      "type": "hike",
-      "challengeType": 6,
-      "descriptionEs": [
-        "En binario se puede hacer más que representar números - mediante bytes, puede simbolizar todos los símbolos alfanuméricos, los cuales pueden ser interpretados en códigos más complejos",
-        "Vamos a hablar sobre el nivel más básico que un computador puede comprender otros lenguajes como JavaScript.",
-        "Lo más básico es un bit, arriba o abajo, 1 ó 0.",
-        "Después de eso hay un byte de 8 bits.",
-        "Todos los números (255 y menos), las letras y símbolos se pueden traducir en bytes que el computador puede entender.",
-        "Por lo tanto, todos los números, letras y símbolos en su código JavaScript se puede traducir.",
-        "Hay una gran cantidad de lenguajes con los cuales los computadores pueden operar, y lo que quiero que te quede de este video es que todos los datos en tu computador se reducen a bytes binarios."
-      ],
-      "titleEs": "Fundamentos básicos del computador: Bytes en binario"
-    },
     {
       "id": "bd7121d8c441eddfbeb5bddf",
       "title": "Computer Basics: Types of Computers",
@@ -938,6 +938,52 @@
       ],
       "titleEs": "Código Fuente"
     },
+    {
+      "id": "bd712ad8c441eddfbeb5bddf",
+      "title": "Console and Logging",
+      "description": [
+        "We discuss what (and where) the console is, why it's useful, and show a little of how it works.",
+        "The console: what it is, where you can find it, and what you use it for.",
+        "The console is very commonly used to display system administrative messages.",
+        "Your browser and your computer both have their own consoles.",
+        "Once you become familiar with it, you will find it to be a very useful and powerful tool.",
+        "In Javascript, the console is used as a great tool for debugging and finding out where in your code there's a problem.",
+        "One of the most important terms you'll need to remember is \"console.log()\".",
+        "The process of doing this can be put anywhere in the lines of code to help find, identify, and ultimately fix specific issues.",
+        "Using the Chrome browser and the Chrome console, if we type in \"console.log(\"Free Code Camp rocks!\");\", the console will literally display \"Free Code Camp rocks!\".",
+        "This will also work with numbers and booleans, which are true/false statements.",
+        "When consoling words, it's important to put it inside of quotations so it recognizes it's a string."
+      ],
+      "challengeSeed": [
+        "CdqT7_6v60E"
+      ],
+      "tests": [
+        [
+          "The console serves only small, unnecessary purposes.",
+          false,
+          "The console's main purpose is to debug, which is a vital step in creating code."
+        ],
+        [
+          "You can console strings (sets of words), numbers, and booleans (true/false statements)",
+          true
+        ]
+      ],
+      "type": "hike",
+      "challengeType": 6,
+      "nameEs": "Consola y Logging",
+      "descriptionEs": [
+        "Nosotros discutimos que es la consola (y donde está), porque es útil y mostrar un poco de como trabaja.",
+        "La consola: que es, donde la puedes encontrar, y para que la usas.",
+        "La consola es usada comunmente para mostrar los mensajes administrativos del sistema.",
+        "Una vez te familiarices con esta, encontraras una útil y poderosa herramienta.",
+        "En Javascript, la consola es usada como una gran herramienta para depurar y encontrar donde hay un error en tu código ",
+        "Uno de los términos mas importantes para recordar es \"console.log()\".",
+        "El proceso para usarla es, es ponerlo en cualquier parte entre las líneas del código para ayudar a encontrar, identificar, y en últimas solucionar problemas especificos",
+        "Usando el navegador Chrome y la consola de Chrome, si nosotros escribimos <code>console.log(\"Free Code Camp es muy bueno!\");</code>, la consola literalmente mostrará \"Free Code Camp es muy bueno!\".",
+        "Además esto funcionará con números y booleanos, cuyos valores posibles son verdadro/falso",
+        "Cuando se envian palabras a la consola, es importante ponerlas dentro de comillas para reconocer que es una cadena."
+      ]
+    },
     {
       "id": "bd7119d8c441eddfbeb5bddf",
       "title": "Variables In Code",
@@ -1026,52 +1072,6 @@
       ],
       "titleEs": "¿Qué hacen los programadores?"
     },
-    {
-      "id": "bd712ad8c441eddfbeb5bddf",
-      "title": "Console and Logging",
-      "description": [
-        "We discuss what (and where) the console is, why it's useful, and show a little of how it works.",
-        "The console: what it is, where you can find it, and what you use it for.",
-        "The console is very commonly used to display system administrative messages.",
-        "Your browser and your computer both have their own consoles.",
-        "Once you become familiar with it, you will find it to be a very useful and powerful tool.",
-        "In Javascript, the console is used as a great tool for debugging and finding out where in your code there's a problem.",
-        "One of the most important terms you'll need to remember is \"console.log()\".",
-        "The process of doing this can be put anywhere in the lines of code to help find, identify, and ultimately fix specific issues.",
-        "Using the Chrome browser and the Chrome console, if we type in \"console.log(\"Free Code Camp rocks!\");\", the console will literally display \"Free Code Camp rocks!\".",
-        "This will also work with numbers and booleans, which are true/false statements.",
-        "When consoling words, it's important to put it inside of quotations so it recognizes it's a string."
-      ],
-      "challengeSeed": [
-        "CdqT7_6v60E"
-      ],
-      "tests": [
-        [
-          "The console serves only small, unnecessary purposes.",
-          false,
-          "The console's main purpose is to debug, which is a vital step in creating code."
-        ],
-        [
-          "You can console strings (sets of words), numbers, and booleans (true/false statements)",
-          true
-        ]
-      ],
-      "type": "hike",
-      "challengeType": 6,
-      "nameEs": "Consola y Logging",
-      "descriptionEs": [
-        "Nosotros discutimos que es la consola (y donde está), porque es útil y mostrar un poco de como trabaja.",
-        "La consola: que es, donde la puedes encontrar, y para que la usas.",
-        "La consola es usada comunmente para mostrar los mensajes administrativos del sistema.",
-        "Una vez te familiarices con esta, encontraras una útil y poderosa herramienta.",
-        "En Javascript, la consola es usada como una gran herramienta para depurar y encontrar donde hay un error en tu código ",
-        "Uno de los términos mas importantes para recordar es \"console.log()\".",
-        "El proceso para usarla es, es ponerlo en cualquier parte entre las líneas del código para ayudar a encontrar, identificar, y en últimas solucionar problemas especificos",
-        "Usando el navegador Chrome y la consola de Chrome, si nosotros escribimos <code>console.log(\"Free Code Camp es muy bueno!\");</code>, la consola literalmente mostrará \"Free Code Camp es muy bueno!\".",
-        "Además esto funcionará con números y booleanos, cuyos valores posibles son verdadro/falso",
-        "Cuando se envian palabras a la consola, es importante ponerlas dentro de comillas para reconocer que es una cadena."
-      ]
-    },
     {
       "id": "bd7129d89441eddfbeb5bddf",
       "title": "Computer Security",

server/views/resources/about.jade

@@ -113,11 +113,6 @@ block content
                         i.fa.fa-video-camera
                     td
                         a(href="//www.youtube.com/watch?v=O993J5KCR_w&list=PLWKjhJtqVAbnQ048Pa8sAqJoVRhx8TJtM" target='_blank') Nonprofit project demo videos
-                tr
-                    td.text-center
-                        i.fa.fa-flask
-                    td
-                        a(href="/labs") Extra-curricular apps built by campers
                 tr
                     td.text-center
                         i.fa.fa-comment