Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 1041cad9ec4f50837158f8bbfe5d27f9e3db7d0e https://github.com/galaxyproject/galaxy/commit/1041cad9ec4f50837158f8bbfe5d2... Author: Airistotal danieltos.bouchard@gmail.com Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths: M client/galaxy/style/less/reports.less M static/style/blue/base.css M static/style/blue/reports.css M templates/webapps/reports/jobs_specified_month_in_error.mako
Log Message: ----------- Centered headers in firefox Made page selection divs not wrap when window size is too small Changed name for action in Jobs in error per day this month which fixes crash
Commit: 865d0153954e3be07d139f6100d21bdf5543a2f9 https://github.com/galaxyproject/galaxy/commit/865d0153954e3be07d139f6100d21... Author: Airistotal danieltos.bouchard@gmail.com Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths: M .ci/flake8_blacklist.txt M client/galaxy/scripts/mvc/ui/ui-button-menu.js M client/galaxy/scripts/mvc/ui/ui-color-picker.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-popover.js A client/galaxy/scripts/mvc/upload/composite/composite-row.js A client/galaxy/scripts/mvc/upload/composite/composite-view.js A client/galaxy/scripts/mvc/upload/default/default-row.js A client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/scripts/mvc/upload/upload-button.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/scripts/mvc/upload/upload-model.js R client/galaxy/scripts/mvc/upload/upload-row.js M client/galaxy/scripts/mvc/upload/upload-settings.js M client/galaxy/scripts/mvc/upload/upload-view.js M client/galaxy/scripts/utils/uploadbox.js M client/galaxy/scripts/utils/utils.js M client/galaxy/style/less/ui.less M client/galaxy/style/less/upload.less M config/tool_data_table_conf.xml.sample M lib/galaxy/datatypes/genetics.py M lib/galaxy/managers/base.py M lib/galaxy/managers/sharable.py M lib/galaxy/model/__init__.py M lib/galaxy/objectstore/__init__.py M lib/galaxy/objectstore/s3.py M lib/galaxy/tools/__init__.py M lib/galaxy/util/bunch.py M lib/galaxy/util/jstree.py M lib/galaxy/webapps/galaxy/api/datatypes.py M lib/galaxy/webapps/galaxy/api/histories.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py A lib/galaxy/webapps/tool_shed/api/configuration.py M lib/galaxy/webapps/tool_shed/api/repositories.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/config.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/workflow/render.py M lib/tool_shed/capsule/capsule_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M lib/tool_shed/util/common_util.py M scripts/cleanup_datasets/cleanup_datasets.py M static/maps/mvc/ui/ui-button-menu.js.map M static/maps/mvc/ui/ui-color-picker.js.map M static/maps/mvc/ui/ui-misc.js.map M static/maps/mvc/ui/ui-modal.js.map M static/maps/mvc/ui/ui-popover.js.map A static/maps/mvc/upload/composite/composite-row.js.map A static/maps/mvc/upload/composite/composite-view.js.map A static/maps/mvc/upload/default/default-row.js.map A static/maps/mvc/upload/default/default-view.js.map M static/maps/mvc/upload/upload-button.js.map M static/maps/mvc/upload/upload-ftp.js.map M static/maps/mvc/upload/upload-model.js.map R static/maps/mvc/upload/upload-row.js.map M static/maps/mvc/upload/upload-settings.js.map M static/maps/mvc/upload/upload-view.js.map M static/maps/utils/uploadbox.js.map M static/maps/utils/utils.js.map M static/scripts/mvc/ui/ui-button-menu.js M static/scripts/mvc/ui/ui-color-picker.js M static/scripts/mvc/ui/ui-misc.js M static/scripts/mvc/ui/ui-modal.js M static/scripts/mvc/ui/ui-popover.js A static/scripts/mvc/upload/composite/composite-row.js A static/scripts/mvc/upload/composite/composite-view.js A static/scripts/mvc/upload/default/default-row.js A static/scripts/mvc/upload/default/default-view.js M static/scripts/mvc/upload/upload-button.js M static/scripts/mvc/upload/upload-ftp.js M static/scripts/mvc/upload/upload-model.js R static/scripts/mvc/upload/upload-row.js M static/scripts/mvc/upload/upload-settings.js M static/scripts/mvc/upload/upload-view.js M static/scripts/utils/uploadbox.js M static/scripts/utils/utils.js M static/style/blue/base.css A test/qunit/test-app.js M test/qunit/test-common.js A test/qunit/test-data/bootstrapped.js A test/qunit/test-data/fakeserver.js A test/qunit/tests/upload_dialog_tests.html A test/qunit/tests/upload_dialog_tests.js M test/qunit/tests/workflow_editor_tests.js M test/tool_shed/base/twilltestcase.py M test/tool_shed/functional/test_0000_basic_repository_features.py M test/tool_shed/functional/test_0010_repository_with_tool_dependencies.py M test/tool_shed/functional/test_0020_basic_repository_dependencies.py M test/tool_shed/functional/test_0030_repository_dependency_revisions.py M test/tool_shed/functional/test_0040_repository_circular_dependencies.py M test/tool_shed/functional/test_0050_circular_dependencies_4_levels.py M test/tool_shed/functional/test_0060_workflows.py M test/tool_shed/functional/test_0070_invalid_tool.py M test/tool_shed/functional/test_0080_advanced_circular_dependencies.py M test/tool_shed/functional/test_0090_tool_search.py M test/tool_shed/functional/test_0100_complex_repository_dependencies.py M test/tool_shed/functional/test_0110_invalid_simple_repository_dependencies.py M test/tool_shed/functional/test_0120_simple_repository_dependency_multiple_owners.py M test/tool_shed/functional/test_0130_datatype_converters.py M test/tool_shed/functional/test_0140_tool_help_images.py M test/tool_shed/functional/test_0150_prior_installation_required.py M test/tool_shed/functional/test_0160_circular_prior_installation_required.py M test/tool_shed/functional/test_0170_complex_prior_installation_required.py M test/tool_shed/functional/test_0300_reset_all_metadata.py M test/tool_shed/functional/test_0310_hg_push_from_api.py M test/tool_shed/functional/test_0400_repository_component_reviews.py M test/tool_shed/functional/test_0410_repository_component_review_access_control.py M test/tool_shed/functional/test_0420_citable_urls_for_repositories.py M test/tool_shed/functional/test_0430_browse_utilities.py M test/tool_shed/functional/test_0440_deleting_dependency_definitions.py M test/tool_shed/functional/test_0450_skip_tool_tests.py M test/tool_shed/functional/test_0460_upload_to_repository.py M test/tool_shed/functional/test_0470_tool_dependency_repository_type.py M test/tool_shed/functional/test_0480_tool_dependency_xml_verification.py M test/tool_shed/functional/test_0490_export_import_repositories.py M test/tool_shed/functional/test_0500_export_repository_simple_dependency.py M test/tool_shed/functional/test_0510_export_import_repository_complex_dependencies.py M test/tool_shed/functional/test_0520_import_export_circular_dependencies.py M test/tool_shed/functional/test_0530_repository_admin_feature.py M test/tool_shed/functional/test_1000_install_basic_repository.py M test/tool_shed/functional/test_1010_install_repository_with_tool_dependencies.py M test/tool_shed/functional/test_1020_install_repository_with_repository_dependencies.py M test/tool_shed/functional/test_1030_install_repository_with_dependency_revisions.py M test/tool_shed/functional/test_1040_install_repository_basic_circular_dependencies.py M test/tool_shed/functional/test_1050_circular_dependencies_4_levels.py M test/tool_shed/functional/test_1060_install_repository_with_workflow.py M test/tool_shed/functional/test_1070_invalid_tool.py M test/tool_shed/functional/test_1080_advanced_circular_dependency_installation.py M test/tool_shed/functional/test_1085_repository_dependency_handling.py M test/tool_shed/functional/test_1087_install_updated_repository_dependencies.py M test/tool_shed/functional/test_1090_install_tool_from_tool_search.py M test/tool_shed/functional/test_1100_install_repository_with_complex_dependencies.py M test/tool_shed/functional/test_1110_install_repository_with_invalid_repository_dependency.py M test/tool_shed/functional/test_1120_simple_repository_dependency_multiple_owners.py M test/tool_shed/functional/test_1130_datatype_converters.py M test/tool_shed/functional/test_1140_tool_help_images.py M test/tool_shed/functional/test_1150_prior_installation_required.py M test/tool_shed/functional/test_1160_circular_prior_installation_required.py M test/tool_shed/functional/test_1170_complex_prior_installation_required.py M test/tool_shed/functional/test_1200_uninstall_and_reinstall_basic_repository.py M test/tool_shed/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py M test/tool_shed/functional/test_1220_uninstall_reinstall_repository_with_repository_dependencies.py M test/tool_shed/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py M test/tool_shed/functional/test_1300_reset_all_metadata.py M test/tool_shed/functional/test_1400_review_migration_stages.py M test/tool_shed/functional/test_1410_update_manager.py M test/tool_shed/functional/test_1420_tool_dependency_environment_inheritance.py M test/tool_shed/functional/test_1430_repair_installed_repository.py M test/tool_shed/functional/test_1440_missing_env_sh_files.py M test/tool_shed/functional/test_1450_installing_datatypes_sniffers.py M test/tool_shed/functional/test_1460_data_managers.py M test/tool_shed/functional/test_1470_updating_installed_repositories.py M test/tool_shed/functional_tests.py M test/tool_shed/test_data/proteomics_datatypes/proteomics_datatypes.tar M test/unit/test_galaxy_mapping.py M test/unit/tools/test_toolbox_filters.py R tool-data/fastx_clipper_sequences.txt M tools/extract/liftOver_wrapper.xml
Log Message: ----------- Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev
Conflicts: static/style/blue/base.css
Commit: 4a4ed87f11c8a47dcc838bdc6a42389def73afe9 https://github.com/galaxyproject/galaxy/commit/4a4ed87f11c8a47dcc838bdc6a423... Author: Martin Cech cech.marten@gmail.com Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths: M client/galaxy/style/less/reports.less M static/style/blue/base.css M static/style/blue/reports.css M templates/webapps/reports/jobs_specified_month_in_error.mako
Log Message: ----------- Merge pull request #656 from Airistotal/dev
Reports - Small bug fixes
Compare: https://github.com/galaxyproject/galaxy/compare/f5ca24ee2bae...4a4ed87f11c8