Merge pull request #8052 from FreeCodeCamp/staging

Release staging
2016-04-11 12:12:50 -07:00
parent 7cd588bb3b bc59fede4c
commit 91841c29f4
8 changed files with 34 additions and 20 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,8 +1,20 @@
 # Contributor's Guide

-## I want to help!
-We welcome pull requests from Free Code Camp campers (our students) and seasoned JavaScript developers alike! Follow these steps to contribute:
+## Table of Contents

+- [I want to help!](#i-want-to-help)
+- [Contribution Guidelines](#contribution-guidelines)
+- [Prerequisites](#prerequisites)
+- [Getting Started](#getting-started)
+- [Linting Setup](#linting-setup)
+- [Found a bug?](#found-a-bug)
+- [Creating Pull Requests](#creating-pull-requests)
+- [Common Steps](#common-steps)
+- [Next Steps](#next-steps)
+
+## I want to help!
+
+We welcome pull requests from Free Code Camp campers (our students) and seasoned JavaScript developers alike! Follow these steps to contribute:

 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.
@ -20,15 +32,13 @@ If you've found a bug that is not on the board, [follow these steps](#found-a-bu
 5.  Squash your Commits. Ref: [rebasing](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/git-rebase)
 6.  Submit a [pull request](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Pull-Request-Contribute) from your branch to Free Code Camp's `staging` branch.  [Travis CI](https://travis-ci.org/FreeCodeCamp/FreeCodeCamp) will then take your code and run `npm test`.  Make sure this passes, then we'll do a quick code review and give you feedback, then iterate from there.

-
-Prerequisites
-------------
+## Prerequisites

 - [MongoDB](http://www.mongodb.org/downloads)
 - [Node.js](http://nodejs.org)

-Getting Started
---------------
+## Getting Started
+
 Note: If this is your first time working with a node-gyp dependent module, please follow the [node-gyp installation guide](https://github.com/nodejs/node-gyp#installation) to ensure a working npm build.

 The easiest way to get started is to clone the repository:
@ -83,6 +93,7 @@ Now navigate to your browser and open http://localhost:3001
 If the app loads, congratulations - you're all set. Otherwise, let us know by opening a GitHub issue and with your error.

 ## Linting Setup
+
 You should have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html), and it will highlight anything doesn't conform to [Free Code Camp's JavaScript Style Guide](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Free-Code-Camp-JavaScript-Style-Guide) (you can find a summary of those rules [here](https://github.com/FreeCodeCamp/FreeCodeCamp/blob/staging/.eslintrc). Please do not ignore any linting errors, as they are meant to **help** you and to ensure a clean and simple code base. Make sure none of your JavaScript is longer than 80 characters per line.  The reason we enforce this is because one of our dependent NPM modules, [jsonlint](https://github.com/zaach/jsonlint), does not fully support wildcard paths in Windows.

 ## Found a bug?
@ -92,7 +103,6 @@ Do not file an issue until you have followed these steps:
 2. Asked for confirmation in the appropriate [Help Room](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help-Rooms)
 3. Please *do not* open an issue without a 3rd party confirmation of your problem.

-
 ## Creating Pull Requests
 **What is a Pull Request?**

@ -173,7 +183,8 @@ If you have a local copy of the repo, you can make the requested changes and ame

 Be sure to post in the PR conversation that you have made the requested changes.

-##Other resources
+## Other resources
+
 - [Searching for Your Issue on GitHub](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Searching-for-Your-Issue-on-GitHub)
 - [Creating a New GitHub Issue](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Creating-a-New-GitHub-Issue)
 - [Select Issues for Contributing Using Labels](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Select-Issues-for-Contributing-Using-Labels)
--- a/client/less/main.less
+++ b/client/less/main.less
@ -54,21 +54,17 @@ html {
  border-color: @brand-primary;
 }

-body {
-  display: none;
-}
-
 body.full-screen-body-background {
  background-color: @body-bg;
 }

-
 body.top-and-bottom-margins {
  padding-top: 80px;
  margin-bottom: 60px;
 }

 body.no-top-and-bottom-margins {
+  display: none;
  margin: 75px 20px 0px 20px;
 }

--- a/client/less/map.less
+++ b/client/less/map.less
@ -321,7 +321,11 @@
    background-color: #333;
  }
  .map-aside {
-    border-left-color:#222; 
+    border-left-color:#222;
+    &-action-item {
+      filter: brightness(2) saturate(0);
+      -webkit-filter: brightness(2) saturate(0);
+    }
  }
  #map-filter, .input-group-addon {
    border-color: #222;
--- a/seed/challenges/01-front-end-development-certification/advanced-bonfires.json
+++ b/seed/challenges/01-front-end-development-certification/advanced-bonfires.json
@ -265,8 +265,9 @@
      "description": [
        "Convert a date range consisting of two dates formatted as <code>YYYY-MM-DD</code> into a more readable format.",
        "The friendly display should use month names instead of numbers and ordinal dates instead of cardinal (<code>1st</code> instead of <code>1</code>).",
-        "Do not display information that is redundant or that can be inferred by the user: if the date range ends in less than a year from when it begins, do not display the ending year. If the range ends in the same month that it begins, do not display the ending year or month.",
-        "Additionally, if the date range begins in the current year and ends within one year, the year should not be displayed at the beginning of the friendly range.",
+        "Do not display information that is redundant or that can be inferred by the user: if the date range ends in <em>less than a year</em> from when it begins, do not display the <em>ending year</em>.",
+        "Additionally, if the date range begins in the <em>current year</em> and ends within one year, the year should not be displayed at the <em>beginning</em> of the friendly range.",
+        "If the range ends in the <em>same month</em> that it begins, do not display the <em>ending year or month</em>.",
        "Examples:",
        "<code>makeFriendlyDates([\"2016-07-01\", \"2016-07-04\"])</code> should return <code>[\"July 1st\",\"4th\"]</code>",
        "<code>makeFriendlyDates([\"2016-07-01\", \"2018-07-04\"])</code> should return <code>[\"July 1st, 2016\", \"July 4th, 2018\"]</code>.",
--- a/seed/challenges/01-front-end-development-certification/basic-javascript.json
+++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json
@ -4734,7 +4734,7 @@
      "id": "5675e877dbd60be8ad28edc6",
      "title": "Iterate Through an Array with a For Loop",
      "description": [
-        "A common task in Javascript is to iterate through the contents of an array. One way to do that is with a <code>for</code> loop. This code will output each element of the array <code>arr</code> to the console:",
+        "A common task in JavaScript is to iterate through the contents of an array. One way to do that is with a <code>for</code> loop. This code will output each element of the array <code>arr</code> to the console:",
        "<blockquote>var arr = [10,9,8,7,6];<br>for (var i=0; i < arr.length; i++) {<br>   console.log(arr[i]);<br>}</blockquote>",
        "Remember that Arrays have zero-based numbering, which means the last index of the array is length - 1. Our <dfn>condition</dfn> for this loop is <code>i < arr.length</code>, which stops when <code>i</code> is at length - 1.",
        "<h4>Instructions</h4>",
--- a/seed/challenges/01-front-end-development-certification/basic-ziplines.json
+++ b/seed/challenges/01-front-end-development-certification/basic-ziplines.json
@ -180,6 +180,8 @@
        "<strong>Objective:</strong> Build a <a href='http://codepen.io' target='_blank'>CodePen.io</a> app that is functionally similar to this: <a href='http://codepen.io/hallaathrad/full/vNEPpL' target='_blank'>http://codepen.io/hallaathrad/full/vNEPpL</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='http://en.wikipedia.org/wiki/User_story' target='_blank'>user stories</a>. Use whichever libraries you need. Give it your own personal style.",
+        "<strong>Rule #3:</strong> You may use your own CSS and frameworks other than Bootstrap.",
+        "<strong>Rule #4:</strong> Choose your own tribute subject.",
        "<strong>User Story:</strong> I can access all of the portfolio webpage's content just by scrolling.",
        "<strong>User Story:</strong> I can click different buttons that will take me to the portfolio creator's different social media pages.",
        "<strong>User Story:</strong> I can see thumbnail images of different projects the portfolio creator has built (if you haven't built any websites before, use placeholders.)",
--- a/seed/challenges/01-front-end-development-certification/object-oriented-and-functional-programming.json
+++ b/seed/challenges/01-front-end-development-certification/object-oriented-and-functional-programming.json
@ -431,7 +431,7 @@
        "You can use the method <code>sort</code> to easily sort the values in an array alphabetically or numerically.",
        "Unlike the previous array methods we have been looking at, <code>sort</code> actually alters the array in place. However, it also returns this sorted array.",
        "<code>sort</code> can be passed a compare function as a callback. The compare function should return a negative number if <code>a</code> should be before <code>b</code>, a positive number if <code>a</code> should be after <code>b</code>, or <code>0</code> if they are equal.",
-        "If no compare function is passed in it will convert the values to strings and sort alphabetically.",
+        "If no compare (callback) function is passed in, it will convert the values to strings and sort alphabetically.",
        "Here is an example of using sort with a compare function that will sort the elements from smallest to largest number:",
        "<blockquote>var array = [1, 12, 21, 2];<br>array.sort(function(a, b) {<br>&nbsp;&nbsp;return a - b;<br>});</blockquote>",
        "Use <code>sort</code> to sort <code>array</code> from largest to smallest."
--- a/server/views/resources/how-nonprofit-projects-work.jade
+++ b/server/views/resources/how-nonprofit-projects-work.jade
@ -28,7 +28,7 @@ block content
        h3 Beginning the Project
        p We’ll set an initial meeting with representatives from Free Code Camp, the two campers, and the stakeholder. If the stakeholder and both campers show up promptly, and seem enthusiastic and professional, we’ll start the project. This lengthy process serves an important purpose: it reduces the likelihood that any of our campers or stakeholders will waste their precious time.
        h3 Nonprofit Stakeholders
-        p Each nonprofit project was submitted by a nonprofit. A representative from this nonprofit has agreed to serve as a "stakeholder" - an authorative person who understands the organization and its needs for this particular project.
+        p Each nonprofit project was submitted by a nonprofit. A representative from this nonprofit has agreed to serve as a "stakeholder" - an authoritative person who understands the organization and its needs for this particular project.
        p Stakeholders have a deep understanding of their organizations’ needs. Campers will work with them to figure out the best solutions to these needs.
        p When you and your pair partner first speak with your nonprofit stakeholder, you’ll:
        ol