Merge branch 'master' into master-redesign

services/web/app.coffee

@@ -19,7 +19,7 @@ Server.app.use (error, req, res, next) ->
 	logger.error err: error, url:req.url, method:req.method, user:req?.sesson?.user, "error passed to top level next middlewear"
 	res.statusCode = error.status or 500
 	if res.statusCode == 500
-		res.end("Oops, something went wrong with your request, sorry. If this continues, please contact us at team@sharelatex.com")
+		res.end("Oops, something went wrong with your request, sorry. If this continues, please contact us at support@sharelatex.com")
 	else
 		res.end()
 

services/web/app/coffee/Features/Email/EmailSender.coffee

@@ -35,6 +35,7 @@ module.exports =
 			subject: options.subject
 			html: options.html
 			replyTo: options.replyTo || Settings.email.replyToAddress
+			socketTimeout: 30 * 1000
 		client.sendMail options, (err, res)->
 			if err?
 				logger.err err:err, "error sending message"

services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee

@@ -33,4 +33,5 @@ buildOptions = (user, is_subscribed)->
 			subscriber_list_id: Settings.markdownmail.list_id
 			is_subscribed: is_subscribed
 		url: "https://www.markdownmail.io/lists/subscribe"
+		timeout: 30 * 1000
 	return options

services/web/app/views/general/closed.jade

@@ -10,4 +10,4 @@ block content
 					| Sorry, ShareLaTeX is briefly down for maintenance.
 					| We should be back within minutes, but if not, or you have
 					| an urgent request, please contact us at
-					| team@sharelatex.com
+					| support@sharelatex.com

services/web/app/views/restore.jade

@@ -15,7 +15,7 @@ block content
 							.well
 								p If any of your projects are missing, or are not showing the most recent updates, you
 									| can recover from our latest back ups here. If you have any problems, please get in 
-									| touch (team@sharelatex.com).
+									| touch (support@sharelatex.com).
 
 					.row-fluid
 						table.table

services/web/app/views/subscriptions/successful_subscription.jade

@@ -20,7 +20,7 @@ block content
 					p Thank you for subscribing to the #{subscription.name} plan. It's support from people like yourself that allows ShareLaTeX to continue to grow and improve.
 
 					p If there is anything you ever need please feel free to contact us directly at 
-						a(href='mailto:team@sharelatex.com') team@sharelatex.com 
+						a(href='mailto:support@sharelatex.com') support@sharelatex.com
 						| - it goes straight to both our inboxes.
 					p Regards,
 						br