Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 8cd94be52d5030634e843a89d7025ecb6f18394b https://github.com/galaxyproject/galaxy/commit/8cd94be52d5030634e843a89d7025... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-08-24 (Mon, 24 Aug 2015) Changed paths: M lib/tool_shed/dependencies/attribute_handlers.py M lib/tool_shed/dependencies/tool/tag_attribute_handler.py Log Message: ----------- When uploading tool_dependencies.xml to toolshed, do set toolshed repository attributes of package/repository tags that occur within actions that specify os or architecture. Commit: b01d20b1be9e1cf579a3c2bd42a3d524548d2240 https://github.com/galaxyproject/galaxy/commit/b01d20b1be9e1cf579a3c2bd42a3d... Author: Dave B <dave@bx.psu.edu> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M lib/tool_shed/metadata/metadata_generator.py Log Message: ----------- Fix for server error when installing some repos. Examples: IUC's gatk2 repository, devteam's samtools_rmdup. When attempting to install either of those, or another repository that has tool tests with an input parameter that does not have a value attribute, the repository would be stuck in state 'Cloning' and show a debug link in the log. This commit resolves that error. Commit: 19c85e070534f4318cca3e728c52c91a27163f4a https://github.com/galaxyproject/galaxy/commit/19c85e070534f4318cca3e728c52c... Author: Jeremy Goecks <jgoecks@gwu.edu> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/tools.js M client/galaxy/scripts/viz/sweepster.js M static/maps/mvc/tools.js.map M static/maps/viz/sweepster.js.map M static/scripts/mvc/tools.js M static/scripts/viz/sweepster.js Log Message: ----------- Fixes to make Sweepster work again: (a) update template syntax to match changes made in underscore v1.7 and (b) update tool rerun to account for API changes. Commit: 04a5bd78f021968ccd1b98eec2968ecdc3c93f77 https://github.com/galaxyproject/galaxy/commit/04a5bd78f021968ccd1b98eec2968... Author: nitesh1989 <nitesh.turaga@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- Fix: rdata extension type Commit: a1cc1ed94bba19bcc131f41d6cfc80fe1ca03009 https://github.com/galaxyproject/galaxy/commit/a1cc1ed94bba19bcc131f41d6cfc8... Author: nitesh1989 <nitesh.turaga@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/binary.py Log Message: ----------- Fix: Typo the other way. Supposed to be "RData" Ref: https://stat.ethz.ch/R-manual/R-devel/library/base/html/save.html Commit: ac43237e49e8660b1812f8662d081d4b0d3bf3de https://github.com/galaxyproject/galaxy/commit/ac43237e49e8660b1812f8662d081... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M lib/tool_shed/util/web_util.py Log Message: ----------- Fix for toolshed escape method, where an error/log message contains non-ASCII characters. Commit: d2e61e8af4c933b733c640f46f831bf424bc0197 https://github.com/galaxyproject/galaxy/commit/d2e61e8af4c933b733c640f46f831... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-library.js M static/maps/mvc/ui/ui-select-library.js.map M static/scripts/mvc/ui/ui-select-library.js Log Message: ----------- Filter deleted library datasets Commit: 8d96580fc20e2a6322fdacb1b25635fb4573c934 https://github.com/galaxyproject/galaxy/commit/8d96580fc20e2a6322fdacb1b2563... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/workflows.py Log Message: ----------- Correct examples in workflow invocations. Commit: 51991f03caf3b1ed15d4672160cf0f50e6e537db https://github.com/galaxyproject/galaxy/commit/51991f03caf3b1ed15d4672160cf0... Author: Dave B <dave@bx.psu.edu> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: R templates/webapps/tool_shed/message.mako Log Message: ----------- Stop creating database/message.mako.py Commit: 64edf4e2f953f21e4e52c6647a65960c6c44945a https://github.com/galaxyproject/galaxy/commit/64edf4e2f953f21e4e52c6647a659... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M templates/webapps/reports/base_panels.mako Log Message: ----------- fix the class for reports brand so it is actually shown and not black text on dark background Commit: 041c94bf788bea0990401dab14e0ab717cec0c55 https://github.com/galaxyproject/galaxy/commit/041c94bf788bea0990401dab14e0a... Author: John Chilton <jmchilton@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: A doc/source/releases/15.07.rst M doc/source/releases/15.07_announce.rst A doc/source/releases/15.10_announce.rst M doc/source/releases/index.rst M scripts/bootstrap_history.py Log Message: ----------- Release notes for 15.07. This includes a script to boot strap the notes for future releases, updated announcement page for 15.07, and new announcement page for 15.10. Commit: 4a05c07aa5cc8e386742bb638a6c44e839efc9bd https://github.com/galaxyproject/galaxy/commit/4a05c07aa5cc8e386742bb638a6c4... Author: John Chilton <jmchilton@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M doc/source/releases/15.07.rst M doc/source/releases/15.07_announce.rst A scripts/bootstrap_history_announce_template.rst Log Message: ----------- Fixup end of release items for release notes. Commit: 65f39b2eaf6b0c94b1044a92351c2b5799ca021a https://github.com/galaxyproject/galaxy/commit/65f39b2eaf6b0c94b1044a92351c2... Author: John Chilton <jmchilton@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M doc/source/releases/15.07_announce.rst Log Message: ----------- Typo noticed by @martenson. Commit: 4fcdf9fda1d21ec5669daa8e9a4e3e84171bb617 https://github.com/galaxyproject/galaxy/commit/4fcdf9fda1d21ec5669daa8e9a4e3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/tools.js M client/galaxy/scripts/mvc/ui/ui-select-library.js M client/galaxy/scripts/viz/sweepster.js M lib/galaxy/datatypes/binary.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/util/web_util.py M static/maps/mvc/tools.js.map M static/maps/mvc/ui/ui-select-library.js.map M static/maps/viz/sweepster.js.map M static/scripts/mvc/tools.js M static/scripts/mvc/ui/ui-select-library.js M static/scripts/viz/sweepster.js M templates/webapps/reports/base_panels.mako R templates/webapps/tool_shed/message.mako Log Message: ----------- Merge pull request #657 from jmchilton/dev_1507_backports [15.07] Backport various dev fixes. Commit: a460ebd7d6b6132fe00238e834dcff0efb449ad8 https://github.com/galaxyproject/galaxy/commit/a460ebd7d6b6132fe00238e834dcf... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M doc/source/releases/15.07.rst Log Message: ----------- Fix for explicit markup ending without a blank line Commit: 51534edc63bb7758d4fb4a7aaec13df7a1e5e8eb https://github.com/galaxyproject/galaxy/commit/51534edc63bb7758d4fb4a7aaec13... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M doc/source/releases/15.07_announce.rst Log Message: ----------- Deprecation notice for cloudlaunch Commit: 96840a3c57354690b9287e49dd2ef3400932b52e https://github.com/galaxyproject/galaxy/commit/96840a3c57354690b9287e49dd2ef... Author: John Chilton <jmchilton@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M doc/source/releases/15.07.rst M doc/source/releases/15.07_announce.rst Log Message: ----------- Merge pull request #9 from dannon/rn Deprecation notice for cloudlaunch. Commit: 82794e7ee7a8a6793438bf2021079515445bb873 https://github.com/galaxyproject/galaxy/commit/82794e7ee7a8a6793438bf2021079... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M doc/source/releases/15.07_announce.rst Log Message: ----------- Fix cloudlaunch link. Commit: 36d262d7c695ba06c32f5c495a0a3ceb62d57731 https://github.com/galaxyproject/galaxy/commit/36d262d7c695ba06c32f5c495a0a3... Author: John Chilton <jmchilton@gmail.com> Date: 2015-08-27 (Thu, 27 Aug 2015) Changed paths: M doc/source/releases/15.07_announce.rst Log Message: ----------- Merge pull request #10 from dannon/rn Fix cloudlaunch link. Commit: 525188d2a871fbb9b5e7438b18bb5412f62db975 https://github.com/galaxyproject/galaxy/commit/525188d2a871fbb9b5e7438b18bb5... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-08-28 (Fri, 28 Aug 2015) Changed paths: M lib/tool_shed/dependencies/attribute_handlers.py M lib/tool_shed/dependencies/tool/tag_attribute_handler.py Log Message: ----------- Merge pull request #637 from blankenberg/recurse-toolshed-changeset-upload [release_15.07] Fix setting of toolshed repository attributes in special cases. Commit: 4dd6304f055706e38176823a4166c6536618a042 https://github.com/galaxyproject/galaxy/commit/4dd6304f055706e38176823a4166c... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-31 (Mon, 31 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/tools/tools-form.js M static/maps/mvc/tools/tools-form.js.map M static/scripts/mvc/tools/tools-form.js Log Message: ----------- Fix version parsing in tool form Commit: 3653bf5e37b13ea17cecd321fdbe9ce4fedcfbb8 https://github.com/galaxyproject/galaxy/commit/3653bf5e37b13ea17cecd321fdbe9... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-08-31 (Mon, 31 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/tools/tools-form.js M static/maps/mvc/tools/tools-form.js.map M static/scripts/mvc/tools/tools-form.js Log Message: ----------- Merge pull request #677 from guerler/fix_version_002 [15.07] Fix version handling in tool form Commit: f4605937e3bb1e0e993c66ac86deabff374034c4 https://github.com/galaxyproject/galaxy/commit/f4605937e3bb1e0e993c66ac86dea... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-09-01 (Tue, 01 Sep 2015) Changed paths: A doc/source/releases/15.07.rst M doc/source/releases/15.07_announce.rst A doc/source/releases/15.10_announce.rst M doc/source/releases/index.rst M scripts/bootstrap_history.py A scripts/bootstrap_history_announce_template.rst Log Message: ----------- Merge pull request #642 from jmchilton/rn [15.07] Release notes for 15.07. Commit: f6b5558c11698069c4eebb1b28f089a3ecc32c40 https://github.com/galaxyproject/galaxy/commit/f6b5558c11698069c4eebb1b28f08... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-09-01 (Tue, 01 Sep 2015) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- For CSV type data, do not fail to set metadata when header and data row column counts mismatch. Commit: 099d61ef21e9cf1eae364cf807aa7e3705d8d787 https://github.com/galaxyproject/galaxy/commit/099d61ef21e9cf1eae364cf807aa7... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-09-01 (Tue, 01 Sep 2015) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- Fix for raising error when trying to compare unknown column types in CSV. Commit: 566acab16e52d3e9a1969366a2a52e02bf8c1eb9 https://github.com/galaxyproject/galaxy/commit/566acab16e52d3e9a1969366a2a52... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-09-01 (Tue, 01 Sep 2015) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- Merge pull request #680 from blankenberg/csv_fix [15.07] For CSV type data, do not fail to set metadata when header and data row column counts mismatch. Commit: c2c1c723569db7076772235594f59e0dfe3a8c41 https://github.com/galaxyproject/galaxy/commit/c2c1c723569db7076772235594f59... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2015-09-02 (Wed, 02 Sep 2015) Changed paths: M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Fix issue #525. Repo info dicts and tsr_ids were filtered for pre-installed tools, but the unfiltered info_dict was passed on, causing misalignment of repository and tsr_id. Commit: 990501d2d94741a3ac16016b8a37e48e84acf018 https://github.com/galaxyproject/galaxy/commit/990501d2d94741a3ac16016b8a37e... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-09-02 (Wed, 02 Sep 2015) Changed paths: M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Merge pull request #687 from dannon/release_15.07 Backport of Fix issue #525 Commit: 4557b27fea515934fa5a9296c5993423aa482dd7 https://github.com/galaxyproject/galaxy/commit/4557b27fea515934fa5a9296c5993... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-09-02 (Wed, 02 Sep 2015) Changed paths: M client/galaxy/scripts/mvc/tools.js M client/galaxy/scripts/mvc/tools/tools-form.js M client/galaxy/scripts/mvc/ui/ui-select-library.js M client/galaxy/scripts/viz/sweepster.js A doc/source/releases/15.07.rst M doc/source/releases/15.07_announce.rst A doc/source/releases/15.10_announce.rst M doc/source/releases/index.rst M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/tool_shed/dependencies/attribute_handlers.py M lib/tool_shed/dependencies/tool/tag_attribute_handler.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/util/web_util.py M scripts/bootstrap_history.py A scripts/bootstrap_history_announce_template.rst M static/maps/mvc/tools.js.map M static/maps/mvc/tools/tools-form.js.map M static/maps/mvc/ui/ui-select-library.js.map M static/maps/viz/sweepster.js.map M static/scripts/mvc/tools.js M static/scripts/mvc/tools/tools-form.js M static/scripts/mvc/ui/ui-select-library.js M static/scripts/viz/sweepster.js M templates/webapps/reports/base_panels.mako R templates/webapps/tool_shed/message.mako Log Message: ----------- Merge branch 'release_15.07' Commit: bcbeb75a68952597e89563d316dc0ec2d945f49c https://github.com/galaxyproject/galaxy/commit/bcbeb75a68952597e89563d316dc0... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-09-02 (Wed, 02 Sep 2015) Changed paths: M client/galaxy/scripts/mvc/tools/tools-form.js A doc/source/releases/15.07.rst M doc/source/releases/15.07_announce.rst A doc/source/releases/15.10_announce.rst M doc/source/releases/index.rst M lib/galaxy/datatypes/tabular.py M lib/tool_shed/dependencies/attribute_handlers.py M lib/tool_shed/dependencies/tool/tag_attribute_handler.py M scripts/bootstrap_history.py A scripts/bootstrap_history_announce_template.rst M static/maps/mvc/tools/tools-form.js.map M static/scripts/mvc/tools/tools-form.js Log Message: ----------- Merge branch 'master' into dev Conflicts: lib/tool_shed/dependencies/tool/tag_attribute_handler.py Compare: https://github.com/galaxyproject/galaxy/compare/f48dd9942567...bcbeb75a6895