Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 27c22d8c7efe9833941d180df6a8b64242a0c873 https://github.com/galaxyproject/galaxy/commit/27c22d8c7efe9833941d180df6a8b... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-19 (Tue, 19 Dec 2017)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow.js

Log Message: ----------- Removal of self, usage of fatarrow this

Commit: 79dd0b548d46b9c28970f4fd70f793517a644749 https://github.com/galaxyproject/galaxy/commit/79dd0b548d46b9c28970f4fd70f79... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-19 (Tue, 19 Dec 2017)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow.js

Log Message: ----------- Fix workflow list showInToolPanel toggling to use a success callback for reload. Currently this is unsable in firefox, because the reload happens immediately before the request gets sent async.

Commit: d7b90684968f5e1e8c98f4f0b69f2d75bba4dd80 https://github.com/galaxyproject/galaxy/commit/d7b90684968f5e1e8c98f4f0b69f2... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-19 (Tue, 19 Dec 2017)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow.js

Log Message: ----------- Variable scoping in workflow.js

Commit: 0eeb09545faa035eaa067470f9e5f17985abcb75 https://github.com/galaxyproject/galaxy/commit/0eeb09545faa035eaa067470f9e5f... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-21 (Thu, 21 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.library.js M client/galaxy/scripts/galaxy.pages.js M client/galaxy/scripts/layout/router.js M client/galaxy/scripts/libs/jquery/jquery.wymeditor.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/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/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/ui/ui-modal.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/ui/ui-select-library.js M client/galaxy/scripts/nls/zh/locale.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 M client/galaxy/style/less/library.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/tools/deps/conda_util.py M lib/galaxy/util/path/__init__.py M lib/galaxy/webapps/galaxy/api/library_contents.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.library.js M static/scripts/galaxy.pages.js M static/scripts/layout/router.js M static/scripts/libs/jquery/jquery.wymeditor.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/dataset/data.js M static/scripts/mvc/dataset/dataset-li.js M static/scripts/mvc/history/history-item-li.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/ui/ui-modal.js M static/scripts/mvc/ui/ui-select-default.js M static/scripts/mvc/ui/ui-select-library.js M static/scripts/nls/zh/locale.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 static/style/blue/library.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 M test/api/test_configuration.py M test/api/test_history_contents.py M test/api/test_libraries.py M test/api/test_tools.py M test/base/populators.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml M test/integration/test_upload_configuration_options.py M test/selenium_tests/test_library_contents.py A test/selenium_tests/test_library_to_collections.py

Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into workflow_list_fixes

Commit: bda49d429feaca23ca3da05154632a26fbdd28a9 https://github.com/galaxyproject/galaxy/commit/bda49d429feaca23ca3da05154632... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-21 (Thu, 21 Dec 2017)

Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js

Log Message: ----------- Run client-format

Commit: 9d4514da780e21ce4487e669248a0165b36f009a https://github.com/galaxyproject/galaxy/commit/9d4514da780e21ce4487e669248a0... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-21 (Thu, 21 Dec 2017)

Changed paths: M static/scripts/bundled/analysis.bundled.js M static/scripts/mvc/workflow/workflow.js

Log Message: ----------- Build client.

Commit: 87b2540a5f46f37f36714acb68e55a45e1c23b3a https://github.com/galaxyproject/galaxy/commit/87b2540a5f46f37f36714acb68e55... Author: Björn Grüning bjoern@gruenings.eu Date: 2017-12-22 (Fri, 22 Dec 2017)

Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/workflow/workflow.js M static/scripts/bundled/analysis.bundled.js M static/scripts/mvc/workflow/workflow.js

Log Message: ----------- Merge pull request #5234 from dannon/workflow_list_fixes

Workflow list show-in-tool-panel callback bugfix.

Compare: https://github.com/galaxyproject/galaxy/compare/0bf73e4381d9...87b2540a5f46