github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into master-redesign

Browse source
This commit is contained in:
James Allen 2014-06-18 15:26:09 +01:00
commit b837a4e9f3
6 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app.coffee
View file

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

1
services/web/app/coffee/Features/Email/EmailSender.coffee
View file

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

1
services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee
View file

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

2
services/web/app/views/general/closed.jade
View file

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

2
services/web/app/views/restore.jade
View file

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

2
services/web/app/views/subscriptions/successful_subscription.jade
View file

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