1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/e8dcf9b9fa29/ Changeset: e8dcf9b9fa29 User: martenson Date: 2013-10-04 21:40:15 Summary: final tweaks to activation emails Affected #: 2 files diff -r 850ea902e067feed6dcb73a8cc188158ec7a167d -r e8dcf9b9fa2914623435997c567b415b1ad416f1 lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -757,7 +757,7 @@ "More about the Galaxy Project can be found at galaxyproject.org\n\n" "Your Galaxy Team" % ( trans.user.username, email, datetime.utcnow().strftime( "%D" ), trans.request.host, activation_link,trans.app.config.terms_url, trans.app.config.error_email_to, trans.app.config.instance_resource_url )) to = email - frm = "Galaxy Project <" + str (trans.app.config.activation_email) + ">" + frm = trans.app.config.activation_email subject = 'Galaxy Account Activation' try: util.send_mail( frm, to, subject, body, trans.app.config ) diff -r 850ea902e067feed6dcb73a8cc188158ec7a167d -r e8dcf9b9fa2914623435997c567b415b1ad416f1 universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -273,11 +273,9 @@ #error_email_to = None # Activation email is used as a sender ('from' field) for the account activation mail. +# We recommend using string in the following format: Galaxy Project <galaxy-no-reply@example.com> #activation_email = None -# URL of the terms and conditions of the service. Used in activation emails. -#terms_url = https://main.g2.bx.psu.edu/static/terms.html - # URL of the support resource for the galaxy instance. Used in activation emails. #instance_resource_url = http://wiki.galaxyproject.org/ @@ -379,7 +377,7 @@ #citation_url = http://wiki.g2.bx.psu.edu/Citing%20Galaxy # The URL linked by the "Terms and Conditions" link in the "Help" menu, as well -# as on the user registration and login forms. +# as on the user registration and login forms and in the activation emails. #terms_url = None # The URL linked by the "Galaxy Q&A" link in the "Help" menu Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.