gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into mobile-news

Browse Source 
Conflicts:
	controllers/story.js
	seed_data/field-guides.json
	views/coursewares/showVideo.jade
This commit is contained in:
Quincy Larson
2015-04-30 19:10:10 -07:00
parent d6da385b92 c71514cc81
commit fb3a116fff
3 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
controllers/story.js
View File

@ -517,35 +517,33 @@ exports.storySubmission = function(req, res, next) {
if (err) {
return next(err);
}
if (recipient && recipient.email) {
// If the emails of both authors differ, only then proceed with email notification
if (data.author.email && (data.author.email !== recipient.email)) {
var transporter = nodemailer.createTransport({
service: 'Mandrill',
auth: {
user: secrets.mandrill.user,
pass: secrets.mandrill.password
}
});
// If the emails of both authors differ, only then proceed with email notification
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: {
user: secrets.mandrill.user,
pass: secrets.mandrill.password
}
});
var mailOptions = {
to: recipient.email,
from: 'Team@freecodecamp.com',
subject: data.author.username + ' replied to your post on Camper News',
text: [
'Just a quick heads-up: ' + data.author.username + ' replied to you on Camper News.',
'You can keep this conversation going.',
'Just head back to the discussion here: http://freecodecamp.com/news/' + data.originalStoryLink,
'- the Free Code Camp Volunteer Team'
].join('\n')
};
var mailOptions = {
to: recipient.email,
from: 'Team@freecodecamp.com',
subject: data.author.username + ' replied to your post on Camper News',
text: [
'Just a quick heads-up: ' + data.author.username + ' replied to you on Camper News.',
'You can keep this conversation going.',
'Just head back to the discussion here: http://freecodecamp.com/stories/' + data.originalStoryLink,
'- the Free Code Camp Volunteer Team'
].join('\n')
};
transporter.sendMail(mailOptions, function (err) {
if (err) {
return err;
}
});
}
transporter.sendMail(mailOptions, function (err) {
if (err) {
return err;
}
});
}
});
});

2
views/coursewares/showVideo.jade
View File

@ -68,7 +68,7 @@ block content
- if (user.progressTimestamps.length > 2)
.button-spacer
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%20Challenge:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript" target="_blank")
i.fa.fa-twitter  
= phrase
- else

2
views/resources/pmi-acp-agile-project-managers.jade
View File

@ -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