Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c5fa911b10e90229940bf65467a1610f3b23ee2c https://github.com/galaxyproject/galaxy/commit/c5fa911b10e90229940bf65467a16... Author: Anthony Bretaudeau <anthony.bretaudeau@inria.fr> Date: 2018-01-09 (Tue, 09 Jan 2018) Changed paths: M client/galaxy/scripts/utils/localization.js M config/galaxy.ini.sample M config/user_preferences_extra_conf.yml.sample Log Message: ----------- draft configurable locale Commit: 1c2bd5ff284925ccadc8957bb2dc40eba33f988f https://github.com/galaxyproject/galaxy/commit/1c2bd5ff284925ccadc8957bb2dc4... Author: Anthony Bretaudeau <anthony.bretaudeau@inria.fr> Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: M client/galaxy/scripts/galaxy.js M client/galaxy/scripts/utils/localization.js M lib/galaxy/config.py M lib/galaxy/managers/configuration.py M templates/webapps/galaxy/galaxy.masthead.mako Log Message: ----------- use session to store current locale Commit: 8d1a499e42bd7c71ec9b5e727a28a8ef9b3973ed https://github.com/galaxyproject/galaxy/commit/8d1a499e42bd7c71ec9b5e727a28a... Author: Anthony Bretaudeau <anthony.bretaudeau@inria.fr> Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: M .ci/jenkins/selenium/run_tests.sh M .gitignore M .travis.yml M Makefile M client/galaxy/scripts/components/Citations.vue M client/galaxy/scripts/components/HistoryImport.vue M client/galaxy/scripts/components/Message.vue M client/galaxy/scripts/components/admin/BaseGrid.vue M client/galaxy/scripts/components/admin/DataManagerGrid.vue M client/galaxy/scripts/components/admin/DataTables.vue M client/galaxy/scripts/components/admin/DataTablesGrid.vue M client/galaxy/scripts/mvc/dataset/dataset-error.js M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/tours.js M client/galaxy/scripts/mvc/workflow/workflow-node.js M client/galaxy/scripts/nls/zh/locale.js M client/package.json M client/webpack.config.js M client/yarn.lock M config/datatypes_conf.xml.sample R config/galaxy.ini.sample A config/galaxy.yml.sample M doc/Makefile A doc/source/admin/_inc_proxy_prereq.rst A doc/source/admin/_inc_proxy_serving_root.rst A doc/source/admin/_inc_proxy_ssl.rst A doc/source/admin/apache.md M doc/source/admin/authentication.md M doc/source/admin/cluster.md M doc/source/admin/conda_faq.rst A doc/source/admin/config.rst A doc/source/admin/config_logging.rst M doc/source/admin/dependency_resolvers.rst A doc/source/admin/galaxy_options.rst M doc/source/admin/index.rst M doc/source/admin/jobs.md A doc/source/admin/nginx.md A doc/source/admin/options.rst M doc/source/admin/production.md A doc/source/admin/proxy_package_layout.rst M doc/source/admin/reports.md M doc/source/admin/reports.rst M doc/source/admin/scaling.md R doc/source/admin/special_topics/apache.md M doc/source/admin/special_topics/bug_reports.rst M doc/source/admin/special_topics/chat.rst M doc/source/admin/special_topics/ftp.md M doc/source/admin/special_topics/index.rst M doc/source/admin/special_topics/interactive_environments.rst R doc/source/admin/special_topics/nginx.md M doc/source/admin/special_topics/performance_tracking.rst M doc/source/admin/special_topics/webhooks.rst M doc/source/admin/tool_panel.rst M doc/source/conf.py M lib/galaxy/config.py M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/msa.py A lib/galaxy/datatypes/test/infernal_model.cm M lib/galaxy/jobs/__init__.py M lib/galaxy/managers/library_datasets.py M lib/galaxy/model/migrate/check.py M lib/galaxy/objectstore/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/data_manager/manager.py M lib/galaxy/tools/error_reports/plugins/sentry.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/parser/output_collection_def.py M lib/galaxy/tools/toolbox/filters/__init__.py M lib/galaxy/tools/toolbox/watcher.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/util/path/__init__.py M lib/galaxy/web/stack/__init__.py M lib/galaxy/webapps/config_manage.py M lib/galaxy/webapps/galaxy/api/configuration.py A lib/galaxy/webapps/galaxy/config_schema.yml M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py A lib/galaxy/webapps/galaxy/uwsgi_schema.yml M lib/galaxy/webapps/reports/config.py M lib/galaxy/webapps/tool_shed/config.py M lib/galaxy/workflow/modules.py M scripts/common_startup.sh M scripts/common_startup_functions.sh A scripts/common_startup_variables.sh M scripts/db_shell.py M scripts/galaxy-main M scripts/get_uwsgi_args.py A scripts/maintenance.sh M scripts/tool_shed/bootstrap_tool_shed/bootstrap_tool_shed.sh M scripts/tool_shed/bootstrap_tool_shed/bootstrap_util.py M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/extended.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/dataset/dataset-error.js M static/scripts/mvc/tool/tool-form-composite.js M static/scripts/mvc/workflow/workflow-node.js M static/scripts/nls/zh/locale.js M templates/webapps/galaxy/history/display_structured.mako M test/api/test_workflows.py M test/base/driver_util.py M test/docker/base/run_test_wrapper.sh A test/functional/tools/multi_output_recurse.xml M test/functional/tools/samples_tool_conf.xml A test/unit/config/1705_allow_path_paste/config/galaxy.ini A test/unit/config/__init__.py M test/unit/config/test_config_manage.py M test/unit/tools/test_collect_primary_datasets.py M tools/data_source/microbial_import_code.py Log Message: ----------- ini -> yml Commit: 3f2f5e6af4890d5edd1001844bf2c5eb9275daa6 https://github.com/galaxyproject/galaxy/commit/3f2f5e6af4890d5edd1001844bf2c... Author: Anthony Bretaudeau <anthony.bretaudeau@inria.fr> Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: M doc/source/admin/galaxy_options.rst M lib/galaxy/webapps/galaxy/config_schema.yml Log Message: ----------- doc/schema Commit: dfe25ac131582a5315369ef8ba4e94abff7bff94 https://github.com/galaxyproject/galaxy/commit/dfe25ac131582a5315369ef8ba4e9... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-02-05 (Mon, 05 Feb 2018) Changed paths: M client/galaxy/scripts/galaxy.js M client/galaxy/scripts/mvc/tool/tool-form.js Log Message: ----------- Client format Commit: 02fa48f85cdaa1ed0722f050b6953d6bbe7113c7 https://github.com/galaxyproject/galaxy/commit/02fa48f85cdaa1ed0722f050b6953... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-02-05 (Mon, 05 Feb 2018) Changed paths: M client/galaxy/scripts/galaxy.js Log Message: ----------- Define locale var, log global usage of $ Commit: c3bb2859039338c513e1f9ac871dc569d5469e5c https://github.com/galaxyproject/galaxy/commit/c3bb2859039338c513e1f9ac871dc... Author: Anthony Bretaudeau <abretaud@irisa.fr> Date: 2018-02-07 (Wed, 07 Feb 2018) Changed paths: M client/galaxy/scripts/galaxy.js M client/galaxy/scripts/mvc/tool/tool-form.js Log Message: ----------- Merge pull request #2 from dannon/i18n Minor tweaks to i18n work Commit: 4dbfd50f064256f2af8f7e3b08ddbb8a2b352aac https://github.com/galaxyproject/galaxy/commit/4dbfd50f064256f2af8f7e3b08ddb... Author: Anthony Bretaudeau <abretaud@irisa.fr> Date: 2018-02-07 (Wed, 07 Feb 2018) Changed paths: M .ci/check_py3_compatibility.sh M .ci/flake8_blacklist.txt M .ci/flake8_wrapper.sh M .ci/flake8_wrapper_docstrings.sh M .ci/jenkins/api/run_tests.sh M .ci/jenkins/selenium-compose/run_tests.sh M .ci/jenkins/selenium/run_tests.sh M .gitignore M .travis.yml M client/galaxy/scripts/apps/extended.js 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/mvc/base/controlled-fetch-collection.js M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/hdca-li-edit.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/multi-panel.js M client/galaxy/scripts/mvc/history/options-menu.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/tool/tool-form.js M client/galaxy/scripts/mvc/webhooks.js M client/galaxy/scripts/mvc/workflow/workflow-node.js M client/galaxy/scripts/onload.js M client/galaxy/scripts/qunit/test-app.js M client/galaxy/scripts/qunit/tests/page_tests.js M client/galaxy/style/less/base.less M client/galaxy/style/less/dataset.less M client/galaxy/style/less/history.less M client/galaxy/style/less/ui/icon-btn.less M config/auth_conf.xml.sample M config/datatypes_conf.xml.sample M config/galaxy.yml.sample M config/job_conf.xml.sample_advanced A config/plugins/webhooks/demo/search/config.yml R config/plugins/webhooks/demo/search/config/searchover.yaml A config/plugins/webhooks/demo/search/script.js R config/plugins/webhooks/demo/search/static/script.js R config/plugins/webhooks/demo/search/static/styles.css A config/plugins/webhooks/demo/search/styles.css A config/plugins/webhooks/demo/tool_list/__init__.py A config/plugins/webhooks/demo/tool_list/config.yml R config/plugins/webhooks/demo/tool_list/config/tool_list.yml R config/plugins/webhooks/demo/tool_list/helper/__init__.py A config/plugins/webhooks/demo/tour_generator/__init__.py A config/plugins/webhooks/demo/tour_generator/config.yml R config/plugins/webhooks/demo/tour_generator/config/tour_generator.yml R config/plugins/webhooks/demo/tour_generator/helper/__init__.py A config/plugins/webhooks/demo/tour_generator/script.js R config/plugins/webhooks/demo/tour_generator/static/script.js R config/plugins/webhooks/demo/tour_generator/static/styles.css A config/plugins/webhooks/demo/tour_generator/styles.css M config/tool_shed.yml.sample M doc/Makefile M doc/source/admin/dependency_resolvers.rst M doc/source/admin/framework_dependencies.rst M doc/source/admin/galaxy_options.rst M doc/source/admin/scaling.md M doc/source/admin/special_topics/webhooks.rst M lib/galaxy/app.py M lib/galaxy/auth/__init__.py M lib/galaxy/auth/providers/ldap_ad.py A lib/galaxy/auth/util.py M lib/galaxy/config.py M lib/galaxy/dataset_collections/structure.py M lib/galaxy/datatypes/binary.py A lib/galaxy/datatypes/converters/bam_native_to_bam_converter.xml M lib/galaxy/datatypes/converters/bam_to_bigwig_converter.xml M lib/galaxy/datatypes/converters/sam_to_bam.py A lib/galaxy/datatypes/converters/sam_to_bam_native.xml A lib/galaxy/datatypes/phylip.py M lib/galaxy/datatypes/sniff.py A lib/galaxy/datatypes/test/test.phylip R lib/galaxy/dependencies/conda-environment.txt A lib/galaxy/dependencies/conda-file.sh M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/dependencies/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/dependencies/pipfiles/develop/Pipfile M lib/galaxy/dependencies/pipfiles/develop/Pipfile.lock M lib/galaxy/dependencies/pipfiles/develop/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pipfiles/develop/pinned-requirements.txt M lib/galaxy/dependencies/requirements.txt M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/actions/post.py M lib/galaxy/jobs/rule_helper.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh M lib/galaxy/jobs/runners/util/job_script/__init__.py M lib/galaxy/managers/collections.py M lib/galaxy/managers/configuration.py M lib/galaxy/model/__init__.py M lib/galaxy/model/custom_types.py M lib/galaxy/model/mapping.py M lib/galaxy/model/tool_shed_install/__init__.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/model_operations.py M lib/galaxy/tools/data/__init__.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/commands.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/docker_util.py M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/util.py M lib/galaxy/tools/deps/resolvers/conda.py M 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/merge_collection.xml M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/parameters/sanitize.py M lib/galaxy/tools/parser/interface.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/integrated_panel.py M lib/galaxy/tools/toolbox/lineages/interface.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/util/dictifiable.py M lib/galaxy/util/facts.py M lib/galaxy/util/handlers.py M lib/galaxy/util/logging/__init__.py M lib/galaxy/version.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/web/framework/base.py M lib/galaxy/web/framework/helpers/__init__.py A lib/galaxy/web/framework/helpers/tags.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/security/__init__.py M lib/galaxy/web/stack/message.py M lib/galaxy/webapps/config_manage.py M lib/galaxy/webapps/galaxy/api/histories.py M lib/galaxy/webapps/galaxy/api/history_contents.py M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/api/webhooks.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/config_schema.yml M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/tool_shed/config_schema.yml M lib/galaxy/webapps/tool_shed/model/__init__.py M lib/galaxy/webhooks/__init__.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/scheduling_manager.py M lib/tool_shed/galaxy_install/migrate/common.py M lib/tool_shed/util/admin_util.py M lib/tool_shed/util/repository_util.py M lib/tool_shed/util/xml_util.py M run_tests.sh M scripts/cleanup_datasets/cleanup_datasets.py M scripts/common_startup.sh M scripts/db_shell.py A scripts/dump_library_paths.py M scripts/functional_tests.py R static/scripts/admin.toolshed.js R static/scripts/bundled/admin.bundled.js R static/scripts/bundled/analysis.bundled.js R static/scripts/bundled/extended.bundled.js R static/scripts/bundled/libs.bundled.js R static/scripts/bundled/login.bundled.js R static/scripts/galaxy.interactive_environments.js R static/scripts/galaxy.js R static/scripts/galaxy.library.js R static/scripts/galaxy.pages.js R static/scripts/i18n.js R static/scripts/layout/generic-nav-view.js R static/scripts/layout/masthead.js R static/scripts/layout/menu.js R static/scripts/layout/modal.js R static/scripts/layout/page.js R static/scripts/layout/panel.js R static/scripts/layout/router.js R static/scripts/layout/scratchbook.js R static/scripts/legacy/grid/grid-model.js R static/scripts/legacy/grid/grid-template.js R static/scripts/legacy/grid/grid-view.js R static/scripts/libs/backbone.js R static/scripts/libs/bbi/bigwig.js R static/scripts/libs/bbi/jquery-ajax-native.js R static/scripts/libs/bbi/jszlib.js R static/scripts/libs/bbi/spans.js R static/scripts/libs/bibtexParse.js R static/scripts/libs/bootstrap-tour.js R static/scripts/libs/bootstrap.js R static/scripts/libs/d3.js R static/scripts/libs/farbtastic.js R static/scripts/libs/jquery.sparklines.js R static/scripts/libs/jquery/jquery-ui.js R static/scripts/libs/jquery/jquery.autocomplete.js R static/scripts/libs/jquery/jquery.complexify.js R static/scripts/libs/jquery/jquery.cookie.js R static/scripts/libs/jquery/jquery.dynatree.js R static/scripts/libs/jquery/jquery.event.drag.js R static/scripts/libs/jquery/jquery.event.drop.js R static/scripts/libs/jquery/jquery.event.hover.js R static/scripts/libs/jquery/jquery.form.js R static/scripts/libs/jquery/jquery.js R static/scripts/libs/jquery/jquery.migrate.js R static/scripts/libs/jquery/jquery.mousewheel.js R static/scripts/libs/jquery/jquery.rating.js R static/scripts/libs/jquery/jquery.wymeditor.js R static/scripts/libs/jquery/jstorage.js R static/scripts/libs/jquery/jstree.js R static/scripts/libs/jquery/select2.js R static/scripts/libs/raven.js R static/scripts/libs/require.js R static/scripts/libs/toastr.js R static/scripts/libs/underscore.js R static/scripts/mvc/annotation.js R static/scripts/mvc/base-mvc.js R static/scripts/mvc/base/controlled-fetch-collection.js R static/scripts/mvc/collection/base-creator.js R static/scripts/mvc/collection/collection-li-edit.js R static/scripts/mvc/collection/collection-li.js R static/scripts/mvc/collection/collection-model.js R static/scripts/mvc/collection/collection-view-edit.js R static/scripts/mvc/collection/collection-view.js R static/scripts/mvc/collection/list-collection-creator.js R static/scripts/mvc/collection/list-of-pairs-collection-creator.js R static/scripts/mvc/collection/pair-collection-creator.js R static/scripts/mvc/dataset/data.js R static/scripts/mvc/dataset/dataset-choice.js R static/scripts/mvc/dataset/dataset-edit-attributes.js R static/scripts/mvc/dataset/dataset-error.js R static/scripts/mvc/dataset/dataset-li-edit.js R static/scripts/mvc/dataset/dataset-li.js R static/scripts/mvc/dataset/dataset-list.js R static/scripts/mvc/dataset/dataset-model.js R static/scripts/mvc/dataset/states.js R static/scripts/mvc/form/form-data.js R static/scripts/mvc/form/form-input.js R static/scripts/mvc/form/form-parameters.js R static/scripts/mvc/form/form-repeat.js R static/scripts/mvc/form/form-section.js R static/scripts/mvc/form/form-view.js R static/scripts/mvc/form/form-wrapper.js R static/scripts/mvc/grid/grid-model.js R static/scripts/mvc/grid/grid-shared.js R static/scripts/mvc/grid/grid-template.js R static/scripts/mvc/grid/grid-view.js R static/scripts/mvc/history/copy-dialog.js R static/scripts/mvc/history/hda-li-edit.js R static/scripts/mvc/history/hda-li.js R static/scripts/mvc/history/hda-model.js R static/scripts/mvc/history/hdca-li-edit.js R static/scripts/mvc/history/hdca-li.js R static/scripts/mvc/history/hdca-model.js R static/scripts/mvc/history/history-content-model.js R static/scripts/mvc/history/history-contents.js R static/scripts/mvc/history/history-item-li.js R static/scripts/mvc/history/history-list.js R static/scripts/mvc/history/history-model.js R static/scripts/mvc/history/history-preferences.js R static/scripts/mvc/history/history-structure-view.js R static/scripts/mvc/history/history-view-annotated.js R static/scripts/mvc/history/history-view-edit-current.js R static/scripts/mvc/history/history-view-edit.js R static/scripts/mvc/history/history-view.js R static/scripts/mvc/history/job-dag.js R static/scripts/mvc/history/job-states-model.js R static/scripts/mvc/history/multi-panel.js R static/scripts/mvc/history/options-menu.js R static/scripts/mvc/job/job-li.js R static/scripts/mvc/job/job-model.js R static/scripts/mvc/job/job-params.js R static/scripts/mvc/lazy/lazy-limited.js R static/scripts/mvc/library/library-dataset-view.js R static/scripts/mvc/library/library-folder-view.js R static/scripts/mvc/library/library-folderlist-view.js R static/scripts/mvc/library/library-folderrow-view.js R static/scripts/mvc/library/library-foldertoolbar-view.js R static/scripts/mvc/library/library-library-view.js R static/scripts/mvc/library/library-librarylist-view.js R static/scripts/mvc/library/library-libraryrow-view.js R static/scripts/mvc/library/library-librarytoolbar-view.js R static/scripts/mvc/library/library-model.js R static/scripts/mvc/library/library-util.js R static/scripts/mvc/list/list-item.js R static/scripts/mvc/list/list-view.js R static/scripts/mvc/tag.js R static/scripts/mvc/tool/tool-form-base.js R static/scripts/mvc/tool/tool-form-composite.js R static/scripts/mvc/tool/tool-form.js R static/scripts/mvc/tool/tool-genomespace.js R static/scripts/mvc/tool/tools.js R static/scripts/mvc/toolshed/categories-view.js R static/scripts/mvc/toolshed/repo-queue-view.js R static/scripts/mvc/toolshed/repo-status-view.js R static/scripts/mvc/toolshed/repositories-view.js R static/scripts/mvc/toolshed/repository-queue-view.js R static/scripts/mvc/toolshed/repository-view.js R static/scripts/mvc/toolshed/shed-list-view.js R static/scripts/mvc/toolshed/toolshed-model.js R static/scripts/mvc/toolshed/util.js R static/scripts/mvc/toolshed/workflows-view.js R static/scripts/mvc/tours.js R static/scripts/mvc/ui/error-modal.js R static/scripts/mvc/ui/icon-button.js R static/scripts/mvc/ui/popup-menu.js R static/scripts/mvc/ui/ui-buttons.js R static/scripts/mvc/ui/ui-color-picker.js R static/scripts/mvc/ui/ui-drilldown.js R static/scripts/mvc/ui/ui-frames.js R static/scripts/mvc/ui/ui-list.js R static/scripts/mvc/ui/ui-misc.js R static/scripts/mvc/ui/ui-modal.js R static/scripts/mvc/ui/ui-options.js R static/scripts/mvc/ui/ui-popover.js R static/scripts/mvc/ui/ui-portlet.js R static/scripts/mvc/ui/ui-select-content.js R static/scripts/mvc/ui/ui-select-default.js R static/scripts/mvc/ui/ui-select-ftp.js R static/scripts/mvc/ui/ui-select-genomespace.js R static/scripts/mvc/ui/ui-select-library.js R static/scripts/mvc/ui/ui-select.js R static/scripts/mvc/ui/ui-slider.js R static/scripts/mvc/ui/ui-table.js R static/scripts/mvc/ui/ui-tabs.js R static/scripts/mvc/ui/ui-thumbnails.js R static/scripts/mvc/upload/collection/collection-row.js R static/scripts/mvc/upload/collection/collection-view.js R static/scripts/mvc/upload/composite/composite-row.js R static/scripts/mvc/upload/composite/composite-view.js R static/scripts/mvc/upload/default/default-row.js R static/scripts/mvc/upload/default/default-view.js R static/scripts/mvc/upload/upload-button.js R static/scripts/mvc/upload/upload-extension.js R static/scripts/mvc/upload/upload-ftp.js R static/scripts/mvc/upload/upload-model.js R static/scripts/mvc/upload/upload-settings.js R static/scripts/mvc/upload/upload-view.js R static/scripts/mvc/user/user-custom-builds.js R static/scripts/mvc/user/user-model.js R static/scripts/mvc/user/user-preferences.js R static/scripts/mvc/user/user-quotameter.js R static/scripts/mvc/visualization/visualization-model.js R static/scripts/mvc/webhooks.js R static/scripts/mvc/workflow/workflow-canvas.js R static/scripts/mvc/workflow/workflow-connector.js R static/scripts/mvc/workflow/workflow-forms.js R static/scripts/mvc/workflow/workflow-icons.js R static/scripts/mvc/workflow/workflow-manager.js R static/scripts/mvc/workflow/workflow-model.js R static/scripts/mvc/workflow/workflow-node.js R static/scripts/mvc/workflow/workflow-terminals.js R static/scripts/mvc/workflow/workflow-view-data.js R static/scripts/mvc/workflow/workflow-view-node.js R static/scripts/mvc/workflow/workflow-view-terminals.js R static/scripts/mvc/workflow/workflow-view.js R static/scripts/mvc/workflow/workflow.js R static/scripts/nls/de/locale.js R static/scripts/nls/es/locale.js R static/scripts/nls/fr/locale.js R static/scripts/nls/ja/locale.js R static/scripts/nls/locale.js R static/scripts/nls/zh/locale.js R static/scripts/onload.js R static/scripts/polyfills.js R static/scripts/reports/run_stats.js R static/scripts/toolshed/groups/group-detail-view.js R static/scripts/toolshed/groups/group-list-view.js R static/scripts/toolshed/groups/group-listrow-view.js R static/scripts/toolshed/groups/group-model.js R static/scripts/toolshed/toolshed.groups.js R static/scripts/ui/autocom_tagging.js R static/scripts/ui/editable-text.js R static/scripts/ui/fa-icon-button.js R static/scripts/ui/filter-control.js R static/scripts/ui/hoverhighlight.js R static/scripts/ui/loading-indicator.js R static/scripts/ui/mode-button.js R static/scripts/ui/pagination.js R static/scripts/ui/peek-column-selector.js R static/scripts/ui/popupmenu.js R static/scripts/ui/scroll-panel.js R static/scripts/ui/search-input.js R static/scripts/utils/add-logging.js R static/scripts/utils/ajax-queue.js R static/scripts/utils/async-save-text.js R static/scripts/utils/config.js R static/scripts/utils/deferred.js R static/scripts/utils/graph.js R static/scripts/utils/levenshtein.js R static/scripts/utils/localization.js R static/scripts/utils/metrics-logger.js R static/scripts/utils/natural-sort.js R static/scripts/utils/query-string-parsing.js R static/scripts/utils/uploadbox.js R static/scripts/utils/utils.js R static/scripts/viz/bbi-data-manager.js R static/scripts/viz/circster.js R static/scripts/viz/phyloviz.js R static/scripts/viz/sweepster.js R static/scripts/viz/trackster.js R static/scripts/viz/trackster/filters.js R static/scripts/viz/trackster/painters.js R static/scripts/viz/trackster/slotting.js R static/scripts/viz/trackster/tracks.js R static/scripts/viz/trackster/util.js R static/scripts/viz/visualization.js R static/scripts/viz/viz_views.js M templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako M templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako M templates/admin/tool_shed_repository/reset_metadata_on_selected_repositories.mako M templates/galaxy_client_app.mako M templates/user/register.mako M templates/webapps/galaxy/dataset/security_common.mako M templates/webapps/galaxy/history/display_structured.mako M templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako M templates/webapps/tool_shed/repository/tool_form.mako A test-data/bam_native_from_sam.bam M test-data/sam_with_header.sam M test/api/test_tools.py M test/api/test_webhooks.py M test/api/test_workflows.py M test/base/driver_util.py M test/base/integration_util.py M test/base/workflows_format_2/converter.py M test/functional/tools/collection_creates_dynamic_list_of_pairs.xml A test/functional/tools/job_environment_default.xml A test/functional/tools/job_environment_default_legacy.xml A test/functional/tools/job_environment_explicit_shared_home.xml A test/functional/tools/mulled_example_explicit.xml A test/functional/tools/mulled_example_simple.xml A test/functional/tools/sam_to_bam_native.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml M test/functional/twilltestcase.py A test/functional/webhooks/history_test1/config.yml R test/functional/webhooks/history_test1/config/history_test1.yml A test/functional/webhooks/history_test2/config.yml R test/functional/webhooks/history_test2/config/history_test2.yml A test/functional/webhooks/masthead_test/config.yml R test/functional/webhooks/masthead_test/config/masthead_test.yml A test/functional/webhooks/phdcomics/__init__.py A test/functional/webhooks/phdcomics/config.yaml R test/functional/webhooks/phdcomics/config/phdcomics.yaml R test/functional/webhooks/phdcomics/helper/__init__.py A test/functional/webhooks/phdcomics/script.js R test/functional/webhooks/phdcomics/static/script.js R test/functional/webhooks/phdcomics/static/styles.css A test/functional/webhooks/phdcomics/styles.css A test/functional/webhooks/trans_object/__init__.py A test/functional/webhooks/trans_object/config.yaml R test/functional/webhooks/trans_object/config/trans_object.yaml R test/functional/webhooks/trans_object/helper/__init__.py A test/functional/webhooks/xkcd/config.yml R test/functional/webhooks/xkcd/config/xkcd.yml A test/functional/webhooks/xkcd/script.js R test/functional/webhooks/xkcd/static/script.js R test/functional/webhooks/xkcd/static/styles.css A test/functional/webhooks/xkcd/styles.css A test/integration/dockerized_job_conf.xml A test/integration/sets_tmp_dir_expression_job_conf.xml A test/integration/sets_tmp_dir_to_true_job_conf.xml A test/integration/simple_job_conf.xml A test/integration/test_dockerized_jobs.py A test/integration/test_job_environments.py M test/manual/launch_and_run.sh M test/selenium_tests/test_tool_describing_tours.py M test/shed_functional/base/twilltestcase.py M test/unit/jobs/test_mapper.py M test/unit/jobs/test_runner_local.py M test/unit/managers/test_HistoryManager.py M test/unit/tools/test_evaluation.py M tox.ini Log Message: ----------- Merge branch 'dev' into i18n Commit: 12f72412abe1e1675f5755c77bda08707116db67 https://github.com/galaxyproject/galaxy/commit/12f72412abe1e1675f5755c77bda0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-02-07 (Wed, 07 Feb 2018) Changed paths: M client/galaxy/scripts/galaxy.js M client/galaxy/scripts/utils/localization.js M config/galaxy.yml.sample M config/user_preferences_extra_conf.yml.sample M doc/source/admin/galaxy_options.rst M lib/galaxy/config.py M lib/galaxy/managers/configuration.py M lib/galaxy/webapps/galaxy/config_schema.yml M templates/webapps/galaxy/galaxy.masthead.mako Log Message: ----------- Merge pull request #5282 from abretaud/i18n [WIP] Global and profile-bound language configuration Compare: https://github.com/galaxyproject/galaxy/compare/43d572558a5d...12f72412abe1