Branch: refs/heads/master Home: https://github.com/galaxyproject/galaxy Commit: 8334593de11e915389b1da58c3b5db26121c7bef https://github.com/galaxyproject/galaxy/commit/8334593de11e915389b1da58c3b5d... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-12-03 (Thu, 03 Dec 2015) Changed paths: M lib/galaxy/workflow/extract.py Log Message: ----------- Fixes for dataset 'cleanup'/association linking when extracting workflows from a history. Commit: 7923360dcec48b2e98d7c2a5bcae5f47187d6bf6 https://github.com/galaxyproject/galaxy/commit/7923360dcec48b2e98d7c2a5bcae5... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py Log Message: ----------- "Fix" collection outputs to hide the HDAs in the history. Long term this is just not a solution, but it is the strategy we use for mapped over output HDAs also. Rebased and fixed based on comments from @nsoranzo indicating the previous attempt did absolutely nothing to fix the problem. xref https://github.com/galaxyproject/tools-iuc/pull/412/files Commit: 41a56ead749bd25c6bc46107201b0e62bb65af9a https://github.com/galaxyproject/galaxy/commit/41a56ead749bd25c6bc46107201b0... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/collection/list-collection-creator.js M static/maps/mvc/collection/list-collection-creator.js.map M static/scripts/mvc/collection/list-collection-creator.js Log Message: ----------- Fix list collection creator being cutoff by restoring height: 100% Commit: 94b049926d844a8aa54017b6d7a9983b94203316 https://github.com/galaxyproject/galaxy/commit/94b049926d844a8aa54017b6d7a99... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-08 (Tue, 08 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/collection/list-collection-creator.js M static/maps/mvc/collection/list-collection-creator.js.map M static/scripts/mvc/collection/list-collection-creator.js Log Message: ----------- Merge pull request #1258 from carlfeberhard/release_15.10 [15.10] Fix list collection creator being cutoff by restoring height: 100% Commit: 2be17071f35bb5db2298883aff107134a53701d1 https://github.com/galaxyproject/galaxy/commit/2be17071f35bb5db2298883aff107... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-08 (Tue, 08 Dec 2015) Changed paths: M lib/galaxy/workflow/extract.py Log Message: ----------- Merge pull request #1228 from blankenberg/wf_extrac_15.10 [15.10] Fixes for dataset 'cleanup'/association linking when extracting workflows from a history. Commit: 0d98cf8ab76a374362302547b5699fa024d5ce21 https://github.com/galaxyproject/galaxy/commit/0d98cf8ab76a374362302547b5699... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-12-09 (Wed, 09 Dec 2015) Changed paths: M lib/galaxy/config.py Log Message: ----------- Log a warning for missing tool whitelist file only if explicitly defined. Also fix the log message. Commit: a9034b5df3f3c80144727ebc161caa38b64ba7a1 https://github.com/galaxyproject/galaxy/commit/a9034b5df3f3c80144727ebc161ca... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-12-09 (Wed, 09 Dec 2015) Changed paths: M eggs.ini Log Message: ----------- Update Kombu and AMQP eggs to fix problems with El Capitan's System Integrity Protection. Commit: b6e7b9a33b5dec7fdad2ad2f863bbf88980626ec https://github.com/galaxyproject/galaxy/commit/b6e7b9a33b5dec7fdad2ad2f863bb... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M lib/galaxy/config.py Log Message: ----------- Adjustments to sanitize_whitelist reloading. Commit: 2835aead8f949e3ac8b5c2ece0dc00c872950bde https://github.com/galaxyproject/galaxy/commit/2835aead8f949e3ac8b5c2ece0dc0... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge pull request #2 from dannon/release_15.10_config Adjustments to sanitize_whitelist reloading. Commit: f13e9298de2eba4bee36ecb8336477a63345294b https://github.com/galaxyproject/galaxy/commit/f13e9298de2eba4bee36ecb833647... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge pull request #1278 from nsoranzo/release_15.10_config [15.10] Log a warning for missing tool whitelist file only if explicitly defined. Commit: fba354cb87754450ac41e58252dd405ac073557d https://github.com/galaxyproject/galaxy/commit/fba354cb87754450ac41e58252dd4... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M eggs.ini Log Message: ----------- Merge pull request #1282 from natefoo/kombu-el-cap [15.10] Update Kombu and AMQP eggs to fix problems with El Capitan's System Integrity Protection Commit: 6a47d2d3a7f27b659e5de5fb1b37c7c1f9d04302 https://github.com/galaxyproject/galaxy/commit/6a47d2d3a7f27b659e5de5fb1b37c... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py Log Message: ----------- Merge pull request #1239 from jmchilton/collection_outputs_hidden [15.10] "Fix" collection outputs to hide the HDAs in the history. Compare: https://github.com/galaxyproject/galaxy/compare/7d4eac1535fc...6a47d2d3a7f2