Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 143a2db7adf05ba8e34d145327c0aaa467e1a460 https://github.com/galaxyproject/galaxy/commit/143a2db7adf05ba8e34d145327c0a... Author: Manabu ISHII <manabu.ishii.rb@gmail.com> Date: 2017-11-27 (Mon, 27 Nov 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/nls/ja/locale.js Log Message: ----------- Implement Multilingualization support on workflow page Commit: 81bf05494bc0a29ff0bcb6b1ebe741e910ff1886 https://github.com/galaxyproject/galaxy/commit/81bf05494bc0a29ff0bcb6b1ebe74... Author: John Chilton <jmchilton@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M .gitignore M Makefile M client/README.md R client/galaxy/scripts/apps/admin-toolshed.js M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js A client/galaxy/scripts/apps/extended.js R client/galaxy/scripts/apps/library.js R client/galaxy/scripts/apps/masthead.js R client/galaxy/scripts/apps/viz.js R client/galaxy/scripts/apps/workflow.js A client/galaxy/scripts/components/Citations.vue A client/galaxy/scripts/components/HistoryImport.vue A client/galaxy/scripts/components/UserAPIKeys.vue R client/galaxy/scripts/components/citations.vue R client/galaxy/scripts/components/user_api_keys.vue M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/collection/collection-view.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/collection/pair-collection-creator.js M client/galaxy/scripts/mvc/form/form-data.js M client/galaxy/scripts/mvc/form/form-parameters.js M client/galaxy/scripts/mvc/form/form-repeat.js M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/form/form-wrapper.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/scripts/mvc/history/hdca-li.js M client/galaxy/scripts/mvc/history/hdca-model.js M client/galaxy/scripts/mvc/history/history-content-model.js M client/galaxy/scripts/mvc/history/history-contents.js M client/galaxy/scripts/mvc/history/history-model.js M client/galaxy/scripts/mvc/history/history-view.js A client/galaxy/scripts/mvc/history/job-states-model.js M client/galaxy/scripts/mvc/history/multi-panel.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/ui/ui-misc.js M client/galaxy/scripts/mvc/ui/ui-modal.js M client/galaxy/scripts/mvc/ui/ui-portlet.js M client/galaxy/scripts/mvc/ui/ui-slider.js M client/galaxy/scripts/mvc/ui/ui-tabs.js M client/galaxy/scripts/mvc/ui/ui-thumbnails.js M client/galaxy/scripts/mvc/visualization/visualization-model.js M client/galaxy/scripts/mvc/workflow/workflow-canvas.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.js M client/galaxy/scripts/qunit/test.js M client/galaxy/scripts/qunit/tests/form_tests.js R client/galaxy/scripts/qunit/tests/galaxy-app-base.js A client/galaxy/scripts/qunit/tests/galaxy_app_base_tests.js R client/galaxy/scripts/qunit/tests/graph.js A client/galaxy/scripts/qunit/tests/graph_tests.js R client/galaxy/scripts/qunit/tests/hda-base.js A client/galaxy/scripts/qunit/tests/hda_base_tests.js M client/galaxy/scripts/qunit/tests/history_contents_model_tests.js R client/galaxy/scripts/qunit/tests/job-dag.js A client/galaxy/scripts/qunit/tests/job_dag_tests.js R client/galaxy/scripts/qunit/tests/list-of-pairs-collection-creator.js A client/galaxy/scripts/qunit/tests/list_of_pairs_collection_creator_tests.js M client/galaxy/scripts/qunit/tests/masthead_tests.js R client/galaxy/scripts/qunit/tests/metrics-logger.js A client/galaxy/scripts/qunit/tests/metrics_logger_tests.js M client/galaxy/scripts/qunit/tests/modal_tests.js M client/galaxy/scripts/qunit/tests/page_tests.js M client/galaxy/scripts/qunit/tests/popover_tests.js M client/galaxy/scripts/qunit/tests/ui_tests.js M client/galaxy/scripts/qunit/tests/upload_dialog_tests.js R client/galaxy/scripts/qunit/tests/utils_test.js A client/galaxy/scripts/qunit/tests/utils_tests.js M client/galaxy/scripts/qunit/tests/workflow_editor_tests.js M client/galaxy/scripts/utils/utils.js M client/galaxy/scripts/viz/trackster.js M client/galaxy/style/less/base.less M client/galaxy/style/less/dataset.less M client/galaxy/style/less/list-item.less M client/galaxy/style/less/ui.less M client/gulpfile.js M client/karma.config.js M client/package.json M client/webpack.config.js M client/yarn.lock M config/datatypes_conf.xml.sample M config/error_report.yml.sample R config/external_service_types_conf.xml.sample M config/galaxy.ini.sample M config/plugins/interactive_environments/jupyter/config/allowed_images.yml.sample M config/plugins/visualizations/charts/static/client/app.js M config/plugins/visualizations/charts/static/client/components/model.js M config/plugins/visualizations/charts/static/client/components/screenshot.js M config/plugins/visualizations/charts/static/client/views/description.js M config/plugins/visualizations/charts/static/client/views/editor.js M config/plugins/visualizations/charts/static/client/views/groups.js M config/plugins/visualizations/charts/static/client/views/settings.js M config/plugins/visualizations/charts/static/client/views/viewer.js M config/plugins/visualizations/charts/static/client/views/viewport.js M config/plugins/visualizations/charts/webpack.config.js R config/plugins/visualizations/scatterplot/Gruntfile.js R config/plugins/visualizations/scatterplot/src/scatterplot-config-editor.js R config/plugins/visualizations/scatterplot/src/scatterplot-display.js R config/plugins/visualizations/scatterplot/src/scatterplot-model.js M config/plugins/visualizations/scatterplot/src/scatterplot.js M config/plugins/visualizations/scatterplot/static/numeric-column-stats.js R config/plugins/visualizations/scatterplot/static/scatterplot-edit.js A config/plugins/visualizations/scatterplot/static/scatterplot.bundle.js M config/plugins/visualizations/scatterplot/static/worker-stats.js M config/plugins/visualizations/scatterplot/templates/scatterplot.mako A config/plugins/visualizations/scatterplot/webpack.config.js M config/workflow_schedulers_conf.xml.sample M cron/build_chrom_db.py A doc/source/admin/cluster.md M doc/source/admin/index.rst A doc/source/admin/jobs.md A doc/source/admin/production.md A doc/source/admin/scaling.md A doc/source/admin/special_topics/apache.md A doc/source/admin/special_topics/ftp.md M doc/source/admin/special_topics/index.rst A doc/source/admin/special_topics/job_metrics.md A doc/source/admin/special_topics/nginx.md M doc/source/conf.py R external_service_types/454_life_sciences.xml R external_service_types/applied_biosystems_solid.xml R external_service_types/pacific_biosciences_smrt_portal.xml R external_service_types/simple_unknown_sequencer.xml M lib/galaxy/actions/library.py M lib/galaxy/app.py M lib/galaxy/config.py M lib/galaxy/dataset_collections/builder.py M lib/galaxy/dataset_collections/matching.py M lib/galaxy/dataset_collections/structure.py M lib/galaxy/dataset_collections/type_description.py M lib/galaxy/datatypes/annotation.py M lib/galaxy/datatypes/assembly.py M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/blast.py M lib/galaxy/datatypes/constructive_solid_geometry.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/graph.py M lib/galaxy/datatypes/images.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/mothur.py M lib/galaxy/datatypes/msa.py M lib/galaxy/datatypes/plant_tribes.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/registry.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py A lib/galaxy/datatypes/test/454Score.pdf M lib/galaxy/datatypes/text.py M lib/galaxy/datatypes/triples.py M lib/galaxy/datatypes/xml.py M lib/galaxy/dependencies/conda-environment.txt M lib/galaxy/dependencies/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/dependencies/pipfiles/flake8/Pipfile M lib/galaxy/dependencies/pipfiles/flake8/Pipfile.lock M lib/galaxy/dependencies/pipfiles/flake8/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pipfiles/flake8/pinned-requirements.txt M lib/galaxy/dependencies/requirements.txt R lib/galaxy/external_services/__init__.py R lib/galaxy/external_services/actions.py R lib/galaxy/external_services/parameters.py R lib/galaxy/external_services/result_handlers/__init__.py R lib/galaxy/external_services/result_handlers/basic.py R lib/galaxy/external_services/service.py M lib/galaxy/jobs/__init__.py R lib/galaxy/jobs/deferred/__init__.py R lib/galaxy/jobs/deferred/data_transfer.py R lib/galaxy/jobs/deferred/manual_data_transfer.py R lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py M lib/galaxy/jobs/handler.py M lib/galaxy/jobs/manager.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/condor.py M lib/galaxy/jobs/runners/state_handlers/resubmit.py M lib/galaxy/managers/collections.py M lib/galaxy/managers/collections_util.py M lib/galaxy/managers/context.py M lib/galaxy/managers/hdcas.py M lib/galaxy/managers/jobs.py M lib/galaxy/model/__init__.py M lib/galaxy/model/mapping.py M lib/galaxy/model/metadata.py M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py A lib/galaxy/model/migrate/versions/0136_collection_and_workflow_state.py M lib/galaxy/model/orm/scripts.py M lib/galaxy/model/tool_shed_install/__init__.py R lib/galaxy/sample_tracking/__init__.py R lib/galaxy/sample_tracking/data_transfer.py R lib/galaxy/sample_tracking/external_service_types.py R lib/galaxy/sample_tracking/request_types.py R lib/galaxy/sample_tracking/sample.py M lib/galaxy/security/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/actions/history_imp_exp.py M lib/galaxy/tools/actions/metadata.py M lib/galaxy/tools/actions/model_operations.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/data/__init__.py M lib/galaxy/tools/error_reports/plugins/sentry.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/execute.py M lib/galaxy/tools/imp_exp/imp_history_from_archive.xml M lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parameters/wrapped.py M lib/galaxy/tools/parser/output_objects.py A lib/galaxy/tools/repositories.py M lib/galaxy/tools/toolbox/filters/__init__.py M lib/galaxy/tools/toolbox/integrated_panel.py M lib/galaxy/tools/verify/__init__.py M lib/galaxy/tools/wrappers.py M lib/galaxy/util/compression_utils.py A lib/galaxy/util/facts.py M lib/galaxy/util/handlers.py M lib/galaxy/util/image_util.py R lib/galaxy/util/multi_byte.py M lib/galaxy/util/path/__init__.py M lib/galaxy/util/properties.py A lib/galaxy/util/renamed_temporary_file.py M lib/galaxy/web/base/controller.py M lib/galaxy/web/form_builder.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/stack/__init__.py A lib/galaxy/web/stack/message.py A lib/galaxy/web/stack/transport.py M lib/galaxy/webapps/galaxy/api/histories.py M lib/galaxy/webapps/galaxy/api/history_contents.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/library.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/tool_shed/api/tools.py M lib/galaxy/webapps/tool_shed/config.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/controllers/upload.py M lib/galaxy/work/context.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run.py M lib/galaxy/workflow/scheduling_manager.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/galaxy_install/migrate/check.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/metadata/repository_metadata_manager.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/tool_util.py M lib/tool_shed/util/workflow_util.py R manage_tools.sh M run.sh M run_reports.sh M run_tool_shed.sh M scripts/api/data_manager_example_execute.py M scripts/api/display.py M scripts/common_startup_functions.sh M scripts/db_shell.py M scripts/galaxy-main A scripts/get_uwsgi_args.py R scripts/manage_tools.py M scripts/microbes/harvest_bacteria.py R static/GruntFile.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/adminToolshed.bundled.js M static/scripts/bundled/analysis.bundled.js A static/scripts/bundled/extended.bundled.js M static/scripts/bundled/library.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/login.bundled.js M static/scripts/bundled/masthead.bundled.js M static/scripts/bundled/viz.bundled.js M static/scripts/bundled/workflow.bundled.js M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/collection/collection-view-edit.js M static/scripts/mvc/collection/collection-view.js M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/pair-collection-creator.js M static/scripts/mvc/form/form-data.js M static/scripts/mvc/form/form-repeat.js M static/scripts/mvc/form/form-view.js M static/scripts/mvc/form/form-wrapper.js M static/scripts/mvc/history/hdca-li-edit.js M static/scripts/mvc/history/hdca-li.js M static/scripts/mvc/history/hdca-model.js M static/scripts/mvc/history/history-content-model.js M static/scripts/mvc/history/history-contents.js M static/scripts/mvc/history/history-model.js M static/scripts/mvc/history/history-view.js A static/scripts/mvc/history/job-states-model.js M static/scripts/mvc/history/multi-panel.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/ui/ui-misc.js M static/scripts/mvc/ui/ui-modal.js M static/scripts/mvc/ui/ui-portlet.js M static/scripts/mvc/ui/ui-tabs.js M static/scripts/mvc/ui/ui-thumbnails.js M static/scripts/mvc/visualization/visualization-model.js M static/scripts/mvc/workflow/workflow-canvas.js M static/scripts/mvc/workflow/workflow-manager.js M static/scripts/mvc/workflow/workflow-node.js M static/scripts/mvc/workflow/workflow-view.js A static/scripts/packed M static/scripts/utils/utils.js M static/scripts/viz/trackster.js M static/style/blue/base.css M templates/webapps/galaxy/base_panels.mako R templates/webapps/galaxy/external_services/generic_jquery_grid.mako R templates/webapps/galaxy/external_services/generic_json.mako R templates/webapps/galaxy/external_services/json_common.mako M templates/webapps/galaxy/galaxy.masthead.mako M templates/webapps/galaxy/galaxy.panels.mako M templates/webapps/galaxy/workflow/editor.mako M test-data/1.fastqsanger M test-data/1.fastqsolexa M test-data/simple_line_alternative.txt M test-data/simple_lines_interleaved.txt M test/api/test_api_batch.py M test/api/test_authenticate.py M test/api/test_dataset_collections.py M test/api/test_datatypes.py M test/api/test_histories.py M test/api/test_history_contents.py M test/api/test_jobs.py M test/api/test_pages.py M test/api/test_tools.py M test/api/test_users.py M test/api/test_visualizations.py M test/api/test_webhooks.py M test/api/test_workflow_extraction.py M test/api/test_workflows.py M test/base/driver_util.py M test/base/integration_util.py M test/base/populators.py M test/functional/test_toolbox.py M test/functional/tools/bibtex.xml M test/functional/tools/collection_creates_dynamic_nested.xml M test/functional/tools/collection_creates_dynamic_nested_fail.xml A test/functional/tools/config_vars.xml A test/functional/tools/for_workflows/count_list.xml A test/functional/tools/for_workflows/count_multi_file.xml A test/functional/tools/for_workflows/empty_list.xml A test/functional/tools/identifier_in_actions.xml A test/functional/tools/output_filter_with_input.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml M test/functional/twilltestcase.py M test/galaxy_selenium/components.py M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml M test/galaxy_selenium/smart_components.py M test/integration/test_data_manager_table_reload.py M test/integration/test_local_job_cancellation.py R test/integration/test_maximum_worklfow_invocation_duration.py A test/integration/test_mules_as_job_handlers.py M test/integration/test_workflow_handler_configuration.py A test/integration/test_workflow_scheduling_options.py M test/manual/workflows_scaling.py M test/selenium_tests/framework.py A test/selenium_tests/test_history_copy_elements.py A test/selenium_tests/test_history_multi_view.py A test/selenium_tests/test_history_panel_collections.py A test/selenium_tests/test_history_panel_pagination.py M test/selenium_tests/test_tool_form.py M test/shed_functional/base/test_db_util.py M test/shed_functional/base/twilltestcase.py M test/shed_functional/functional_tests.py A test/shed_functional/test_data/bowtie2_loc_sample/bowtie2_indices.loc.sample M test/unit/dataset_collections/test_matching.py M test/unit/jobs/test_job_configuration.py A test/unit/tools/test_tool_validation.py M test/unit/unittest_utils/galaxy_mock.py M test/unit/workflows/test_workflow_progress.py M tools/data_source/data_source.py M tools/data_source/upload.py Log Message: ----------- Merge remote-tracking branch 'jmchilton/dev' into workflow_page_translation Commit: e93821152432081dcfa08b1550e6c4d11e22abf7 https://github.com/galaxyproject/galaxy/commit/e93821152432081dcfa08b1550e6c... Author: John Chilton <jmchilton@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/workflow/workflow.js M static/scripts/nls/ja/locale.js Log Message: ----------- Repack to merge PR. Commit: c0b1337f26b4072dca8cdf0144a28799b524d3c0 https://github.com/galaxyproject/galaxy/commit/c0b1337f26b4072dca8cdf0144a28... Author: John Chilton <jmchilton@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/nls/ja/locale.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/workflow/workflow.js M static/scripts/nls/ja/locale.js Log Message: ----------- Merge pull request #5077 from manabuishii/workflow_page_translation Implement Multilingualization support on workflow page Compare: https://github.com/galaxyproject/galaxy/compare/30e2736cc4fc...c0b1337f26b4