Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d42eef992df528f1591d6513a68a13f53171f954 https://github.com/galaxyproject/galaxy/commit/d42eef992df528f1591d6513a68a1... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- convert to arrow functions, eliminate self and that Commit: e8e12a6026289420757488bd72e726aedea87bbd https://github.com/galaxyproject/galaxy/commit/e8e12a6026289420757488bd72e72... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M client/galaxy/style/less/library.less M static/style/blue/library.css Log Message: ----------- remove styles for the removed old library interface Commit: 96565e9b84cc064ab717580b143bacd8672b2e70 https://github.com/galaxyproject/galaxy/commit/96565e9b84cc064ab717580b143ba... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M client/galaxy/scripts/galaxy.library.js M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/style/less/library.less M static/style/blue/library.css M test/galaxy_selenium/navigation.yml Log Message: ----------- wip on importing from library to history as a collection + various es6 additions; cleanup; refactoring I tried to separate it into more commits but it kept growing too fast, sorry Commit: 88d9c669d06f5503f8337ce4d187ed83a6295ab9 https://github.com/galaxyproject/galaxy/commit/88d9c669d06f5503f8337ce4d187e... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- implement support for paired and list:paired collections Commit: e344de3660a02501467fd769883cc17d359b8223 https://github.com/galaxyproject/galaxy/commit/e344de3660a02501467fd769883cc... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- finish the list:paired modal invocation Commit: 2f90fd87663924f39d6c264e45c66ebb80bd3bf0 https://github.com/galaxyproject/galaxy/commit/2f90fd87663924f39d6c264e45c66... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/collection/list-collection-creator.js Log Message: ----------- re enable and enhance the collection validator Commit: 2dfdbb645bebf4834606e8534181970a79508bb0 https://github.com/galaxyproject/galaxy/commit/2dfdbb645bebf4834606e85341819... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-modal.js Log Message: ----------- refactor modal to bind closing event at different time this allows chaining modals after each other with closing events working Commit: e4d0788a28da6f2007de700dae3f35400f7abdb0 https://github.com/galaxyproject/galaxy/commit/e4d0788a28da6f2007de700dae3f3... Author: John Chilton <jmchilton@gmail.com> Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml M test/selenium_tests/test_library_contents.py A test/selenium_tests/test_library_to_collections.py Log Message: ----------- Improvements to library testing. - Add tests for creating a collection from a library. - Add more class names to library GUI to improve selectors for tests. - Automatically select whichever radio box makes sense in library collection builder dialog based on whether there is a selection or not. Commit: d0a9d6619d1970a6de9b2c5567f0a927d16bcded https://github.com/galaxyproject/galaxy/commit/d0a9d6619d1970a6de9b2c5567f0a... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- hide source items by default in all library-collection creators Commit: d806cf7b3776f048b97fd7254a37c4a763894579 https://github.com/galaxyproject/galaxy/commit/d806cf7b3776f048b97fd7254a37c... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-12-19 (Tue, 19 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml M test/selenium_tests/test_library_contents.py A test/selenium_tests/test_library_to_collections.py Log Message: ----------- Merge pull request #26 from jmchilton/lib-to-colllection Improvements to library testing. Commit: fb256b7aa330e43feae5a27aff72bd0b82661a21 https://github.com/galaxyproject/galaxy/commit/fb256b7aa330e43feae5a27aff72b... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-12-19 (Tue, 19 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-modal.js Log Message: ----------- fix the modal backdrop listener to respect the config Commit: 498de3e830220556a838f71a20505b6d58794a31 https://github.com/galaxyproject/galaxy/commit/498de3e830220556a838f71a20505... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-12-19 (Tue, 19 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- fix the selenium test that expects the class to be here Commit: 00e31c13f516206ff979cc0798d2dd69f044495c https://github.com/galaxyproject/galaxy/commit/00e31c13f516206ff979cc0798d2d... Author: John Chilton <jmchilton@gmail.com> Date: 2017-12-20 (Wed, 20 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/collection/list-collection-creator.js M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml Log Message: ----------- Fix more selenium library tests. Commit: 9dda0ed3f117a3b29c6962713efb6543e2b30e0d https://github.com/galaxyproject/galaxy/commit/9dda0ed3f117a3b29c6962713efb6... Author: John Chilton <jmchilton@gmail.com> Date: 2017-12-20 (Wed, 20 Dec 2017) Changed paths: M client/GruntFile.js M client/README.md M client/galaxy/scripts/apps/extended.js M client/galaxy/scripts/galaxy.js M client/galaxy/scripts/galaxy.pages.js M client/galaxy/scripts/libs/jquery/jquery.wymeditor.js M client/galaxy/scripts/mvc/dataset/data.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/history-item-li.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/ui/ui-select-library.js A client/galaxy/scripts/toolshed/groups/group-detail-view.js A client/galaxy/scripts/toolshed/groups/group-list-view.js A client/galaxy/scripts/toolshed/groups/group-listrow-view.js A client/galaxy/scripts/toolshed/groups/group-model.js A client/galaxy/scripts/toolshed/toolshed.groups.js M client/galaxy/scripts/viz/circster.js M client/galaxy/scripts/viz/trackster.js M client/galaxy/style/less/history.less R client/grunt-tasks/install-libs.js R client/grunt-tasks/scripts.js R client/toolshed/scripts/mvc/groups/group-detail-view.js R client/toolshed/scripts/mvc/groups/group-list-view.js R client/toolshed/scripts/mvc/groups/group-listrow-view.js R client/toolshed/scripts/mvc/groups/group-model.js R client/toolshed/scripts/toolshed.groups.js M config/galaxy.ini.sample M lib/galaxy/actions/library.py M lib/galaxy/config.py M lib/galaxy/util/path/__init__.py M lib/galaxy/webapps/galaxy/api/library_datasets.py M static/scripts/bundled/admin.bundled.js R static/scripts/bundled/adminToolshed.bundled.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/extended.bundled.js R static/scripts/bundled/library.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/login.bundled.js R static/scripts/bundled/masthead.bundled.js R static/scripts/bundled/viz.bundled.js R static/scripts/bundled/workflow.bundled.js M static/scripts/galaxy.js M static/scripts/galaxy.pages.js M static/scripts/libs/jquery/jquery.wymeditor.js M static/scripts/mvc/dataset/data.js M static/scripts/mvc/dataset/dataset-li.js M static/scripts/mvc/history/history-item-li.js M static/scripts/mvc/ui/ui-select-default.js M static/scripts/mvc/ui/ui-select-library.js A static/scripts/toolshed/groups/group-detail-view.js A static/scripts/toolshed/groups/group-list-view.js A static/scripts/toolshed/groups/group-listrow-view.js A static/scripts/toolshed/groups/group-model.js A static/scripts/toolshed/toolshed.groups.js M static/scripts/viz/circster.js M static/scripts/viz/trackster.js M static/style/blue/base.css M templates/base.mako M templates/base/base_panels.mako M templates/galaxy_client_app.mako M templates/legacy/grid_base.mako M templates/webapps/galaxy/base_panels.mako M templates/webapps/galaxy/dataset/display.mako M templates/webapps/galaxy/dataset/tabular_chunked.mako M templates/webapps/galaxy/galaxy.panels.mako M templates/webapps/galaxy/history/display.mako M templates/webapps/galaxy/history/display_structured.mako M templates/webapps/galaxy/history/embed.mako M templates/webapps/galaxy/history/structure.mako M templates/webapps/galaxy/history/view.mako M templates/webapps/galaxy/history/view_multiple.mako M templates/webapps/galaxy/page/editor.mako M templates/webapps/galaxy/visualization/display.mako M templates/webapps/galaxy/visualization/phyloviz.mako M templates/webapps/galaxy/visualization/sweepster.mako M templates/webapps/reports/run_stats.mako M templates/webapps/tool_shed/group/index.mako Log Message: ----------- Merge remote-tracking branch 'jmchilton/dev' into lib-to-colllection Commit: 9a14f7c835bbfdb013a5860eac41e8064bc2570b https://github.com/galaxyproject/galaxy/commit/9a14f7c835bbfdb013a5860eac41e... Author: John Chilton <jmchilton@gmail.com> Date: 2017-12-20 (Wed, 20 Dec 2017) Changed paths: M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/extended.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/galaxy.library.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/library/library-foldertoolbar-view.js M static/scripts/mvc/ui/ui-modal.js M static/style/blue/base.css M static/style/blue/library.css Log Message: ----------- Rebuild client. Commit: ee6512ee8a592a4ab44c0827bff8ee04949a7b2d https://github.com/galaxyproject/galaxy/commit/ee6512ee8a592a4ab44c0827bff8e... Author: John Chilton <jmchilton@gmail.com> Date: 2017-12-20 (Wed, 20 Dec 2017) Changed paths: M client/galaxy/scripts/galaxy.library.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/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/ui/ui-modal.js M client/galaxy/style/less/library.less M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/extended.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/galaxy.library.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/library/library-foldertoolbar-view.js M static/scripts/mvc/ui/ui-modal.js M static/style/blue/base.css M static/style/blue/library.css M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml M test/selenium_tests/test_library_contents.py A test/selenium_tests/test_library_to_collections.py Log Message: ----------- Merge pull request #5080 from martenson/lib-to-colllection Libraries to collections Compare: https://github.com/galaxyproject/galaxy/compare/77d77a935fa0...ee6512ee8a59