Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 47113bedcabe3c82ad99ea1ef16307f8c3c5512f https://github.com/galaxyproject/galaxy/commit/47113bedcabe3c82ad99ea1ef1630... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-30 (Wed, 30 Sep 2015) Changed paths: M .ci/flake8_blacklist.txt M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-folderrow-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-model.js M client/galaxy/scripts/mvc/tools/tools-form.js M lib/galaxy/datatypes/registry.py A lib/galaxy/datatypes/set_metadata_tool.xml M lib/galaxy/managers/folders.py M lib/galaxy/managers/libraries.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/imp_exp/__init__.py A lib/galaxy/tools/imp_exp/exp_history_to_archive.xml M lib/galaxy/tools/parser/yaml.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/util/__init__.py M lib/galaxy/webapps/galaxy/api/folders.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0001_initial_tables.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0002_add_tool_suite_column.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0003_review_and_review_association_tables.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0004_repository_tables.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0005_drop_tool_related_tables.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0006_add_email_alerts_column.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0007_add_long_description_times_downloaded_columns.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0008_add_repository_metadata_table.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0009_add_malicious_column.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0010_add_new_repo_alert_column.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0011_add_tool_versions_column.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0012_add_downloadable_column.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0013_add_review_tables.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0014_add_deprecated_column.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0015_add_api_keys_table.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0016_add_do_not_test_tools_functionally_correct_errors_columns.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0017_add_galaxy_utility_columns_to_repository_metadata_table.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0018_add_repository_metadata_flag_columns.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0019_add_skip_tool_test_table_and_test_install_error_column.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0020_add_repository_type_column.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0021_change_repository_type_value.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0022_add_repository_admin_roles.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0023_add_repository_url_and_hompeage_url.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0024_password_reset.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0025_session_timeout.py M lib/pulsar/client/amqp_exchange.py M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-folderrow-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/mvc/library/library-model.js.map M static/maps/mvc/tools/tools-form.js.map M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-folderrow-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/library/library-model.js M static/scripts/mvc/tools/tools-form.js M test/unit/tools/test_parsing.py Log Message: ----------- Merge branch 'dev' of github.com:galaxyproject/galaxy into dev Commit: 5f4502b6500ca0aae57d6d76da12804d5d2fb9d1 https://github.com/galaxyproject/galaxy/commit/5f4502b6500ca0aae57d6d76da128... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-10-05 (Mon, 05 Oct 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample Log Message: ----------- Pin images for next release of Galaxy Commit: e9a3ec95b9485ea3b5b15bce4f8a96751f225b53 https://github.com/galaxyproject/galaxy/commit/e9a3ec95b9485ea3b5b15bce4f8a9... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-10-05 (Mon, 05 Oct 2015) Changed paths: M doc/source/dev/faq.rst Log Message: ----------- Update faq.rst Commit: b5b36c0ab184d38b611fe0b293424bedd687cb28 https://github.com/galaxyproject/galaxy/commit/b5b36c0ab184d38b611fe0b293424... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample Log Message: ----------- Merge pull request #849 from erasche/gie-pinning-15.10 GIE pinning 15.10 Compare: https://github.com/galaxyproject/galaxy/compare/092fc17ec008...b5b36c0ab184