From 9853a54a9afb952347584c4f87908eeaf5d038d9 Mon Sep 17 00:00:00 2001 From: Hallaathrad Date: Sat, 26 Mar 2016 12:08:05 -0400 Subject: [PATCH] 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 22cfb841617..5c2157f8257 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 c0425367e41..c214cfc9849 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 3566eb44eb9..9ee266c0ac2 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 18028b3d9fe..3c4e29ed61f 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.",