6 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a2a8f96e7cb4/ Changeset: a2a8f96e7cb4 User: davebgx Date: 2015-01-28 16:49:48+00:00 Summary: Remove the alert popups from the repository and tool dependency installation status pages. Affected #: 2 files diff -r 01c1ca281fba5d2fc38f7fcaec30c7c358bcf268 -r a2a8f96e7cb49c4799d1ab9d86cc1e866d7e5cec templates/admin/tool_shed_repository/common.mako --- a/templates/admin/tool_shed_repository/common.mako +++ b/templates/admin/tool_shed_repository/common.mako @@ -259,9 +259,6 @@ }); tool_dependency_status_updater( dependency_status_list ); }, - error: function() { - alert( "tool_dependency_status_updater_callback failed..." ); - } }); }; </script> @@ -317,9 +314,6 @@ }); tool_shed_repository_status_updater( repository_status_list ); }, - error: function() { - alert( "tool_shed_repository_status_updater_callback failed..." ); - } }); }; </script> diff -r 01c1ca281fba5d2fc38f7fcaec30c7c358bcf268 -r a2a8f96e7cb49c4799d1ab9d86cc1e866d7e5cec templates/admin/tool_shed_repository/initiate_repository_installation.mako --- a/templates/admin/tool_shed_repository/initiate_repository_installation.mako +++ b/templates/admin/tool_shed_repository/initiate_repository_installation.mako @@ -23,9 +23,6 @@ success : function ( data ) { //alert( "Initializing repository installation succeeded" ); }, - error: function() { - alert( "Initializing repository installation failed" ); - }, }); }; </script> https://bitbucket.org/galaxy/galaxy-central/commits/43c52ed25263/ Changeset: 43c52ed25263 User: davebgx Date: 2015-01-28 16:50:31+00:00 Summary: Allow a Galaxy admin to configure environment variables (e.g. $PATH) for their local Galaxy installation without altering the environment for their shell. Affected #: 1 file diff -r a2a8f96e7cb49c4799d1ab9d86cc1e866d7e5cec -r 43c52ed25263e787f922c902590df41929edb0d8 run.sh --- a/run.sh +++ b/run.sh @@ -10,6 +10,18 @@ . .venv/bin/activate fi +# If there is a file that defines a shell environment specific to this +# instance of Galaxy, source the file. +if [ -z "$GALAXY_LOCAL_ENV_FILE" ]; +then + GALAXY_LOCAL_ENV_FILE='./config/local_env.sh' +fi + +if [ -f $GALAXY_LOCAL_ENV_FILE ]; +then + . $GALAXY_LOCAL_ENV_FILE +fi + python ./scripts/check_python.py [ $? -ne 0 ] && exit 1 https://bitbucket.org/galaxy/galaxy-central/commits/725252d2e51f/ Changeset: 725252d2e51f Branch: trevorw/add-template_cache_path-to-reports_wsgii-1422042129382 User: davebgx Date: 2015-01-28 16:53:07+00:00 Summary: Close merged branch trevorw/add-template_cache_path-to-reports_wsgii-1422042129382 Affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/commits/f24d1447157e/ Changeset: f24d1447157e Branch: compressed_upload User: davebgx Date: 2015-01-28 16:53:35+00:00 Summary: Close merged branch compressed_upload Affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/commits/751a0bbe3363/ Changeset: 751a0bbe3363 Branch: snpeff_datatype User: davebgx Date: 2015-01-28 16:53:51+00:00 Summary: Close merged branch snpeff_datatype Affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/commits/0ead515a64b2/ Changeset: 0ead515a64b2 Branch: toolshed_blacklist_additions User: davebgx Date: 2015-01-28 16:54:03+00:00 Summary: Close merged branch toolshed_blacklist_additions Affected #: 0 files 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.