Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2b4a8557f1f0057447c729717f22452d14ac11ef https://github.com/galaxyproject/galaxy/commit/2b4a8557f1f0057447c729717f224... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-07-25 (Mon, 25 Jul 2016) Changed paths: M client/galaxy/scripts/mvc/history/options-menu.js M lib/galaxy/webapps/galaxy/controllers/history.py 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/mvc/history/options-menu.js Log Message: ----------- History, UI: use id of displayed history in delete - Refactor `delete current` to `delete` and require an id arg. - Update history options menu to pass the id of the displayed/ current history to the above delete controller endpoint. This means that the current history panel will delete the history that's displayed (instead of potentially a different history that's been set to the current history on the server side). Note: this isn't an ideal refactoring but should solve the below issue temporarily until we move more of the session state out of API. Closes #894 Commit: 877655c1f06e5076512e2f0e16cc7d1458471643 https://github.com/galaxyproject/galaxy/commit/877655c1f06e5076512e2f0e16cc7... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-07-25 (Mon, 25 Jul 2016) Changed paths: M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/ui/ui-buttons.js M client/galaxy/style/less/ui.less M static/maps/mvc/form/form-view.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/tool/tool-form-composite.js.map M static/maps/mvc/ui/ui-buttons.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/form/form-view.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/tool/tool-form-composite.js M static/scripts/mvc/ui/ui-buttons.js M static/style/blue/base.css M templates/base.mako M templates/base/base_panels.mako M templates/js-app.mako Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into history.delete_current-id Commit: cdab64820c554120545d7207d3861612d2a99ea9 https://github.com/galaxyproject/galaxy/commit/cdab64820c554120545d7207d3861... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-07-29 (Fri, 29 Jul 2016) Changed paths: M .ci/flake8_blacklist.txt A .ci/flake8_lint_include_list.txt A .ci/flake8_wrapper_imports.sh M .travis.yml M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/style/less/ui.less M config/galaxy.ini.sample M config/object_store_conf.xml.sample A config/plugins/interactive_environments/neo/config/allowed_images.yml.sample A config/plugins/interactive_environments/neo/config/neo.ini.sample A config/plugins/interactive_environments/neo/config/neo.xml A config/plugins/interactive_environments/neo/static/js/neo.js A config/plugins/interactive_environments/neo/templates/neo.mako M doc/source/lib/galaxy.objectstore.rst M lib/galaxy/config.py M lib/galaxy/datatypes/set_metadata_tool.xml M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh M lib/galaxy/model/mapping.py M lib/galaxy/objectstore/__init__.py A lib/galaxy/objectstore/azure_blob.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/brewed_tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/galaxy_packages.py M lib/galaxy/tools/deps/resolvers/homebrew.py M lib/galaxy/tools/deps/resolvers/modules.py M lib/galaxy/tools/deps/resolvers/resolver_mixins.py M lib/galaxy/tools/deps/resolvers/tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py M lib/galaxy/tools/deps/views.py M lib/galaxy/tools/parameters/basic.py A lib/galaxy/tools/toolbox/requirements.py M lib/galaxy/version.py M lib/galaxy/web/__init__.py M lib/galaxy/web/buildapp.py M lib/galaxy/web/framework/helpers/__init__.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/webapps/galaxy/api/tool_dependencies.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/forms.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/user.py A lib/galaxy/webapps/reports/controllers/history.py A lib/galaxy/webapps/reports/controllers/tools.py M lib/galaxy/webapps/reports/controllers/users.py M lib/galaxy/webapps/tool_shed/config.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/tag_handler.py M lib/tool_shed/util/shed_util_common.py M setup.cfg M static/maps/mvc/form/form-section.js.map M static/maps/mvc/form/form-view.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/tool/tool-form.js.map M static/maps/mvc/ui/ui-select-content.js.map M static/maps/mvc/ui/ui-select-default.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/form/form-section.js M static/scripts/mvc/form/form-view.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/tool/tool-form.js M static/scripts/mvc/ui/ui-select-content.js M static/scripts/mvc/ui/ui-select-default.js M static/style/blue/base.css M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/manage_repository.mako M templates/admin/tool_shed_repository/preview_repository.mako M templates/admin/tool_shed_repository/reselect_tool_panel_section.mako M templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/base/base_panels.mako A templates/webapps/reports/history_and_dataset_per_user.mako A templates/webapps/reports/history_and_dataset_type.mako A templates/webapps/reports/history_per_user.mako M templates/webapps/reports/index.mako A templates/webapps/reports/tool_error_messages.mako A templates/webapps/reports/tool_execution_time.mako A templates/webapps/reports/tool_execution_time_per_month.mako A templates/webapps/reports/tools_and_job_state.mako A templates/webapps/reports/tools_and_job_state_per_month.mako M templates/webapps/tool_shed/repository/common.mako M templates/webapps/tool_shed/repository/export_repository.mako M test/base/driver_util.py M test/base/twilltestcase.py A test/integration/test_resolvers.py M test/shed_functional/base/twilltestcase.py M test/shed_functional/functional/test_1010_install_repository_with_tool_dependencies.py M test/shed_functional/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py M tool-data/shared/ucsc/ucsc_build_sites.txt.sample M tox.ini Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into history.delete_current-id Commit: dd4eabb48426a24ca6c960469b3fbb39edff821f https://github.com/galaxyproject/galaxy/commit/dd4eabb48426a24ca6c960469b3fb... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/history/options-menu.js M lib/galaxy/webapps/galaxy/controllers/history.py 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/mvc/history/options-menu.js Log Message: ----------- Merge pull request #2654 from carlfeberhard/history.delete_current-id History, UI: use id of displayed history in delete Compare: https://github.com/galaxyproject/galaxy/compare/6db43585c16c...dd4eabb48426