Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 06fd219646b6bcb1aa3a5ce54c62cd2b3a804716 https://github.com/galaxyproject/galaxy/commit/06fd219646b6bcb1aa3a5ce54c62c... Author: Dave B <dave@bx.psu.edu> Date: 2016-01-06 (Wed, 06 Jan 2016) Changed paths: M test/casperjs/api-tool-tests.js M test/casperjs/modules/historyoptions.js M test/casperjs/modules/user.js M test/casperjs/registration-tests.js M test/casperjs/spaceghost.js Log Message: ----------- Fix casper tests. Commit: 2b80dd2da97e3253e238a60d0d1b0a9e6bc57817 https://github.com/galaxyproject/galaxy/commit/2b80dd2da97e3253e238a60d0d1b0... Author: Dave B <dave@bx.psu.edu> Date: 2016-01-06 (Wed, 06 Jan 2016) Changed paths: A .ci/flake8_py3_wrapper.sh A .ci/py3_sources.txt M client/bower.json M client/galaxy/scripts/layout/masthead.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/layout/scratchbook.js A client/galaxy/scripts/libs/bootstrap-tour.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/tool/tool-form-workflow.js M client/galaxy/scripts/mvc/tool/tool-template.js A client/galaxy/scripts/mvc/tours.js M client/galaxy/scripts/mvc/ui/ui-frames.js M client/galaxy/scripts/mvc/ui/ui-modal.js M client/galaxy/scripts/mvc/ui/ui-popover.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/scripts/mvc/upload/upload-button.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/scripts/mvc/upload/upload-settings.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-terminals.js M client/galaxy/scripts/mvc/workflow/workflow-view-data.js M client/galaxy/scripts/mvc/workflow/workflow-view-node.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/onload.js M client/galaxy/scripts/utils/uploadbox.js M client/galaxy/style/less/base.less M client/galaxy/style/less/frame.less R client/galaxy/style/less/masthead.less M client/galaxy/style/less/ui.less M client/grunt-tasks/install-libs.js M client/webpack.config.js M config/datatypes_conf.xml.sample M config/dependency_resolvers_conf.xml.sample M config/galaxy.ini.sample A config/plugins/interactive_environments/jupyter/config/jupyter.ini.sample A config/plugins/interactive_environments/jupyter/config/jupyter.xml A config/plugins/interactive_environments/jupyter/static/js/jupyter.js A config/plugins/interactive_environments/jupyter/templates/jupyter.mako A config/plugins/tours/core.galaxy_ui.yaml A config/plugins/tours/core.history.yaml M config/plugins/visualizations/charts/templates/charts.mako M config/tool_conf.xml.sample M doc/source/admin/dependency_resolvers.rst M doc/source/lib/galaxy.datatypes.converters.rst M lib/galaxy/app.py M lib/galaxy/config.py M lib/galaxy/dataset_collections/type_description.py M lib/galaxy/datatypes/binary.py R lib/galaxy/datatypes/checkers.py A lib/galaxy/datatypes/converters/bcf_bgzip_to_bcf_converter.py A lib/galaxy/datatypes/converters/bcf_bgzip_to_bcf_converter.xml A lib/galaxy/datatypes/converters/bcf_to_bcf_bgzip_converter.py A lib/galaxy/datatypes/converters/bcf_to_bcf_bgzip_converter.xml M lib/galaxy/datatypes/converters/fastq_to_fqtoc.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py A lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/dependencies/requirements.txt M lib/galaxy/exceptions/error_codes.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/metrics/collectl/processes.py M lib/galaxy/jobs/metrics/instrumenters/meminfo.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh M lib/galaxy/managers/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/model/mapping.py A lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_paramter_modules.py M lib/galaxy/objectstore/pulsar.py M lib/galaxy/objectstore/s3_multipart_upload.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py A lib/galaxy/tools/cwl/__init__.py A lib/galaxy/tools/cwl/cwltool_deps.py A lib/galaxy/tools/cwl/parser.py A lib/galaxy/tools/cwl/representation.py A lib/galaxy/tools/cwl/runtime_actions.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/commands.py A lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/resolvers/__init__.py A lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/galaxy_packages.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 A lib/galaxy/tools/deps/views.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/execute.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/lint.py M lib/galaxy/tools/linters/inputs.py M lib/galaxy/tools/linters/stdio.py M lib/galaxy/tools/loader_directory.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/history_query.py A lib/galaxy/tools/parameters/wrapped_json.py M lib/galaxy/tools/parser/__init__.py A lib/galaxy/tools/parser/cwl.py M lib/galaxy/tools/parser/factory.py M lib/galaxy/tools/parser/output_actions.py A lib/galaxy/tools/parser/output_objects.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/parser/yaml.py A lib/galaxy/tools/special_tools.py M lib/galaxy/tools/toolbox/__init__.py M lib/galaxy/tools/toolbox/base.py A lib/galaxy/tools/toolbox/cache.py M lib/galaxy/tools/toolbox/integrated_panel.py M lib/galaxy/tools/toolbox/lineages/tool_shed.py M lib/galaxy/tools/toolbox/panel.py A lib/galaxy/tools/toolbox/parser.py M lib/galaxy/tools/toolbox/watcher.py A lib/galaxy/tours/__init__.py M lib/galaxy/util/__init__.py M lib/galaxy/util/aliaspickler.py M lib/galaxy/util/backports/importlib/__init__.py M lib/galaxy/util/biostar.py A lib/galaxy/util/checkers.py M lib/galaxy/util/dictobj.py M lib/galaxy/util/directory_hash.py M lib/galaxy/util/expressions.py M lib/galaxy/util/heartbeat.py M lib/galaxy/util/inflection.py M lib/galaxy/util/json.py M lib/galaxy/util/multi_byte.py M lib/galaxy/util/object_wrapper.py M lib/galaxy/util/odict.py M lib/galaxy/util/pastescript/loadwsgi.py M lib/galaxy/util/pastescript/serve.py M lib/galaxy/util/properties.py M lib/galaxy/util/sanitize_html.py M lib/galaxy/util/topsort.py M lib/galaxy/util/validation.py M lib/galaxy/util/xml_macros.py M lib/galaxy/version.py M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/base/pluginframework.py M lib/galaxy/web/framework/formbuilder.py M lib/galaxy/web/proxy/js/lib/proxy.js M lib/galaxy/webapps/galaxy/api/configuration.py A lib/galaxy/webapps/galaxy/api/tool_dependencies.py M lib/galaxy/webapps/galaxy/api/tools.py A lib/galaxy/webapps/galaxy/api/tours.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webapps/tool_shed/api/repositories.py M lib/galaxy/webapps/tool_shed/controllers/upload.py M lib/galaxy/workflow/extract.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run.py M lib/galaxy/workflow/run_request.py M lib/tool_shed/galaxy_install/metadata/installed_repository_metadata_manager.py M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py M lib/tool_shed/galaxy_install/tool_migration_manager.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/tools/data_table_manager.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/util/commit_util.py M lib/tool_shed/util/common_util.py M lib/tool_shed/util/shed_util_common.py M lib/tool_shed/util/tool_util.py M run.sh M run_tests.sh M scripts/common_startup.sh A static/maps/galaxy.menu.js.map M static/maps/layout/masthead.js.map M static/maps/layout/menu.js.map M static/maps/layout/page.js.map M static/maps/layout/scratchbook.js.map A static/maps/libs/bootstrap-tour.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/dataset/dataset-li.js.map M static/maps/mvc/tool/tool-form-workflow.js.map M static/maps/mvc/tool/tool-template.js.map A static/maps/mvc/tours.js.map M static/maps/mvc/ui/ui-frames.js.map M static/maps/mvc/ui/ui-modal.js.map M static/maps/mvc/ui/ui-popover.js.map M static/maps/mvc/upload/default/default-view.js.map M static/maps/mvc/upload/upload-button.js.map M static/maps/mvc/upload/upload-ftp.js.map M static/maps/mvc/upload/upload-settings.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-terminals.js.map M static/maps/mvc/workflow/workflow-view-data.js.map M static/maps/mvc/workflow/workflow-view-node.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/maps/onload.js.map M static/maps/utils/uploadbox.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 A static/scripts/galaxy.menu.js M static/scripts/layout/masthead.js M static/scripts/layout/menu.js M static/scripts/layout/page.js M static/scripts/layout/scratchbook.js A static/scripts/libs/bootstrap-tour.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/dataset/dataset-li.js M static/scripts/mvc/tool/tool-form-workflow.js M static/scripts/mvc/tool/tool-template.js A static/scripts/mvc/tours.js M static/scripts/mvc/ui/ui-frames.js M static/scripts/mvc/ui/ui-modal.js M static/scripts/mvc/ui/ui-popover.js M static/scripts/mvc/upload/default/default-view.js M static/scripts/mvc/upload/upload-button.js M static/scripts/mvc/upload/upload-ftp.js M static/scripts/mvc/upload/upload-settings.js M static/scripts/mvc/workflow/workflow-manager.js M static/scripts/mvc/workflow/workflow-node.js M static/scripts/mvc/workflow/workflow-terminals.js M static/scripts/mvc/workflow/workflow-view-data.js M static/scripts/mvc/workflow/workflow-view-node.js M static/scripts/mvc/workflow/workflow-view.js M static/scripts/onload.js M static/scripts/utils/uploadbox.js M static/style/blue/base.css A static/style/blue/bootstrap-tour.css M static/style/blue/masthead.css M templates/admin/reload_tool.mako M templates/base.mako M templates/base/base_panels.mako M templates/js-app.mako M templates/webapps/galaxy/galaxy.masthead.mako M templates/webapps/galaxy/workflow/editor.mako A test/api/test_tours.py A test/api/test_workflow_missing_tool.ga M test/api/test_workflows.py M test/api/test_workflows_from_yaml.py M test/api/workflows_format_2/converter.py A test/functional/tools/inputs_as_json.xml M test/functional/tools/samples_tool_conf.xml M test/qunit/test-app.js A test/qunit/tests/masthead_tests.html A test/qunit/tests/masthead_tests.js A test/qunit/tests/modal_tests.html A test/qunit/tests/modal_tests.js A test/qunit/tests/popover_tests.html A test/qunit/tests/popover_tests.js M test/qunit/tests/workflow_editor_tests.js M test/tool_shed/base/twilltestcase.py M test/unit/jobs/test_command_factory.py M test/unit/jobs/test_job_wrapper.py M test/unit/test_galaxy_mapping.py M test/unit/test_objectstore.py M test/unit/test_routes.py M test/unit/tools/test_actions.py A test/unit/tools/test_conda_resolution.py M test/unit/tools/test_evaluation.py M test/unit/tools/test_parameter_parsing.py M test/unit/tools/test_toolbox.py M test/unit/tools/test_watcher.py M test/unit/workflows/test_modules.py M test/unit/workflows/test_run_parameters.py M test/unit/workflows/test_workflow_progress.py M test/unit/workflows/workflow_support.py M tools/data_source/upload.py M tox.ini Log Message: ----------- Merge branch 'dev' of https://github.com/galaxyproject/galaxy into fix_casper Commit: d844a3489bbfecf3d3a2824e847e99ade6ce707b https://github.com/galaxyproject/galaxy/commit/d844a3489bbfecf3d3a2824e847e9... Author: Dave B <dave@bx.psu.edu> Date: 2016-01-06 (Wed, 06 Jan 2016) Changed paths: M test/casperjs/modules/user.js Log Message: ----------- Remove debugs. Commit: 3b4fd544cecf0498917bdd5a5689b436223361a7 https://github.com/galaxyproject/galaxy/commit/3b4fd544cecf0498917bdd5a5689b... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-01-06 (Wed, 06 Jan 2016) Changed paths: M test/casperjs/api-tool-tests.js M test/casperjs/modules/historyoptions.js M test/casperjs/modules/user.js M test/casperjs/registration-tests.js M test/casperjs/spaceghost.js Log Message: ----------- Merge pull request #1438 from davebx/fix_casper Fix casper tests Compare: https://github.com/galaxyproject/galaxy/compare/2a64f5c9ae10...3b4fd544cecf