Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 16dfca86e69597796e60e604ae410dcf6667291c https://github.com/galaxyproject/galaxy/commit/16dfca86e69597796e60e604ae410... Author: Bjoern Gruening <bjoern.gruening@gmail.com> Date: 2016-04-30 (Sat, 30 Apr 2016) Changed paths: M lib/galaxy/datatypes/data.py Log Message: ----------- Merge branch 'release_16.04' of https://github.com/galaxyproject/galaxy into release_16.04 Commit: 2cf95d8a134bb84cec0408b016e751fc840327c1 https://github.com/galaxyproject/galaxy/commit/2cf95d8a134bb84cec0408b016e75... Author: Bjoern Gruening <bjoern.gruening@gmail.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M client/galaxy/scripts/mvc/form/form-input.js M config/galaxy.ini.sample M doc/source/releases/16.01.rst A doc/source/releases/16.04.rst M doc/source/releases/16.04_announce.rst A doc/source/releases/16.07_announce.rst M doc/source/releases/index.rst A lib/galaxy/datatypes/checkers.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/external_services/actions.py M lib/galaxy/external_services/parameters.py M lib/galaxy/external_services/service.py M lib/galaxy/forms/forms.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/managers/histories.py M lib/galaxy/model/__init__.py M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py M lib/galaxy/security/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/util/checkers.py M lib/galaxy/version.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/web/security/__init__.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/external_services.py M lib/galaxy/webapps/galaxy/controllers/tool_runner.py M lib/galaxy/webapps/tool_shed/security/__init__.py M lib/galaxy/workflow/run.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M lib/tool_shed/repository_types/metadata.py M static/maps/mvc/form/form-input.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/form/form-input.js M templates/show_params.mako M templates/webapps/galaxy/data_manager/view_job.mako M templates/webapps/galaxy/workflow/display.mako M templates/webapps/galaxy/workflow/run.mako M templates/webapps/galaxy/workflow/sharing.mako A test-data/biom1_metadata_test.txt A test-data/input_taxonomy.biom1 A test/functional/tools/metadata_biom1.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml M test/unit/managers/test_HistoryManager.py M tools/filters/axt_to_lav.py Log Message: ----------- Merge branch 'release_16.04' of https://github.com/galaxyproject/galaxy into release_16.04 Commit: b3a32ac2e19afda605f26f989bf3e16eaa1d27af https://github.com/galaxyproject/galaxy/commit/b3a32ac2e19afda605f26f989bf3e... Author: Bjoern Gruening <bjoern.gruening@gmail.com> Date: 2016-06-11 (Sat, 11 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M templates/webapps/galaxy/workflow/sharing.mako M test/unit/tools/test_select_parameters.py Log Message: ----------- Merge branch 'release_16.04' of https://github.com/galaxyproject/galaxy into release_16.04 Commit: 0017b3e9405e5e77904364025889c88cf0991744 https://github.com/galaxyproject/galaxy/commit/0017b3e9405e5e77904364025889c... Author: Bjoern Gruening <bjoern.gruening@gmail.com> Date: 2016-06-11 (Sat, 11 Jun 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- add IUC channel to the list Commit: ec0d97327b0bf234021f5a3f5ab261b491baa091 https://github.com/galaxyproject/galaxy/commit/ec0d97327b0bf234021f5a3f5ab26... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #2490 from bgruening/iuc_conda_channel [16.04] Add IUC conda channel Compare: https://github.com/galaxyproject/galaxy/compare/5245e8a693fc...ec0d97327b0b