1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/1b2fdf69104d/
Changeset: 1b2fdf69104d
User: davebgx
Date: 2014-06-16 16:52:03
Summary: Fix server error when getting updates to an installed repository.
Affected #: 1 file
diff -r 5a12c832b682c9c906a8e52d17a746d3f45177ee -r 1b2fdf69104d821fa3a52e04321d5795d6f4c6d0 lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
--- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -1972,7 +1972,7 @@
# we set from_tip to True to make sure we get the entire set of changeset revisions
# from the Tool Shed.
new_repository_db_record, installed_changeset_revision = \
- suc.repository_was_previously_installed( trans,
+ suc.repository_was_previously_installed( trans.app,
tool_shed_url,
new_name,
repo_info_tuple,
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/5a12c832b682/
Changeset: 5a12c832b682
User: guerler
Date: 2014-06-16 15:51:01
Summary: Charts: Fix legend hiding for heatmaps
Affected #: 1 file
diff -r d3a0b4b9da32927b5aab806f1a991594285475f7 -r 5a12c832b682c9c906a8e52d17a746d3f45177ee config/plugins/visualizations/charts/static/charts/others/heatmap/heatmap-plugin.js
--- a/config/plugins/visualizations/charts/static/charts/others/heatmap/heatmap-plugin.js
+++ b/config/plugins/visualizations/charts/static/charts/others/heatmap/heatmap-plugin.js
@@ -139,7 +139,11 @@
this._buildBoxes();
this._buildX();
this._buildY();
- this._buildLegend();
+
+ // show legend only if requested
+ if (this.chart.settings.get('show_legend') == 'true') {
+ this._buildLegend();
+ }
},
// y axis
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/d3a0b4b9da32/
Changeset: d3a0b4b9da32
User: jmchilton
Date: 2014-06-16 05:36:50
Summary: Finish thought started with 97b2942.
That commit did at least fix this documentation, with this commit I have actually verified the underlying problem is also fixed.
Affected #: 1 file
diff -r 97b2942c978887922705b9f8bb26ccdea6f707b4 -r d3a0b4b9da32927b5aab806f1a991594285475f7 lib/galaxy/jobs/runners/lwr.py
--- a/lib/galaxy/jobs/runners/lwr.py
+++ b/lib/galaxy/jobs/runners/lwr.py
@@ -108,7 +108,7 @@
self._init_worker_threads()
galaxy_url = self.runner_params.galaxy_url
if galaxy_url:
- galaxy_url.rstrip("/")
+ galaxy_url = galaxy_url.rstrip("/")
self.galaxy_url = galaxy_url
self.__init_client_manager()
if self.runner_params.url:
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/97b2942c9788/
Changeset: 97b2942c9788
User: jmchilton
Date: 2014-06-16 05:29:05
Summary: LWR bugfix - cannot have trailing / for galaxy_url runner arg.
Affected #: 2 files
diff -r e15e1c346f76f6cf034b51c82befb9abb4ed26cb -r 97b2942c978887922705b9f8bb26ccdea6f707b4 job_conf.xml.sample_advanced
--- a/job_conf.xml.sample_advanced
+++ b/job_conf.xml.sample_advanced
@@ -37,7 +37,7 @@
<!-- If using message queue driven LWR - the LWR will generally
initiate file transfers so a the URL of this Galaxy instance
must be configured. -->
- <param id="galaxy_url">http://localhost:8080/</param>
+ <param id="galaxy_url">http://localhost:8080</param><!-- If multiple managers configured on the LWR, specify which one
this plugin targets. --><!-- <param id="manager">_default_</param> -->
diff -r e15e1c346f76f6cf034b51c82befb9abb4ed26cb -r 97b2942c978887922705b9f8bb26ccdea6f707b4 lib/galaxy/jobs/runners/lwr.py
--- a/lib/galaxy/jobs/runners/lwr.py
+++ b/lib/galaxy/jobs/runners/lwr.py
@@ -106,7 +106,10 @@
"""Start the job runner """
super( LwrJobRunner, self ).__init__( app, nworkers, runner_param_specs=LWR_PARAM_SPECS, **kwds )
self._init_worker_threads()
- self.galaxy_url = self.runner_params.galaxy_url
+ galaxy_url = self.runner_params.galaxy_url
+ if galaxy_url:
+ galaxy_url.rstrip("/")
+ self.galaxy_url = galaxy_url
self.__init_client_manager()
if self.runner_params.url:
# This is a message queue driven runner, don't monitor
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/64e19b416852/
Changeset: 64e19b416852
User: guerler
Date: 2014-06-15 14:41:25
Summary: Charts: Add canvg js library
Affected #: 2 files
This diff is so big that we needed to truncate the remainder.
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/a61d3350e230/
Changeset: a61d3350e230
User: guerler
Date: 2014-06-15 04:51:26
Summary: Charts: Fix boxplot tick format
Affected #: 1 file
diff -r c6cae92f69641533a0f812191c753f08721d6089 -r a61d3350e230462eddedbba0586b0d0dc6afe433 config/plugins/visualizations/charts/static/charts/jqplot/common/wrapper.js
--- a/config/plugins/visualizations/charts/static/charts/jqplot/common/wrapper.js
+++ b/config/plugins/visualizations/charts/static/charts/jqplot/common/wrapper.js
@@ -127,7 +127,7 @@
// make axes
function makeAxis (id) {
- Tools.makeAxis({
+ Tools.makeTickFormat({
categories : categories.array[id],
type : settings.get(id + '_axis_type'),
precision : settings.get(id + '_axis_precision'),
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.