1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/850ea902e067/
Changeset: 850ea902e067
User: martenson
Date: 2013-10-04 21:30:38
Summary: made activation email even better
Affected #: 3 files
diff -r 363b639c2b4816b566c38dde4dccd352a9e4f0ff -r 850ea902e067feed6dcb73a8cc188158ec7a167d lib/galaxy/config.py
--- a/lib/galaxy/config.py
+++ b/lib/galaxy/config.py
@@ -136,6 +136,8 @@
self.user_activation_on = string_as_bool( kwargs.get( 'user_activation_on', False ) )
self.activation_grace_period = kwargs.get( 'activation_grace_period', None )
self.inactivity_box_content = kwargs.get( 'inactivity_box_content', None )
+ self.terms_url = kwargs.get( 'terms_url', None )
+ self.instance_resource_url = kwargs.get( 'instance_resource_url', None )
self.registration_warning_message = kwargs.get( 'registration_warning_message', None )
# Get the disposable email domains blacklist file and its contents
self.blacklist_location = kwargs.get( 'blacklist_file', None )
diff -r 363b639c2b4816b566c38dde4dccd352a9e4f0ff -r 850ea902e067feed6dcb73a8cc188158ec7a167d lib/galaxy/webapps/galaxy/controllers/user.py
--- a/lib/galaxy/webapps/galaxy/controllers/user.py
+++ b/lib/galaxy/webapps/galaxy/controllers/user.py
@@ -752,12 +752,12 @@
body = ("Hello %s,\n\n"
"In order to complete the activation process for %s begun on %s at %s, please click on the following link to verify your account:\n\n"
"%s \n\n"
- "By clicking on the above link and opening a Galaxy account you are also confirming that you have read and agreed to Galaxy's Terms and Conditions for use of this service (https://main.g2.bx.psu.edu/static/terms.html). This includes a quota limit of one account per user. Attempts to subvert this limit by creating multiple accounts or through any other method may result in termination of all associated accounts and data.\n\n"
- "Please contact us if you need help with your account at: galaxy-bugs(a)bx.psu.edu\n"
- "More about Galaxy can be found on our wiki: galaxyproject.org\n\n"
- "Your Galaxy Team" % ( trans.user.username, email, datetime.utcnow().strftime( "%D" ), trans.request.host, activation_link ))
+ "By clicking on the above link and opening a Galaxy account you are also confirming that you have read and agreed to Galaxy's Terms and Conditions for use of this service (%s). This includes a quota limit of one account per user. Attempts to subvert this limit by creating multiple accounts or through any other method may result in termination of all associated accounts and data.\n\n"
+ "Please contact us if you need help with your account at: %s. You can also browse resources available at: %s. \n\n"
+ "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 = trans.app.config.admin_email
+ frm = "Galaxy Project <" + str (trans.app.config.activation_email) + ">"
subject = 'Galaxy Account Activation'
try:
util.send_mail( frm, to, subject, body, trans.app.config )
diff -r 363b639c2b4816b566c38dde4dccd352a9e4f0ff -r 850ea902e067feed6dcb73a8cc188158ec7a167d universe_wsgi.ini.sample
--- a/universe_wsgi.ini.sample
+++ b/universe_wsgi.ini.sample
@@ -275,6 +275,12 @@
# Activation email is used as a sender ('from' field) for the account activation mail.
#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/
+
# E-mail domains blacklist is used for filtering out users that are using disposable email address
# during the registration. If their address domain matches any domain in the BL they are refused the registration.
#blacklist_file = config/disposable_email_blacklist.conf
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/2dcd992a28f3/
Changeset: 2dcd992a28f3
User: martenson
Date: 2013-10-04 20:24:35
Summary: modified activation email body, now it should not end up in spam folders, hopefully
Affected #: 1 file
diff -r 6e063ca1960f9fd0539ad974f4e98520e31fc0a9 -r 2dcd992a28f36431bf5a76c5662896256b172175 lib/galaxy/webapps/galaxy/controllers/user.py
--- a/lib/galaxy/webapps/galaxy/controllers/user.py
+++ b/lib/galaxy/webapps/galaxy/controllers/user.py
@@ -749,13 +749,16 @@
"""
activation_link = self.prepare_activation_link( trans, email )
- body = ("Hi %s,\n\n"
- "Please click the activation link below in order to activate your account.\n\n"
- "Activation link: %s \n\n"
- "Your Galaxy Team" % ( email, activation_link ))
+ body = ("Hello %s,\n\n"
+ "In order to complete the activation process for %s begun on %s at %s, please click on the following link to verify your account:\n\n"
+ "%s \n\n"
+ "By clicking on the above link and opening a Galaxy account you are also confirming that you have read and agreed to Galaxy's Terms and Conditions for use of this service (https://main.g2.bx.psu.edu/static/terms.html). This includes a quota limit of one account per user. Attempts to subvert this limit by creating multiple accounts or through any other method may result in termination of all associated accounts and data.\n\n"
+ "Please contact us if you need help with your account at: galaxy-bugs(a)bx.psu.edu\n"
+ "More about Galaxy can be found on our wiki: galaxyproject.org\n\n"
+ "Your Galaxy Team" % ( trans.user.username, email, datetime.utcnow().strftime( "%D" ), trans.request.host, activation_link ))
to = email
- frm = trans.app.config.activation_email
- subject = 'How to activate your Galaxy account'
+ frm = trans.app.config.admin_email
+ subject = 'Galaxy Account Activation'
try:
util.send_mail( frm, to, subject, body, trans.app.config )
return True
@@ -767,9 +770,6 @@
Prepares the account activation link for the user.
"""
activation_token = self.get_activation_token( trans, email )
- host = trans.request.host.split( ':' )[ 0 ]
- if host == 'localhost':
- host = socket.getfqdn()
activation_link = str( trans.request.host ) + url_for( controller='user', action='activate' ) + "?activation_token=" + str( activation_token ) + "&email=" + urllib.quote( email )
return activation_link
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/6965d7da4ba5/
Changeset: 6965d7da4ba5
User: jgoecks
Date: 2013-10-04 17:50:44
Summary: Bug fixes and simplification for popup menu links.
Affected #: 1 file
diff -r 380fdaad0f938fda743593bf682de7f2fdb95a94 -r 6965d7da4ba5c84b19ade3ab89577d827edd5dc1 static/scripts/galaxy.base.js
--- a/static/scripts/galaxy.base.js
+++ b/static/scripts/galaxy.base.js
@@ -175,18 +175,14 @@
// if theres confirm text, send the dialog
if ( !confirmtext || confirm( confirmtext ) ) {
- var f;
- // Http request target is a window named demolocal on the local box
- if ( target === "demo" ) {
- if ( f === undefined || f.closed ) {
- f = window.open( href,target );
- f.creator = self;
- }
-
+ // link.click() doesn't use target for some reason,
+ // so manually do it here.
+ if (target) {
+ window.open(href, target);
}
// For all other links, do the default action.
else {
- link.trigger('click');
+ link.click();
}
}
}
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/1f0e7ae9e324/
Changeset: 1f0e7ae9e324
Branch: stable
User: dan
Date: 2013-09-29 08:04:31
Summary: Add additional check and slice to _sniffnfix_pg9_hex(). Fixes issue seen when attempting to view saved visualizations. Further investigation may be needed.
Affected #: 1 file
diff -r a477486bf18eafdd14dd7ba1e91e17f1b05e8121 -r 1f0e7ae9e324fcc1e12105651269016f2edb925f lib/galaxy/model/custom_types.py
--- a/lib/galaxy/model/custom_types.py
+++ b/lib/galaxy/model/custom_types.py
@@ -29,6 +29,8 @@
try:
if value[0] == 'x':
return binascii.unhexlify(value[1:])
+ elif value.startswith( '\\x' ):
+ return binascii.unhexlify( value[2:] )
else:
return value
except Exception, ex:
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.