From cef70a67a947a81f8f7ddb1ccc26b72b975d1df5 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Mon, 27 Apr 2015 19:39:58 -0400
Subject: [PATCH 1/5] Fix broken url

---
 views/resources/pmi-acp-agile-project-managers.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/resources/pmi-acp-agile-project-managers.jade b/views/resources/pmi-acp-agile-project-managers.jade
index a812d59d3e..a869adcc43 100644
--- a/views/resources/pmi-acp-agile-project-managers.jade
+++ b/views/resources/pmi-acp-agile-project-managers.jade
@@ -52,4 +52,4 @@ block content
                             .landing-skill-icon.ion-settings
                             h2.black-text ...and other tools
             .big-break
-            a.btn.btn-cta.signup-btn.btn-block(href="/pmi-acp-agile-project-manager-form") I want to lead agile projects for nonprofits
+            a.btn.btn-cta.signup-btn.btn-block(href="/pmi-acp-agile-project-managers-form") I want to lead agile projects for nonprofits

From a8e215c74ec8e3152a3aaf34b31ecb5c417222a4 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Mon, 27 Apr 2015 20:03:37 -0400
Subject: [PATCH 2/5] Check everything for undefined in email reply logic for
 story.js

---
 controllers/story.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/story.js b/controllers/story.js
index 1f1bf90247..0e7af182f6 100755
--- a/controllers/story.js
+++ b/controllers/story.js
@@ -518,7 +518,7 @@ exports.storySubmission = function(req, res, next) {
               return next(err);
             }
             // If the emails of both authors differ, only then proceed with email notification
-            if (data.author.email && (data.author.email !== recipient.email)) {
+            if (typeof data.author !== 'undefined' && data.author.email && typeof recipient !== 'undefined' && recipient.email && (data.author.email !== recipient.email)) {
               var transporter = nodemailer.createTransport({
                 service: 'Mandrill',
                 auth: {

From 2487f0421b39a2bd84ec10dcb4e67b81454dce3d Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 28 Apr 2015 19:35:12 -0400
Subject: [PATCH 3/5] Fix tweeting in challenges

---
 views/coursewares/showVideo.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/coursewares/showVideo.jade b/views/coursewares/showVideo.jade
index 83b3ab759f..8624e40ae7 100644
--- a/views/coursewares/showVideo.jade
+++ b/views/coursewares/showVideo.jade
@@ -67,7 +67,7 @@ block content
                               $('#complete-courseware-dialog').bind('keypress', modalControlEnterHandler);
 
                             - if (user.progressTimestamps.length > 2)
-                                a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Bonfire:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/bonfires/#{dashedName}&hashtags=LearnToCode, JavaScript" target="_blank")
+                                a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Bonfire:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript" target="_blank")
                                     i.fa.fa-twitter &thinsp;
                                     = phrase
                         - else

From 9e8a618491a4dd6fb792ecad703fb208649ad8db Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 28 Apr 2015 20:40:02 -0400
Subject: [PATCH 4/5] Twitter fixes.

---
 views/coursewares/showVideo.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/coursewares/showVideo.jade b/views/coursewares/showVideo.jade
index 8624e40ae7..8b496d6c17 100644
--- a/views/coursewares/showVideo.jade
+++ b/views/coursewares/showVideo.jade
@@ -67,7 +67,7 @@ block content
                               $('#complete-courseware-dialog').bind('keypress', modalControlEnterHandler);
 
                             - if (user.progressTimestamps.length > 2)
-                                a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Bonfire:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript" target="_blank")
+                                a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Challenge:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript" target="_blank")
                                     i.fa.fa-twitter &thinsp;
                                     = phrase
                         - else

From ddb93897bc04ddacea2104718cd2b71d95e00d4f Mon Sep 17 00:00:00 2001
From: Alex Dixon <email@alexdixon.io>
Date: Wed, 29 Apr 2015 07:16:17 -0700
Subject: [PATCH 5/5] Revert Mac keyboard shortcuts

---
 seed_data/field-guides.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json
index e8ee3ba70e..87af2174af 100644
--- a/seed_data/field-guides.json
+++ b/seed_data/field-guides.json
@@ -260,7 +260,7 @@
   },
   {
     "_id": "bd7159d9c442eddfaeb5bdef",
-    "name": "What does Register mean?",
+    "name": "Global Mac Keyboard Shortcuts",
     "description": [
       "<div class=\"col-xs-12 col-sm-10 col-sm-offset-1\">",
       "<h2 class='text-center'></h2>",