Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b55635f71b7fd3bba8393a3c267408d6dd248f99 https://github.com/galaxyproject/galaxy/commit/b55635f71b7fd3bba8393a3c26740... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-06 (Sun, 06 Dec 2015) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/tool-panel.js M lib/galaxy/managers/configuration.py M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Client, upload: fix passing of nginx_upload_path and ftp_upload_site to upload-view, fix default nginx_upload_path in configuration serializer Commit: beb4a67fb0a4b879b732fd05b35d03019481ea90 https://github.com/galaxyproject/galaxy/commit/beb4a67fb0a4b879b732fd05b35d0... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-12-06 (Sun, 06 Dec 2015) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/tool-panel.js M lib/galaxy/managers/configuration.py M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Merge pull request #1250 from carlfeberhard/fix.upload Client, upload: fix passing of nginx_upload_path and ftp_upload_site … Compare: https://github.com/galaxyproject/galaxy/compare/91d348a73fd4...beb4a67fb0a4