Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d270a21908a8b1d203ac653d96177ae921cb5a5d https://github.com/galaxyproject/galaxy/commit/d270a21908a8b1d203ac653d96177... Author: John Chilton <jmchilton@gmail.com> Date: 2017-03-24 (Fri, 24 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/history/history-view-edit.js M static/maps/mvc/collection/list-collection-creator.js.map M static/maps/mvc/history/history-view-edit.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/history/history-view-edit.js M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/sizzle.py M test/selenium_tests/test_collection_builders.py Log Message: ----------- Allow non-ready jobs in collection builder. This includes two parallel changes to the Selenium tests. - It adds a decorator to allow retrying certain atomic actions that may occur during jQuery transitions automatically. - It refactors things to allow waiting on HIDs to become visible instead of just green. Commit: 3d13a2bb4f75f2224f24511aa96c9f97d8ff3e44 https://github.com/galaxyproject/galaxy/commit/3d13a2bb4f75f2224f24511aa96c9... Author: John Chilton <jmchilton@gmail.com> Date: 2017-03-24 (Fri, 24 Mar 2017) Changed paths: M test/galaxy_selenium/navigates_galaxy.py M test/selenium_tests/test_tool_form.py Log Message: ----------- Fix transiently failing Selenium test of tool form re-running. Reworks addition of staleness checkers introduced in #3780. Commit: c9d06aeb41d9e15c07dddf4fff67630f2ee2237d https://github.com/galaxyproject/galaxy/commit/c9d06aeb41d9e15c07dddf4fff676... Author: John Chilton <jmchilton@gmail.com> Date: 2017-03-24 (Fri, 24 Mar 2017) Changed paths: M lib/galaxy/managers/collections.py M lib/galaxy/managers/collections_util.py M test/api/test_history_contents.py Log Message: ----------- Allow collection creation API to hide original datasets during creation. Commit: 5fa546749bcc7b5a8c2579c46a1360217d4883c8 https://github.com/galaxyproject/galaxy/commit/5fa546749bcc7b5a8c2579c46a136... Author: John Chilton <jmchilton@gmail.com> Date: 2017-03-24 (Fri, 24 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/collection/base-creator.js M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/collection/pair-collection-creator.js M client/galaxy/scripts/mvc/history/history-contents.js M client/galaxy/style/less/ui/paired-collection-creator.less M static/maps/mvc/collection/base-creator.js.map M static/maps/mvc/collection/list-collection-creator.js.map M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/maps/mvc/collection/pair-collection-creator.js.map M static/maps/mvc/history/history-contents.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/collection/base-creator.js M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/scripts/mvc/collection/pair-collection-creator.js M static/scripts/mvc/history/history-contents.js M static/style/blue/base.css Log Message: ----------- Allow collection builders to hide original datasets. Commit: 82ca6931c02b1a4b13fe9dc4e86c7ace6029f5d5 https://github.com/galaxyproject/galaxy/commit/82ca6931c02b1a4b13fe9dc4e86c7... Author: John Chilton <jmchilton@gmail.com> Date: 2017-03-24 (Fri, 24 Mar 2017) Changed paths: M test/galaxy_selenium/navigates_galaxy.py M test/qunit/test-data/paired-collection-creator.data.js M test/selenium_tests/test_collection_builders.py Log Message: ----------- More test cases for collection builders. - Add test case for building paired lists. - Add tests for new hide original datasets functionality for lists and paired lists. Commit: 810a96caef678462369604afd2a52b5c25c9268c https://github.com/galaxyproject/galaxy/commit/810a96caef678462369604afd2a52... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/tool/tools.js M lib/galaxy/jobs/__init__.py M lib/galaxy/managers/datasets.py M lib/galaxy/queue_worker.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/cache.py M lib/galaxy/tools/toolbox/watcher.py M static/maps/mvc/tool/tools.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tool/tools.js M test/api/test_jobs.py M test/base/api_asserts.py M test/base/driver_util.py M test/base/populators.py M test/functional/tools/create_10.xml A test/functional/tools/create_2.xml M test/functional/tools/samples_tool_conf.xml M test/unit/tools/test_toolbox.py M test/unit/tools/test_watcher.py Log Message: ----------- Merge branch 'dev' into collection_builder_enhancements Commit: db09acb0263751560714c74d9f7c9ea6fed649ae https://github.com/galaxyproject/galaxy/commit/db09acb0263751560714c74d9f7c9... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/collection/base-creator.js M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/collection/pair-collection-creator.js M client/galaxy/scripts/mvc/history/history-contents.js M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/style/less/ui/paired-collection-creator.less M lib/galaxy/managers/collections.py M lib/galaxy/managers/collections_util.py M static/maps/mvc/collection/base-creator.js.map M static/maps/mvc/collection/list-collection-creator.js.map M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/maps/mvc/collection/pair-collection-creator.js.map M static/maps/mvc/history/history-contents.js.map M static/maps/mvc/history/history-view-edit.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/collection/base-creator.js M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/scripts/mvc/collection/pair-collection-creator.js M static/scripts/mvc/history/history-contents.js M static/scripts/mvc/history/history-view-edit.js M static/style/blue/base.css M test/api/test_history_contents.py M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/sizzle.py M test/qunit/test-data/paired-collection-creator.data.js M test/selenium_tests/test_collection_builders.py M test/selenium_tests/test_tool_form.py Log Message: ----------- Merge pull request #3806 from jmchilton/collection_builder_enhancements Small enhancements for collection builders Compare: https://github.com/galaxyproject/galaxy/compare/967d0b6c0aef...db09acb02637