From 766f088ea89447a24bfe3c3152cda52f83d9a1b6 Mon Sep 17 00:00:00 2001 From: Ivan Kurnosov Date: Mon, 21 Mar 2016 10:20:53 +1300 Subject: [PATCH 1/5] Fixed assignment operator terminology It's not accurate to call the `assignment operator` `=` and `equal` operator, since it might be confused with the `equality operators`, eg `==`. For the very same reason changed the `Minus Equals` wording to characters `-=` and titled the challenges with its commonly used name: compound or augment assignment (see https://en.wikipedia.org/wiki/Augmented_assignment) What do you think of this clarification? Thanks. --- .../basic-javascript.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/seed/challenges/01-front-end-development-certification/basic-javascript.json b/seed/challenges/01-front-end-development-certification/basic-javascript.json index 5572c79818..7dda2fd78a 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -87,9 +87,9 @@ }, { "id": "56533eb9ac21ba0edf2244a8", - "title": "Storing Values with the Equal Operator", + "title": "Storing Values with the Assignment Operator", "description": [ - "In JavaScript, you can store a value in a variable with the assignment or equal (=) operator.", + "In JavaScript, you can store a value in a variable with the assignment operator.", "myVariable = 5;", "Assigns the Number value 5 to myVariable.", "Assignment always goes from right to left. Everything to the right of the = operator is resolved before the value is assigned to the variable to the left of the operator.", @@ -137,7 +137,7 @@ }, { "id": "56533eb9ac21ba0edf2244a9", - "title": "Initializing Variables with the Equal Operator", + "title": "Initializing Variables with the Assignment Operator", "description": [ "It is common to initialize a variable to an initial value in the same line as it is declared.", "var myVar = 0;", @@ -651,7 +651,7 @@ }, { "id": "56533eb9ac21ba0edf2244af", - "title": "Assignment with Plus Equals", + "title": "Compound Assignment With +=", "description": [ "In programming, it is common to use assignments to modify the contents of a variable. Remember that everything to the right of the equals sign is evaluated first, so we can say:", "myVar = myVar + 5;", @@ -702,7 +702,7 @@ }, { "id": "56533eb9ac21ba0edf2244b0", - "title": "Assignment with Minus Equals", + "title": "Compound Assignment With -=", "description": [ "Like the += operator, -= subtracts a number from a variable.", "myVar = myVar - 5;", @@ -752,7 +752,7 @@ }, { "id": "56533eb9ac21ba0edf2244b1", - "title": "Assignment with Times Equals", + "title": "Compound Assignment With *=", "description": [ "The *= operator multiplies a variable by a number.", "myVar = myVar * 5;", @@ -802,7 +802,7 @@ }, { "id": "56533eb9ac21ba0edf2244b2", - "title": "Assignment with Divided by Equals", + "title": "Compound Assignment With /=", "description": [ "The /= operator divides a variable by another number.", "myVar = myVar / 5;", From 2652d049cb31460daa420d35729c5568e846e110 Mon Sep 17 00:00:00 2001 From: deathsythe47 Date: Thu, 24 Mar 2016 00:24:52 -0500 Subject: [PATCH 2/5] Remove unnecessary comma from CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f077376656..417ecc9e9b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ We welcome pull requests from Free Code Camp campers (our students) and seasoned 1. Find an issue that needs assistance by searching for the [Help Wanted](https://github.com/FreeCodeCamp/FreeCodeCamp/labels/help%20wanted) tag. -2. Let us know you are working on it, by posting a comment on the issue. +2. Let us know you are working on it by posting a comment on the issue. 3. Feel free to ask for help in our [Help Contributors](https://gitter.im/FreeCodeCamp/HelpContributors) Gitter room. If you've found a bug that is not on the board, [follow these steps](#found-a-bug). From eb8b7298d516ea20a4aadb9797c7b6fd5af27ea5 Mon Sep 17 00:00:00 2001 From: BKinahan Date: Thu, 24 Mar 2016 21:11:36 +0000 Subject: [PATCH 3/5] Fix 'its' typo in Where Art Thou description --- .../intermediate-bonfires.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/01-front-end-development-certification/intermediate-bonfires.json b/seed/challenges/01-front-end-development-certification/intermediate-bonfires.json index 12977a899e..91b0e7693f 100644 --- a/seed/challenges/01-front-end-development-certification/intermediate-bonfires.json +++ b/seed/challenges/01-front-end-development-certification/intermediate-bonfires.json @@ -155,7 +155,7 @@ "title": "Where art thou", "description": [ "Make a function that looks through an array of objects (first argument) and returns an array of all objects that have matching property and value pairs (second argument). Each property and value pair of the source object has to be present in the object from the collection if it is to be included in the returned array.", - "For example, if the first argument is [{ first: \"Romeo\", last: \"Montague\" }, { first: \"Mercutio\", last: null }, { first: \"Tybalt\", last: \"Capulet\" }], and the second argument is { last: \"Capulet\" }, then you must return the third object from the array (the first argument), because it contains the property and it's value, that was passed on as the second argument.", + "For example, if the first argument is [{ first: \"Romeo\", last: \"Montague\" }, { first: \"Mercutio\", last: null }, { first: \"Tybalt\", last: \"Capulet\" }], and the second argument is { last: \"Capulet\" }, then you must return the third object from the array (the first argument), because it contains the property and its value, that was passed on as the second argument.", "Remember to use Read-Search-Ask if you get stuck. Write your own code." ], "challengeSeed": [ From b6160dbfaa9ea70ebdc3d3e758bdbbe2e4d53f81 Mon Sep 17 00:00:00 2001 From: Eric Leung Date: Fri, 25 Mar 2016 12:35:26 -0500 Subject: [PATCH 4/5] Clarify h2 HTML heading descriptions --- .../01-front-end-development-certification/html5-and-css.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/seed/challenges/01-front-end-development-certification/html5-and-css.json b/seed/challenges/01-front-end-development-certification/html5-and-css.json index b63144005b..ab7ce8575e 100644 --- a/seed/challenges/01-front-end-development-certification/html5-and-css.json +++ b/seed/challenges/01-front-end-development-certification/html5-and-css.json @@ -86,8 +86,7 @@ "Over the next few challenges, we'll build an HTML5 app that will look something like this:", "\"A", "The h2 element you enter will create an h2 element on the website.", - "This element tells the browser how to render the text that it contains.", - "h2 elements are slightly smaller than h1 elements. There are also h3, h4, h5 and h6 elements.", + "This element tells the browser about the structure of your website. h1 elements are often used for main headings, while h2 elements are generally used for subheadings. There are also h3, h4, h5 and h6 elements to indicate different and new sections.", "Add an h2 tag that says \"CatPhotoApp\" to create a second HTML element below your \"Hello World\" h1 element." ], "challengeSeed": [ From 9853a54a9afb952347584c4f87908eeaf5d038d9 Mon Sep 17 00:00:00 2001 From: Hallaathrad Date: Sat, 26 Mar 2016 12:08:05 -0400 Subject: [PATCH 5/5] Replace portfolio link --- .travis.yml | 12 +++++++++++- common/app/routes/Hikes/components/Lecture.jsx | 4 ++-- package.json | 6 +++--- .../basic-ziplines.json | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22cfb84161..5c2157f825 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,15 @@ language: node_js node_js: - '4.2.1' - + +env: + - CXX=g++-4.8 + +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + sudo: false diff --git a/common/app/routes/Hikes/components/Lecture.jsx b/common/app/routes/Hikes/components/Lecture.jsx index c0425367e4..c214cfc984 100644 --- a/common/app/routes/Hikes/components/Lecture.jsx +++ b/common/app/routes/Hikes/components/Lecture.jsx @@ -57,8 +57,8 @@ export class Lecture extends React.Component { return transcript.map((line, index) => (

+ dangerouslySetInnerHTML={{__html: line}} + key={ dashedName + index } /> )); } diff --git a/package.json b/package.json index 3566eb44eb..9ee266c0ac 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "async": "^1.5.0", "babel-cli": "^6.3.17", "babel-core": "^6.3.26", - "babel-eslint": "^5.0.0", + "babel-eslint": "^6.0.0", "babel-loader": "^6.2.1", "babel-plugin-add-module-exports": "^0.1.2", "babel-preset-es2015": "^6.3.13", @@ -49,7 +49,7 @@ "emmet-codemirror": "^1.2.5", "errorhandler": "^1.4.2", "es6-map": "~0.1.1", - "eslint": "~2.2.0", + "eslint": "^2.2.0", "eslint-plugin-react": "^4.1.0", "express": "^4.13.3", "express-flash": "~0.0.2", @@ -110,8 +110,8 @@ "react-redux": "^4.0.6", "react-router": "^2.0.0", "react-router-bootstrap": "~0.20.1", - "react-toastr": "^2.4.0", "react-router-redux": "^2.1.0", + "react-toastr": "^2.4.0", "react-vimeo": "~0.1.0", "redux": "^3.0.5", "redux-actions": "^0.9.1", diff --git a/seed/challenges/01-front-end-development-certification/basic-ziplines.json b/seed/challenges/01-front-end-development-certification/basic-ziplines.json index 18028b3d9f..3c4e29ed61 100644 --- a/seed/challenges/01-front-end-development-certification/basic-ziplines.json +++ b/seed/challenges/01-front-end-development-certification/basic-ziplines.json @@ -177,7 +177,7 @@ "id": "bd7158d8c242eddfaeb5bd13", "title": "Build a Personal Portfolio Webpage", "description": [ - "Objective: Build a CodePen.io app that is functionally similar to this: http://codepen.io/FreeCodeCamp/full/VemmoX/.", + "Objective: Build a CodePen.io app that is functionally similar to this: http://codepen.io/hallaathrad/full/vNEPpL.", "Rule #1: Don't look at the example project's code. Figure it out for yourself.", "Rule #2: Fulfill the below user stories. Use whichever libraries you need. Give it your own personal style.", "User Story: I can access all of the portfolio webpage's content just by scrolling.",