Merge branch 'master' of https://github.com/freecodecamp/freecodecamp

package.json

@@ -11,7 +11,8 @@
   },
   "scripts": {
     "start": "node app.js",
-    "test": "mocha"
+    "test": "mocha",
+    "prepublish": "node seed_data/seed.js"
   },
   "dependencies": {
     "async": "^0.9.0",
@@ -32,12 +33,9 @@
     "express-flash": "^0.0.2",
     "express-session": "^1.9.2",
     "express-validator": "^2.8.0",
-    "fbgraph": "^0.3.0",
     "github-api": "^0.7.0",
     "helmet": "^0.5.3",
-    "instagram-node": "^0.5.1",
     "jade": "^1.8.0",
-    "lastfm": "^0.9.2",
     "less": "^1.7.5",
     "lodash": "^2.4.1",
     "lusca": "^1.0.2",
@@ -47,25 +45,18 @@
     "morgan": "^1.5.0",
     "newrelic": "^1.13.3",
     "node": "0.0.0",
-    "node-foursquare": "^0.2.1",
-    "node-linkedin": "^0.3.4",
     "node-rest-client": "^1.4.3",
     "nodemailer": "^1.3.0",
     "passport": "^0.2.1",
     "passport-facebook": "^1.0.3",
     "passport-github": "^0.1.5",
     "passport-google-oauth": "^0.1.5",
-    "passport-instagram": "^0.1.2",
     "passport-linkedin-oauth2": "^1.2.1",
     "passport-local": "^1.0.0",
     "passport-oauth": "^1.0.0",
     "passport-twitter": "^1.0.2",
     "request": "^2.49.0",
     "sitemap": "^0.7.4",
-    "stripe": "^3.0.2",
-    "tumblr.js": "^0.0.4",
-    "twilio": "^1.9.0",
-    "twit": "^1.1.18",
     "uglify-js": "^2.4.15",
     "validator": "^3.22.1",
     "yui": "^3.18.1"

public/browserconfig.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square70x70logo src="/mstile-70x70.png"/>
+      <square150x150logo src="/mstile-150x150.png"/>
+      <square310x310logo src="/mstile-310x310.png"/>
+      <wide310x150logo src="/mstile-310x150.png"/>
+      <TileColor>#492c14</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>

public/favicons.html

@@ -0,0 +1,17 @@
+<link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
+<link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
+<link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png">
+<link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114x114.png">
+<link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png">
+<link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144x144.png">
+<link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png">
+<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png">
+<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
+<link rel="icon" type="image/png" href="/android-chrome-192x192.png" sizes="192x192">
+<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96">
+<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
+<link rel="manifest" href="/android-chrome-manifest.json">
+<meta name="msapplication-TileColor" content="#492c14">
+<meta name="msapplication-TileImage" content="/mstile-144x144.png">
+<meta name="theme-color" content="#ffffff">

seed_data/bonfires.json

@@ -1,7 +1,7 @@
 [
   {
     "_id" : "ad7123c8c441eddfaeb5bdef",
-    "name": "Meet Bonfire",
+    "name": "Meet Bonfire!",
     "difficulty": "0",
     "description": [
       "Click the button below for further instructions.",

views/partials/meta.jade

@@ -4,24 +4,54 @@ meta(http-equiv='X-UA-Compatible', content='IE=edge')
 meta(name='viewport', content='width=device-width, initial-scale=1.0')
 meta(name='csrf-token', content=_csrf)
 meta(name='keywords', content='learn to code, learn how to code, code, coding,  software engineer, software developer, mean stack, pair programming, node.js, angular.js, express.js, mongoDB, coding bootcamp')
-meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.", property="og:title")
+meta(property="og:title", content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.")
-meta(content="FreeCodeCamp", property="og:site_name")
+meta(property="og:site_name", content="FreeCodeCamp")
 meta(name='twitter:widgets:csp', content='on')
 meta(name='p:domain_verify', content='d0bc047a482c03c24f1168004c2a216a')
-meta(content="http://www.freecodecamp.com", property="og:url")
+meta(property="og:url", content="http://www.freecodecamp.com")
-meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.", property="og:description")
+meta(property="og:description", content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.")
-meta(content="https://pbs.twimg.com/profile_images/522961310212833280/XE6vGAaO.jpeg", property="og:image")
+meta(property="og:image", content="https://pbs.twimg.com/profile_images/522961310212833280/XE6vGAaO.jpeg")
-meta(content="article", property="og:type")
+meta(property="og:type", content="article")
-meta(content="https://www.facebook.com/freecodecamp", property="article:publisher")
+meta(property="article:publisher", content="https://www.facebook.com/freecodecamp")
-meta(content="Responsive", property="article:section")
+meta(property="article:section", content="Responsive")
-link(href="https://plus.google.com/+Freecodecamp", rel="publisher")
+link(rel="publisher", href="https://plus.google.com/+Freecodecamp")
-link(href="https://plus.google.com/+Freecodecamp", rel="author")
+link(rel="author", href="https://plus.google.com/+Freecodecamp")
-meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.", name="description")
+meta(name="description", content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.")
-meta(content="@freecodecamp", name="twitter:creator")
+meta(name="twitter:creator", content="@freecodecamp")
-meta(content="http://www.freecodecamp.com", name="twitter:url")
+meta(name="twitter:url", content="http://www.freecodecamp.com")
-meta(content="@freecodecamp", name="twitter:site")
+meta(name="twitter:site", content="@freecodecamp")
-meta(content="summary_large_image", name="twitter:card")
+meta(name="twitter:card", content="summary_large_image")
-meta(content="https://s3.amazonaws.com/freecodecamp/challenges.png", name="twitter:image:src")
+meta(name="twitter:image:src", content="https://s3.amazonaws.com/freecodecamp/challenges.png")
-meta(content="Free Code Camp: a community of busy people learning to code", name="twitter:title")
+meta(name="twitter:title", content="Free Code Camp: a community of busy people learning to code")
-meta(content="We're a community of busy people learning to code by collaborating on projects for nonprofits. Learn Full-stack JavaScript, build a portfolio, and get great references with our online coding bootcamp.", name="twitter:description")
+meta(name="twitter:description", content="We're a community of busy people learning to code by collaborating on projects for nonprofits. Learn Full-stack JavaScript, build a portfolio, and get great references with our online coding bootcamp.")
-meta(content="a40ee5d5dba3bb091ad783ebd2b1383f", name="p:domain_verify")
+meta(content="a40ee5d5dba3bb091ad783ebd2b1383f", name="p:domain_verify")
+meta(name="msapplication-TileColor", content="#FFFFFF")
+meta(name="msapplication-TileImage", content="/")
+link(rel="android-chrome", sizes="144x144" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-144x144.png")
+link(rel="android-chrome", sizes="192x192" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-192x192.png")
+link(rel="android-chrome", sizes="36x36" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-36x36.png")
+link(rel="android-chrome", sizes="48x48" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-48x48.png")
+link(rel="android-chrome", sizes="72x72" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-72x72.png")
+link(rel="android-chrome", sizes="96x96" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-96x96.png")
+link(rel="android-chrome-manifest", href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-manifest.json")
+link(rel="apple-touch-icon", sizes="114x114", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-114x114.png")
+link(rel="apple-touch-icon", sizes="120x120", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-120x120.png")
+link(rel="apple-touch-icon", sizes="144x144", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-144x144.png")
+link(rel="apple-touch-icon", sizes="152x152", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-152x152.png")
+link(rel="apple-touch-icon", sizes="180x180", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png")
+link(rel="apple-touch-icon", sizes="57x57", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-57x57.png")
+link(rel="apple-touch-icon", sizes="60x60", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-60x60.png")
+link(rel="apple-touch-icon", sizes="72x72", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-72x72.png")
+link(rel="apple-touch-icon", sizes="76x76", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-76x76.png")
+link(rel="apple-touch-icon-precomposed", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-precomposed.png")
+link(rel="apple-touch-icon", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon.png")
+link(rel="favicon", sizes="16x16", href="https://s3.amazonaws.com/freecodecamp/favicons/favicon-16x16.png")
+link(rel="favicon", sizes="32x32", href="https://s3.amazonaws.com/freecodecamp/favicons/favicon-32x32.png")
+link(rel="favicon", sizes="96x96", href="https://s3.amazonaws.com/freecodecamp/favicons/favicon-96x96.png")
+link(rel="mstile", sizes="144x144", href="https://s3.amazonaws.com/freecodecamp/favicons/mstile-144x144.png")
+link(rel="mstile", sizes="150x150", href="https://s3.amazonaws.com/freecodecamp/favicons/mstile-150x150.png")
+link(rel="mstile", sizes="310x310", href="https://s3.amazonaws.com/freecodecamp/favicons/mstile-310x310.png")
+link(rel="mstile", sizes="310x150", href="https://s3.amazonaws.com/freecodecamp/favicons/mstile-310x150.png")
+link(rel="mstile", sizes="70x70", href="https://s3.amazonaws.com/freecodecamp/favicons/mstile-70x70.png")
+link(rel="favicon", href="https://s3.amazonaws.com/freecodecamp/favicons/favicon.ico")
+link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicons/favicon.ico')