Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e0f80db701b2c843c78074b9957452aa2eb3fe58 https://github.com/galaxyproject/galaxy/commit/e0f80db701b2c843c78074b995745... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-02-04 (Sat, 04 Feb 2017) Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/folder_contents.py M lib/galaxy/webapps/galaxy/api/library_contents.py M test/api/test_libraries.py Log Message: ----------- Add possibility to load collections into library and to conserve element_identifier. Commit: 8906f515e1df604c62a0faf6744b309b396431d5 https://github.com/galaxyproject/galaxy/commit/8906f515e1df604c62a0faf6744b3... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-02-04 (Sat, 04 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- Add first working version of js needed for collection import Commit: 08449059f4e3c62fd281fcbeae67cdce149241c0 https://github.com/galaxyproject/galaxy/commit/08449059f4e3c62fd281fcbeae67c... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-02-05 (Sun, 05 Feb 2017) Changed paths: M test/api/test_libraries.py Log Message: ----------- Test adding a single dataset to a folder and test creating library using from_hdca_id Commit: 8b9fd288bc4a05b177a56665229cbd9b58f4de3c https://github.com/galaxyproject/galaxy/commit/8b9fd288bc4a05b177a56665229cb... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-02-05 (Sun, 05 Feb 2017) Changed paths: M test/api/test_libraries.py Log Message: ----------- Test creating library datatsets fails when not owning HDA Commit: 26050f6deafe51fc38632dc4a02c284ec0ea993d https://github.com/galaxyproject/galaxy/commit/26050f6deafe51fc38632dc4a02c2... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-02-05 (Sun, 05 Feb 2017) Changed paths: M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/folder_contents.py M lib/galaxy/webapps/galaxy/api/library_contents.py Log Message: ----------- Move functionality shared between folder and library api into UsesLibraryMixinItems Commit: e7a0c186a9494f3589364dfc5f76e25bcd97dbad https://github.com/galaxyproject/galaxy/commit/e7a0c186a9494f3589364dfc5f76e... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-02-05 (Sun, 05 Feb 2017) Changed paths: M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/folder_contents.py Log Message: ----------- Simplify exception handling Commit: 46af8ba4c3007f33f68c0b0d95f2dc166e69a14f https://github.com/galaxyproject/galaxy/commit/46af8ba4c3007f33f68c0b0d95f2d... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-02-05 (Sun, 05 Feb 2017) Changed paths: M lib/galaxy/web/base/controller.py Log Message: ----------- Simplify exceptions some more Commit: 6e7d290d0c462772cf51118f83e3f6c39a170ede https://github.com/galaxyproject/galaxy/commit/6e7d290d0c462772cf51118f83e3f... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-02-05 (Sun, 05 Feb 2017) Changed paths: M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/folder_contents.py Log Message: ----------- Remove unused rval variable Commit: 828422fe5e6d419ec1af28e0c62b7a8759bae9b8 https://github.com/galaxyproject/galaxy/commit/828422fe5e6d419ec1af28e0c62b7... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- Only show items in selector if item is visible and state is ok Commit: 75994c8816cdac0af80614db629553495dcb6bff https://github.com/galaxyproject/galaxy/commit/75994c8816cdac0af80614db62955... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M lib/galaxy/web/base/controller.py Log Message: ----------- Always set new ldda's to visible Commit: 7a6579878a09862e1cd5919ba7d94c527f3b0e56 https://github.com/galaxyproject/galaxy/commit/7a6579878a09862e1cd5919ba7d94... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-03-21 (Tue, 21 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- fix markup and add a stylistic space Commit: 234361253a168eaf4b4c86fe4a1963a511271c86 https://github.com/galaxyproject/galaxy/commit/234361253a168eaf4b4c86fe4a196... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-03-21 (Tue, 21 Mar 2017) Changed paths: M .ci/flake8_blacklist.txt M .ci/flake8_lint_include_list.txt M .ci/jenkins/selenium/run_tests.sh M .ci/py3_sources.txt M CONTRIBUTING.md M README.rst M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/galaxy.interactive_environments.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/libs/jquery/jquery.autocomplete.js A client/galaxy/scripts/mvc/collection/base-creator.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/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/form/form-input.js M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/history/hda-li.js M client/galaxy/scripts/mvc/history/history-model.js M client/galaxy/scripts/mvc/history/history-view.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 R client/galaxy/scripts/mvc/tool/tool-form-workflow.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/tool/tools.js M client/galaxy/scripts/mvc/ui/ui-misc.js M client/galaxy/scripts/mvc/ui/ui-portlet.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/mvc/user/user-quotameter.js A client/galaxy/scripts/mvc/workflow/workflow-forms.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/ui/autocom_tagging.js M client/galaxy/style/less/history.less M client/galaxy/style/less/ui.less M config/datatypes_conf.xml.sample M config/dependency_resolvers_conf.xml.sample M config/galaxy.ini.sample M config/plugins/interactive_environments/bam_iobio/config/bam_iobio.ini.sample M config/plugins/interactive_environments/bam_iobio/static/js/bam_iobio.js M config/plugins/interactive_environments/bam_iobio/templates/bam_iobio.mako M config/plugins/interactive_environments/common/templates/ie.mako M config/plugins/interactive_environments/jupyter/config/allowed_images.yml.sample M config/plugins/interactive_environments/jupyter/config/jupyter.ini.sample M config/plugins/interactive_environments/jupyter/config/jupyter.xml M config/plugins/interactive_environments/jupyter/static/js/jupyter.js M config/plugins/interactive_environments/jupyter/templates/jupyter.mako M config/plugins/interactive_environments/neo/config/neo.ini.sample M config/plugins/interactive_environments/neo/static/js/neo.js M config/plugins/interactive_environments/neo/templates/neo.mako M config/plugins/interactive_environments/phinch/config/phinch.ini.sample M config/plugins/interactive_environments/phinch/static/js/phinch.js M config/plugins/interactive_environments/phinch/templates/phinch.mako M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M config/plugins/interactive_environments/rstudio/static/js/rstudio.js M config/plugins/interactive_environments/rstudio/templates/rstudio.mako M config/plugins/tours/core.galaxy_ui.yaml M config/plugins/tours/core.history.yaml A config/plugins/visualizations/charts/static/repository/build/ngl_viewer.js A config/plugins/visualizations/charts/static/repository/build/ngl_viewer.js.map M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M config/plugins/visualizations/charts/static/repository/build/registry.tmp.js A config/plugins/visualizations/charts/static/repository/plugins/ngl/viewer.js M config/plugins/visualizations/charts/static/repository/registry.json A config/plugins/visualizations/charts/static/repository/visualizations/ngl/viewer/config.js A config/plugins/visualizations/charts/static/repository/visualizations/ngl/viewer/logo.png A config/plugins/visualizations/charts/static/repository/visualizations/ngl/viewer/wrapper.js A config/plugins/webhooks/demo/search/config/searchover.yaml A config/plugins/webhooks/demo/search/static/script.js A config/plugins/webhooks/demo/search/static/styles.css A config/plugins/webhooks/demo/tool_list/config/tool_list.yml A config/plugins/webhooks/demo/tool_list/helper/__init__.py A config/swarm_manager_conf.yml.sample M contrib/nagios/check_galaxy M contrib/nagios/check_galaxy.py A doc/source/admin/authentication.md R doc/source/admin/chat-0.png R doc/source/admin/chat-1.png R doc/source/admin/chat-2.png R doc/source/admin/chat-3.png R doc/source/admin/chat-4.png R doc/source/admin/chat.rst R doc/source/admin/communication_server.png R doc/source/admin/communication_server_rooms.png M doc/source/admin/dependency_resolvers.rst R doc/source/admin/grt.rst R doc/source/admin/images_webhooks/history-menu.png R doc/source/admin/images_webhooks/masthead.png R doc/source/admin/images_webhooks/masthead_trans_object.png R doc/source/admin/images_webhooks/tool.png R doc/source/admin/images_webhooks/workflow.png M doc/source/admin/index.rst R doc/source/admin/interactive_environments.png R doc/source/admin/interactive_environments.rst R doc/source/admin/interactive_environments.svg R doc/source/admin/mulled_containers.rst A doc/source/admin/special_topics/chat-0.png A doc/source/admin/special_topics/chat-1.png A doc/source/admin/special_topics/chat-2.png A doc/source/admin/special_topics/chat-3.png A doc/source/admin/special_topics/chat-4.png A doc/source/admin/special_topics/chat.rst A doc/source/admin/special_topics/communication_server.png A doc/source/admin/special_topics/communication_server_rooms.png A doc/source/admin/special_topics/grt.rst A doc/source/admin/special_topics/images_webhooks/history-menu.png A doc/source/admin/special_topics/images_webhooks/masthead.png A doc/source/admin/special_topics/images_webhooks/masthead_trans_object.png A doc/source/admin/special_topics/images_webhooks/tool.png A doc/source/admin/special_topics/images_webhooks/workflow.png A doc/source/admin/special_topics/index.rst A doc/source/admin/special_topics/interactive_environments.png A doc/source/admin/special_topics/interactive_environments.rst A doc/source/admin/special_topics/interactive_environments.svg A doc/source/admin/special_topics/mulled_containers.rst A doc/source/admin/special_topics/webhooks.rst A doc/source/admin/tool_panel.rst R doc/source/admin/webhooks.rst M doc/source/conf.py M doc/source/dev/index.rst M doc/source/dev/interactive_environments.rst M doc/source/index.rst R doc/source/lib/galaxy_utils.rst R doc/source/lib/galaxy_utils.sequence.rst M doc/source/lib/modules.rst M doc/source/project/issues.rst A doc/source/releases/17.01.rst M doc/source/releases/17.01_announce.rst A doc/source/releases/17.05_announce.rst M doc/source/releases/_thanks.rst M doc/source/releases/index.rst M doc/source/slideshow/architecture/galaxy_architecture.md M doc/source/slideshow/architecture/images/hda_dataset.plantuml.svg M doc/source/slideshow/architecture/images/hda_hdca.plantuml.svg M doc/source/slideshow/architecture/images/objectstore.plantuml.svg M doc/source/slideshow/architecture/images/plantuml_options.txt M doc/source/slideshow/architecture/images/server_client.plantuml.svg M doc/source/slideshow/architecture/images/server_client_old.plantuml.svg M doc/source/slideshow/architecture/images/webapp.plantuml.svg M doc/source/slideshow/architecture/style.css M lib/galaxy/app.py M lib/galaxy/auth/providers/ldap_ad.py M lib/galaxy/config.py A lib/galaxy/container/__init__.py A lib/galaxy/container/docker_swarm.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/mothur.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/datatypes/text.py M lib/galaxy/dependencies/pinned-hashed-requirements.txt M 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/dynamic_tool_destination.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/managers/deletable.py M lib/galaxy/managers/hdas.py M lib/galaxy/managers/tags.py M lib/galaxy/managers/users.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/model/mapping.py M lib/galaxy/model/migrate/check.py M lib/galaxy/model/migrate/versions/0003_security_and_libraries.py M lib/galaxy/model/migrate/versions/0004_indexes_and_defaults.py M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py M lib/galaxy/model/migrate/versions/0006_change_qual_datatype.py M lib/galaxy/model/migrate/versions/0007_sharing_histories.py M lib/galaxy/model/migrate/versions/0008_galaxy_forms.py M lib/galaxy/model/migrate/versions/0009_request_table.py M lib/galaxy/model/migrate/versions/0010_hda_display_at_authz_table.py M lib/galaxy/model/migrate/versions/0011_v0010_mysql_index_fix.py M lib/galaxy/model/migrate/versions/0012_user_address.py M lib/galaxy/model/migrate/versions/0013_change_lib_item_templates_to_forms.py M lib/galaxy/model/migrate/versions/0014_pages.py M lib/galaxy/model/migrate/versions/0015_tagging.py M lib/galaxy/model/migrate/versions/0016_v0015_mysql_index_fix.py M lib/galaxy/model/migrate/versions/0017_library_item_indexes.py M lib/galaxy/model/migrate/versions/0018_ordered_tags_and_page_tags.py M lib/galaxy/model/migrate/versions/0019_request_library_folder.py M lib/galaxy/model/migrate/versions/0020_library_upload_job.py M lib/galaxy/model/migrate/versions/0021_user_prefs.py M lib/galaxy/model/migrate/versions/0022_visualization_tables.py M lib/galaxy/model/migrate/versions/0024_page_slug_unique_constraint.py M lib/galaxy/model/migrate/versions/0025_user_info.py M lib/galaxy/model/migrate/versions/0026_cloud_tables.py M lib/galaxy/model/migrate/versions/0027_request_events.py M lib/galaxy/model/migrate/versions/0028_external_metadata_file_override.py M lib/galaxy/model/migrate/versions/0029_user_actions.py M lib/galaxy/model/migrate/versions/0031_community_and_workflow_tags.py M lib/galaxy/model/migrate/versions/0033_published_cols_for_histories_and_workflows.py M lib/galaxy/model/migrate/versions/0034_page_user_share_association.py M lib/galaxy/model/migrate/versions/0035_item_annotations_and_workflow_step_tags.py M lib/galaxy/model/migrate/versions/0036_add_deleted_column_to_library_template_assoc_tables.py M lib/galaxy/model/migrate/versions/0037_samples_library.py M lib/galaxy/model/migrate/versions/0038_add_inheritable_column_to_library_template_assoc_tables.py M lib/galaxy/model/migrate/versions/0039_add_synopsis_column_to_library_table.py M lib/galaxy/model/migrate/versions/0040_page_annotations.py M lib/galaxy/model/migrate/versions/0041_workflow_invocation.py M lib/galaxy/model/migrate/versions/0043_visualization_sharing_tagging_annotating.py M lib/galaxy/model/migrate/versions/0044_add_notify_column_to_request_table.py M lib/galaxy/model/migrate/versions/0045_request_type_permissions_table.py M lib/galaxy/model/migrate/versions/0046_post_job_actions.py M lib/galaxy/model/migrate/versions/0047_job_table_user_id_column.py M lib/galaxy/model/migrate/versions/0048_dataset_instance_state_column.py M lib/galaxy/model/migrate/versions/0049_api_keys_table.py M lib/galaxy/model/migrate/versions/0050_drop_cloud_tables.py M lib/galaxy/model/migrate/versions/0051_imported_col_for_jobs_table.py M lib/galaxy/model/migrate/versions/0052_sample_dataset_table.py M lib/galaxy/model/migrate/versions/0053_item_ratings.py M lib/galaxy/model/migrate/versions/0055_add_pja_assoc_for_jobs.py M lib/galaxy/model/migrate/versions/0057_request_notify.py M lib/galaxy/model/migrate/versions/0058_history_import_export.py M lib/galaxy/model/migrate/versions/0059_sample_dataset_file_path.py M lib/galaxy/model/migrate/versions/0060_history_archive_import.py M lib/galaxy/model/migrate/versions/0062_user_openid_table.py M lib/galaxy/model/migrate/versions/0063_sequencer_table.py M lib/galaxy/model/migrate/versions/0064_add_run_and_sample_run_association_tables.py M lib/galaxy/model/migrate/versions/0065_add_name_to_form_fields_and_values.py M lib/galaxy/model/migrate/versions/0066_deferred_job_and_transfer_job_tables.py M lib/galaxy/model/migrate/versions/0067_populate_sequencer_table.py M lib/galaxy/model/migrate/versions/0068_rename_sequencer_to_external_services.py M lib/galaxy/model/migrate/versions/0069_rename_sequencer_form_type.py M lib/galaxy/model/migrate/versions/0070_add_info_column_to_deferred_job_table.py M lib/galaxy/model/migrate/versions/0071_add_history_and_workflow_to_sample.py M lib/galaxy/model/migrate/versions/0072_add_pid_and_socket_columns_to_transfer_job_table.py M lib/galaxy/model/migrate/versions/0073_add_ldda_to_implicit_conversion_table.py M lib/galaxy/model/migrate/versions/0074_add_purged_column_to_library_dataset_table.py M lib/galaxy/model/migrate/versions/0075_add_subindex_column_to_run_table.py M lib/galaxy/model/migrate/versions/0077_create_tool_tag_association_table.py M lib/galaxy/model/migrate/versions/0078_add_columns_for_disk_usage_accounting.py M lib/galaxy/model/migrate/versions/0079_input_library_to_job_table.py M lib/galaxy/model/migrate/versions/0080_quota_tables.py M lib/galaxy/model/migrate/versions/0081_add_tool_version_to_hda_ldda.py M lib/galaxy/model/migrate/versions/0082_add_tool_shed_repository_table.py M lib/galaxy/model/migrate/versions/0083_add_prepare_files_to_task.py M lib/galaxy/model/migrate/versions/0084_add_ldda_id_to_implicit_conversion_table.py M lib/galaxy/model/migrate/versions/0085_add_task_info.py M lib/galaxy/model/migrate/versions/0086_add_tool_shed_repository_table_columns.py M lib/galaxy/model/migrate/versions/0087_tool_id_guid_map_table.py M lib/galaxy/model/migrate/versions/0088_add_installed_changeset_revison_column.py M lib/galaxy/model/migrate/versions/0089_add_object_store_id_columns.py M lib/galaxy/model/migrate/versions/0090_add_tool_shed_repository_table_columns.py M lib/galaxy/model/migrate/versions/0091_add_tool_version_tables.py M lib/galaxy/model/migrate/versions/0092_add_migrate_tools_table.py M lib/galaxy/model/migrate/versions/0093_add_job_params_col.py M lib/galaxy/model/migrate/versions/0094_add_job_handler_col.py M lib/galaxy/model/migrate/versions/0095_hda_subsets.py M lib/galaxy/model/migrate/versions/0096_openid_provider.py M lib/galaxy/model/migrate/versions/0097_add_ctx_rev_column.py M lib/galaxy/model/migrate/versions/0098_genome_index_tool_data_table.py M lib/galaxy/model/migrate/versions/0099_add_tool_dependency_table.py M lib/galaxy/model/migrate/versions/0100_alter_tool_dependency_table_version_column.py M lib/galaxy/model/migrate/versions/0101_drop_installed_changeset_revision_column.py M lib/galaxy/model/migrate/versions/0102_add_tool_dependency_status_columns.py M lib/galaxy/model/migrate/versions/0103_add_tool_shed_repository_status_columns.py M lib/galaxy/model/migrate/versions/0104_update_genome_downloader_job_parameters.py M lib/galaxy/model/migrate/versions/0105_add_cleanup_event_table.py M lib/galaxy/model/migrate/versions/0106_add_missing_indexes.py M lib/galaxy/model/migrate/versions/0107_add_exit_code_to_job_and_task.py M lib/galaxy/model/migrate/versions/0108_add_extended_metadata.py M lib/galaxy/model/migrate/versions/0109_add_repository_dependency_tables.py M lib/galaxy/model/migrate/versions/0110_add_dataset_uuid.py M lib/galaxy/model/migrate/versions/0111_add_job_destinations.py M lib/galaxy/model/migrate/versions/0112_add_data_manager_history_association_and_data_manager_job_association_tables.py M lib/galaxy/model/migrate/versions/0113_update_migrate_tools_table.py M lib/galaxy/model/migrate/versions/0114_update_migrate_tools_table_again.py M lib/galaxy/model/migrate/versions/0115_longer_user_password_field.py M lib/galaxy/model/migrate/versions/0116_drop_update_available_col_add_tool_shed_status_col.py M lib/galaxy/model/migrate/versions/0117_add_user_activation.py M lib/galaxy/model/migrate/versions/0118_add_hda_extended_metadata.py M lib/galaxy/model/migrate/versions/0119_job_metrics.py M lib/galaxy/model/migrate/versions/0120_dataset_collections.py M lib/galaxy/model/migrate/versions/0121_workflow_uuids.py M lib/galaxy/model/migrate/versions/0122_grow_mysql_blobs.py M lib/galaxy/model/migrate/versions/0123_add_workflow_request_tables.py M lib/galaxy/model/migrate/versions/0124_job_state_history.py M lib/galaxy/model/migrate/versions/0125_workflow_step_tracking.py M lib/galaxy/model/migrate/versions/0126_password_reset.py M lib/galaxy/model/migrate/versions/0127_output_collection_adjustments.py M lib/galaxy/model/migrate/versions/0128_session_timeout.py M lib/galaxy/model/migrate/versions/0129_job_external_output_metadata_validity.py M lib/galaxy/model/migrate/versions/0130_change_pref_datatype.py M lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_parameter_modules.py M lib/galaxy/model/migrate/versions/0132_add_lastpasswordchange_to_user.py M lib/galaxy/model/migrate/versions/0133_add_dependency_column_to_job.py A lib/galaxy/model/migrate/versions/0134_hda_set_deleted_if_purged.py M lib/galaxy/model/orm/engine_factory.py M lib/galaxy/queue_worker.py M lib/galaxy/queues.py R lib/galaxy/tags/__init__.py R lib/galaxy/tags/tag_handler.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/cwl/cwltool_deps.py M lib/galaxy/tools/cwl/parser.py M lib/galaxy/tools/cwl/representation.py M lib/galaxy/tools/cwl/runtime_actions.py M lib/galaxy/tools/cwl/schema.py M lib/galaxy/tools/data/__init__.py M lib/galaxy/tools/data_manager/manager.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/mulled/invfile.lua M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py A lib/galaxy/tools/fetcher.py M lib/galaxy/tools/linters/general.py M lib/galaxy/tools/linters/outputs.py M lib/galaxy/tools/linters/stdio.py M lib/galaxy/tools/linters/tests.py M lib/galaxy/tools/loader_directory.py A lib/galaxy/tools/locations/__init__.py A lib/galaxy/tools/locations/dockstore.py A lib/galaxy/tools/locations/file.py A lib/galaxy/tools/locations/http.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/meta.py M lib/galaxy/tools/parser/cwl.py M lib/galaxy/tools/parser/factory.py M lib/galaxy/tools/search/__init__.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/cache.py M lib/galaxy/tools/toolbox/watcher.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/util/json.py R lib/galaxy/util/postfork.py M lib/galaxy/visualization/plugins/plugin.py M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/framework/base.py M lib/galaxy/web/framework/decorators.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/web/framework/middleware/batch.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/web/framework/middleware/sentry.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/web/proxy/js/lib/mapper.js A lib/galaxy/web/stack/__init__.py M lib/galaxy/webapps/galaxy/api/histories.py M lib/galaxy/webapps/galaxy/api/history_contents.py M lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/api/tool_dependencies.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/history.py A lib/galaxy/webapps/galaxy/controllers/interactive_environments.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webapps/reports/app.py M lib/galaxy/webapps/reports/buildapp.py M lib/galaxy/webapps/tool_shed/app.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/util.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run_request.py M lib/galaxy/workflow/steps.py R lib/galaxy_utils/__init__.py R lib/galaxy_utils/sequence/__init__.py R lib/galaxy_utils/sequence/fasta.py R lib/galaxy_utils/sequence/fastq.py R lib/galaxy_utils/sequence/sequence.py R lib/galaxy_utils/sequence/transform.py R lib/galaxy_utils/sequence/vcf.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M lib/tool_shed/galaxy_install/update_repository_manager.py M lib/tool_shed/util/workflow_util.py M run_tests.sh M scripts/api/README M scripts/bootstrap_history.py A scripts/secret_decoder_ring.py M scripts/slideshow/slideshow_template.html A static/maps/analysis.js.map A static/maps/app.js.map A static/maps/app/analysis.js.map M static/maps/galaxy.interactive_environments.js.map M static/maps/layout/menu.js.map M static/maps/libs/jquery/jquery.autocomplete.js.map A static/maps/mvc/collection/base-creator.js.map M static/maps/mvc/collection/list-collection-creator.js.map M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/form/form-input.js.map M static/maps/mvc/form/form-section.js.map M static/maps/mvc/form/form-view.js.map M static/maps/mvc/grid/grid-template.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/mvc/history/hda-li.js.map M static/maps/mvc/history/history-model.js.map M static/maps/mvc/history/history-view.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/tool/tool-form-composite.js.map R static/maps/mvc/tool/tool-form-workflow.js.map M static/maps/mvc/tool/tool-form.js.map M static/maps/mvc/tool/tools.js.map M static/maps/mvc/ui/ui-misc.js.map M static/maps/mvc/ui/ui-portlet.js.map M static/maps/mvc/ui/ui-select-content.js.map M static/maps/mvc/ui/ui-select-default.js.map M static/maps/mvc/upload/upload-ftp.js.map M static/maps/mvc/user/user-preferences.js.map M static/maps/mvc/user/user-quotameter.js.map A static/maps/mvc/workflow/workflow-forms.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.js.map R static/maps/mvc/workflow/workflow.js.map M static/maps/ui/autocom_tagging.js.map A static/scripts/analysis.js A static/scripts/app.js A static/scripts/app/analysis.js 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/galaxy.interactive_environments.js M static/scripts/layout/menu.js M static/scripts/libs/jquery/jquery.autocomplete.js A static/scripts/mvc/collection/base-creator.js M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/form/form-input.js M static/scripts/mvc/form/form-section.js M static/scripts/mvc/form/form-view.js M static/scripts/mvc/grid/grid-template.js M static/scripts/mvc/grid/grid-view.js M static/scripts/mvc/history/hda-li.js M static/scripts/mvc/history/history-model.js M static/scripts/mvc/history/history-view.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/tool/tool-form-composite.js R static/scripts/mvc/tool/tool-form-workflow.js M static/scripts/mvc/tool/tool-form.js M static/scripts/mvc/tool/tools.js M static/scripts/mvc/ui/ui-misc.js M static/scripts/mvc/ui/ui-portlet.js M static/scripts/mvc/ui/ui-select-content.js M static/scripts/mvc/ui/ui-select-default.js M static/scripts/mvc/upload/upload-ftp.js M static/scripts/mvc/user/user-preferences.js M static/scripts/mvc/user/user-quotameter.js A static/scripts/mvc/workflow/workflow-forms.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 M static/scripts/ui/autocom_tagging.js M static/style/blue/base.css M templates/admin/reload_tool.mako M templates/grid_base.mako M templates/webapps/galaxy/admin/index.mako A templates/webapps/galaxy/admin/manage_dependencies.mako M templates/webapps/galaxy/workflow/editor.mako M templates/webapps/tool_shed/repository/common.mako M templates/webapps/tool_shed/repository/tool_form.mako M test/TESTING.md M test/api/test_histories.py M test/api/test_history_contents.py M test/api/test_tools.py M test/api/test_workflow_extraction.py M test/api/test_workflows.py M test/base/populators.py M test/docker/base/run_test_wrapper.sh A test/functional/tools/mulled_example_multi_incomplete.xml A test/functional/tools/output_format_deprecated_when.xml M test/functional/tools/samples_tool_conf.xml M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation-data.yml M test/integration/test_resolvers.py M test/qunit/tests/form_tests.js M test/selenium_tests/framework.py A test/selenium_tests/test_collection_builders.py M test/selenium_tests/test_stock_tours.py M test/selenium_tests/test_uploads.py M test/unit/managers/test_HDAManager.py M test/unit/managers/test_HistoryManager.py M test/unit/tools/test_data_parameters.py M test/unit/tools/test_execution.py M test/unit/workflows/test_modules.py M tools/data_source/upload.py Log Message: ----------- Merge branch 'dev' into add_hdca_to_library Commit: 3dcd174f2b2f0e78d58b3e9d7e19103bd299b128 https://github.com/galaxyproject/galaxy/commit/3dcd174f2b2f0e78d58b3e9d7e191... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-03-21 (Tue, 21 Mar 2017) Changed paths: M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- repack Commit: 279548574136817c226fad61c52168cfab199fb8 https://github.com/galaxyproject/galaxy/commit/279548574136817c226fad61c5216... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-03-21 (Tue, 21 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M lib/galaxy/model/__init__.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/folder_contents.py M lib/galaxy/webapps/galaxy/api/library_contents.py M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/mvc/library/library-foldertoolbar-view.js M test/api/test_libraries.py Log Message: ----------- Merge pull request #3559 from mvdbeek/add_hdca_to_library Add possibility to load collection into library Compare: https://github.com/galaxyproject/galaxy/compare/eadbb16462f2...279548574136