Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 78427438adcb794af630ebb3b9b77b3628c2c5bb https://github.com/galaxyproject/galaxy/commit/78427438adcb794af630ebb3b9b77... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-09 (Wed, 09 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/history/copy-dialog.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/ui/ui-modal.js M lib/galaxy/model/__init__.py M lib/galaxy/webapps/galaxy/controllers/history.py M static/maps/mvc/history/copy-dialog.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/ui/ui-modal.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/history/copy-dialog.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/ui/ui-modal.js M test/unit/managers/test_HistoryManager.py Log Message: ----------- UI, History: refactor the history copy dialog, use it from the options menu (instead of history/copy), pass ui-modal closing_callback a flag whether it was a cancellation or not Commit: e391fa4975800fd1d21e1e7d03183d146728f1c8 https://github.com/galaxyproject/galaxy/commit/e391fa4975800fd1d21e1e7d03183... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-09 (Wed, 09 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/history/copy-dialog.js M client/galaxy/scripts/mvc/history/options-menu.js M static/maps/mvc/history/copy-dialog.js.map M static/maps/mvc/history/options-menu.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/mvc/history/copy-dialog.js M static/scripts/mvc/history/options-menu.js M templates/webapps/galaxy/history/display.mako Log Message: ----------- UI, History: allow copy dialog to have default of copy-all-datasets passed in as option; Replace import link with copy dialog in published histories Commit: 7187eddd2fdec95093c765b838814435c9f6b92d https://github.com/galaxyproject/galaxy/commit/7187eddd2fdec95093c765b838814... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-09 (Wed, 09 Dec 2015) Changed paths: M templates/display_base.mako M templates/webapps/galaxy/visualization/display.mako M templates/webapps/galaxy/visualization/display_in_frame.mako Log Message: ----------- UI, published items: fix css bleeding of trackster.css into other published item displays Commit: 941109dda860325938960b93f66e50d314b67e4a https://github.com/galaxyproject/galaxy/commit/941109dda860325938960b93f66e5... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-09 (Wed, 09 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/history/copy-dialog.js M client/galaxy/scripts/mvc/history/options-menu.js M static/maps/mvc/history/copy-dialog.js.map M static/maps/mvc/history/options-menu.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/history/copy-dialog.js M static/scripts/mvc/history/options-menu.js M templates/grid_base.mako M templates/webapps/galaxy/history/display.mako Log Message: ----------- UI, History: use copy dialog as import dialog in published history pages, refactor copy-dialog Commit: 253ca7ec4940188d11157448d73be09e762e65f8 https://github.com/galaxyproject/galaxy/commit/253ca7ec4940188d11157448d73be... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/history/copy-dialog.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/ui/popup-menu.js M static/maps/mvc/history/copy-dialog.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/ui/popup-menu.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/history/copy-dialog.js M static/scripts/mvc/ui/popup-menu.js M templates/webapps/galaxy/history/grid.mako Log Message: ----------- UI, History: insert/use copy dialog in the 'Saved Histories' grid Commit: 09cb673a9b13f6f9faae21b48c317e485afb8eb1 https://github.com/galaxyproject/galaxy/commit/09cb673a9b13f6f9faae21b48c317... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/history/copy-dialog.js M lib/galaxy/webapps/galaxy/controllers/history.py M static/maps/mvc/history/copy-dialog.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/history/copy-dialog.js M templates/webapps/galaxy/history/grid.mako A templates/webapps/galaxy/history/grid_js.mako A templates/webapps/galaxy/history/shared_grid.mako Log Message: ----------- UI, History: use copy dialog for shared history popupmenus, use custom templates for both saved and shared history lists/grids. refactor custom grid code for insertion of copy dialog Commit: cb23e010d7750b533be7690e72c92500ddc8e2f1 https://github.com/galaxyproject/galaxy/commit/cb23e010d7750b533be7690e72c92... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/history/copy-dialog.js M static/maps/mvc/history/copy-dialog.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/history/copy-dialog.js M templates/webapps/galaxy/history/display.mako M templates/webapps/galaxy/history/view.mako Log Message: ----------- UI, History: use copy dialog in history/view for import, minor fixes Commit: d72b913c1d25bf9e2ee2c9e7320bff4f52b366e3 https://github.com/galaxyproject/galaxy/commit/d72b913c1d25bf9e2ee2c9e7320bf... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M client/galaxy/scripts/utils/ajax-queue.js M static/maps/utils/ajax-queue.js.map M static/scripts/utils/ajax-queue.js M templates/webapps/galaxy/history/shared_grid.mako Log Message: ----------- UI, History: hack multiple copy by API into the 'histories shared with me' mako grid Commit: 9e512f52465c158855c2a0750d8a7d794316940e https://github.com/galaxyproject/galaxy/commit/9e512f52465c158855c2a0750d8a7... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/history/copy-dialog.js M lib/galaxy/model/__init__.py M static/maps/mvc/history/copy-dialog.js.map M static/maps/mvc/tool/tools-form-base.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/history/copy-dialog.js M static/scripts/mvc/tool/tools-form-base.js M static/scripts/utils/ajax-queue.js M templates/webapps/galaxy/history/embed.mako Log Message: ----------- UI, History: use copy dialog in the embedded histories in Pages, add autoClose option to copy dialog Commit: 324af9caeda230bfe35ce79cf3e6f84a3ca27ee5 https://github.com/galaxyproject/galaxy/commit/324af9caeda230bfe35ce79cf3e6f... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py R templates/webapps/galaxy/history/copy.mako M templates/webapps/galaxy/history/embed.mako Log Message: ----------- UI, History: remove copy and imp methods from controllers/history.py, remove history copy template Commit: 32be886f0f51103a648003997c7d06cd12ba08d9 https://github.com/galaxyproject/galaxy/commit/32be886f0f51103a648003997c7d0... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/history/copy-dialog.js M lib/galaxy/model/__init__.py M lib/galaxy/webapps/galaxy/api/histories.py M lib/galaxy/webapps/galaxy/controllers/history.py M static/maps/mvc/history/copy-dialog.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/history/copy-dialog.js Log Message: ----------- API, Histories: allow api/histories/create to be used as anon user; UI, Histories: minor fixes Commit: 84f3b72e1ad829e6f2f46049ff4af42f27429a5b https://github.com/galaxyproject/galaxy/commit/84f3b72e1ad829e6f2f46049ff4af... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: A Makefile A client/.docker-build.sh A client/Dockerfile M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/base-mvc.js M client/galaxy/scripts/mvc/citation/citation-model.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/scripts/mvc/workflow/workflow-node.js M client/galaxy/scripts/mvc/workflow/workflow-view-node.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/polyfills.js M client/galaxy/style/less/ui.less M doc/source/dev/faq.rst M lib/galaxy/datatypes/text.py M lib/galaxy/managers/base.py M lib/galaxy/managers/users.py M lib/galaxy/managers/workflows.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webapps/tool_shed/model/__init__.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/galaxy_install/repair_repository_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M lib/tool_shed/util/tool_dependency_util.py M lib/tool_shed/util/workflow_util.py M run_tests.sh M static/maps/mvc/base-mvc.js.map M static/maps/mvc/citation/citation-model.js.map M static/maps/mvc/ui/ui-select-default.js.map M static/maps/mvc/workflow/workflow-manager.js.map M static/maps/mvc/workflow/workflow-node.js.map M static/maps/mvc/workflow/workflow-view-node.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/maps/polyfills.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/base-mvc.js M static/scripts/mvc/citation/citation-model.js M static/scripts/mvc/ui/ui-select-default.js M static/scripts/mvc/workflow/workflow-manager.js M static/scripts/mvc/workflow/workflow-node.js M static/scripts/mvc/workflow/workflow-view-node.js M static/scripts/mvc/workflow/workflow-view.js M static/scripts/polyfills.js M static/style/blue/base.css R templates/webapps/galaxy/history/options.mako M templates/webapps/galaxy/workflow/editor_generic_form.mako M test/api/test_tools.py M test/api/test_workflows.py M test/api/workflows_format_2/converter.py M test/base/interactor.py M test/casperjs/api-anon-history-permission-tests.js M test/casperjs/api-anon-history-tests.js M test/docker/base/Dockerfile M test/docker/base/run_test_wrapper.sh M test/qunit/tests/workflow_editor_tests.js M test/tool_shed/functional/test_1460_data_managers.py M test/unit/managers/test_UserManager.py M test/unit/workflows/test_modules.py Log Message: ----------- (merge dev); Testing, histories: update tests to reflect allowing anon to create/copy histories via the API Commit: cf5d209e0f01b7fb13e06f013f2a3693f194ebb4 https://github.com/galaxyproject/galaxy/commit/cf5d209e0f01b7fb13e06f013f2a3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-12-16 (Wed, 16 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/history/copy-dialog.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/ui/popup-menu.js M client/galaxy/scripts/mvc/ui/ui-modal.js M client/galaxy/scripts/utils/ajax-queue.js M lib/galaxy/model/__init__.py M lib/galaxy/webapps/galaxy/api/histories.py M lib/galaxy/webapps/galaxy/controllers/history.py M static/maps/mvc/history/copy-dialog.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/ui/popup-menu.js.map M static/maps/mvc/ui/ui-modal.js.map M static/maps/utils/ajax-queue.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/copy-dialog.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/ui/popup-menu.js M static/scripts/mvc/ui/ui-modal.js M static/scripts/utils/ajax-queue.js M templates/display_base.mako M templates/grid_base.mako R templates/webapps/galaxy/history/copy.mako M templates/webapps/galaxy/history/display.mako M templates/webapps/galaxy/history/embed.mako M templates/webapps/galaxy/history/grid.mako A templates/webapps/galaxy/history/grid_js.mako A templates/webapps/galaxy/history/shared_grid.mako M templates/webapps/galaxy/history/view.mako M templates/webapps/galaxy/visualization/display.mako M templates/webapps/galaxy/visualization/display_in_frame.mako M test/casperjs/api-anon-history-permission-tests.js M test/casperjs/api-anon-history-tests.js M test/unit/managers/test_HistoryManager.py Log Message: ----------- Manual merge of #1303 to resolve build artifact conflicts. Compare: https://github.com/galaxyproject/galaxy/compare/d1fd23a2f4e5...cf5d209e0f01