1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/836b6a16e5a9/
Changeset: 836b6a16e5a9
User: greg
Date: 2013-10-04 16:13:44
Summary: Add an additional filter to correct improper image declarations so they will be displayed in tool config help sections or reqdme files contained in tool shed repositories.
Affected #: 1 file
diff -r 1bb04279216e0abf4e24b9299cccc06c10b9c0ac -r 836b6a16e5a9e499c0a07b23b69c25a3f17eba98 lib/tool_shed/util/shed_util_common.py
--- a/lib/tool_shed/util/shed_util_common.py
+++ b/lib/tool_shed/util/shed_util_common.py
@@ -1519,7 +1519,9 @@
route_to_images = '/repository/static/images/%s' % encoded_repository_id
# We used to require $PATH_TO_IMAGES, but we now eliminate it if it's used.
text = text.replace( '$PATH_TO_IMAGES', '' )
- # We can eliminate the default setting of /static/images since the routs will properly display images contained in that directory.
+ # Eliminate the invalid setting of ./static/images since the routes will properly display images contained in that directory.
+ text = text.replace( './static/images', '' )
+ # Eliminate the default setting of /static/images since the routes will properly display images contained in that directory.
text = text.replace( '/static/images', '' )
# Use regex to instantiate routes into the defined image paths.
for match in re.findall( '.. image:: (?!http)/?(.+)', text ):
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/84781f00ff8e/
Changeset: 84781f00ff8e
User: guerler
Date: 2013-10-03 19:21:59
Summary: Trackster: Fix cell content if metadata is inconsistent
Affected #: 1 file
diff -r a1c04a1b716a2c83f821b08f5ca18ace27fcfe21 -r 84781f00ff8e57848397177511b77a400055b59f static/scripts/mvc/data.js
--- a/static/scripts/mvc/data.js
+++ b/static/scripts/mvc/data.js
@@ -183,7 +183,7 @@
var column_types = this.model.get_metadata('column_types');
if (colspan !== undefined) {
$cell.attr('colspan', colspan).addClass('stringalign');
- } else if (index < column_types.length) {
+ } else if (column_types !== undefined && index < column_types.length) {
if (column_types[index] === 'str' || column_types === 'list') {
/* Left align all str columns, right align the rest */
$cell.addClass('stringalign');
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/e55c7a4a88e0/
Changeset: e55c7a4a88e0
User: dannon
Date: 2013-10-03 18:18:50
Summary: Update universe sample with new inactivity box content default text
Affected #: 1 file
diff -r 2fed7f7b23fd5dbc3f25a8f783b55a4f81e014cd -r e55c7a4a88e076f163949381937d38d11e48c74a universe_wsgi.ini.sample
--- a/universe_wsgi.ini.sample
+++ b/universe_wsgi.ini.sample
@@ -299,7 +299,7 @@
# Used for warning box for inactive accounts (unable to run jobs).
# In use only if activation_grace_period is set.
-#inactivity_box_content = Your account has not been activated yet. Please activate your account by verifying your email address. For now you can access everything at Galaxy but your jobs won't run.
+#inactivity_box_content = Your account has not been activated yet. Feel free to browse around and see what's available, but you won't be able to upload data or run jobs until you have verified your email address.
# -- Display sites
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/b714089d888c/
Changeset: b714089d888c
User: martenson
Date: 2013-10-03 17:18:59
Summary: activation feature tweaks
Affected #: 2 files
diff -r becb2b5d2d0690fa5217a8101c6d0b5f8c6dc99d -r b714089d888cad2942ba3edcd968532f07b56143 lib/galaxy/config.py
--- a/lib/galaxy/config.py
+++ b/lib/galaxy/config.py
@@ -133,7 +133,7 @@
self.mailing_join_addr = kwargs.get('mailing_join_addr',"galaxy-announce-join(a)bx.psu.edu")
self.error_email_to = kwargs.get( 'error_email_to', None )
self.activation_email = kwargs.get( 'activation_email', None )
- self.user_activation_on = kwargs.get( 'user_activation_on', None )
+ 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.registration_warning_message = kwargs.get( 'registration_warning_message', None )
diff -r becb2b5d2d0690fa5217a8101c6d0b5f8c6dc99d -r b714089d888cad2942ba3edcd968532f07b56143 lib/galaxy/webapps/galaxy/controllers/user.py
--- a/lib/galaxy/webapps/galaxy/controllers/user.py
+++ b/lib/galaxy/webapps/galaxy/controllers/user.py
@@ -670,8 +670,10 @@
user = trans.app.model.User( email=email )
user.set_password_cleartext( password )
user.username = username
- if trans.app.config.user_activation_on: # Do not set the active flag in case activation is OFF.
+ if trans.app.config.user_activation_on:
user.active = False
+ else:
+ user.active = True # Activation is off, every new user is active by default.
trans.sa_session.add( user )
trans.sa_session.flush()
trans.app.security_agent.create_private_user_role( user )
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/becb2b5d2d06/
Changeset: becb2b5d2d06
User: Dave Bouvier
Date: 2013-10-03 16:45:39
Summary: Remove reference to removed select field in the repository write permission form.
Affected #: 1 file
diff -r 54673424aa68129d1bae517db268d571feb73fae -r becb2b5d2d0690fa5217a8101c6d0b5f8c6dc99d test/tool_shed/base/twilltestcase.py
--- a/test/tool_shed/base/twilltestcase.py
+++ b/test/tool_shed/base/twilltestcase.py
@@ -723,7 +723,6 @@
post_submit_strings_not_displayed=[] ):
self.display_manage_repository_page( repository )
self.check_for_strings( strings_displayed, strings_not_displayed )
- tc.fv( "user_access", "allow_push", '-Select one' )
for username in usernames:
tc.fv( "user_access", "allow_push", '+%s' % username )
tc.submit( 'user_access_button' )
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.