Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 469d8b463e4711770925f4152c95769b7c1d04dc https://github.com/galaxyproject/galaxy/commit/469d8b463e4711770925f4152c957... Author: Airistotal <danieltos.bouchard@gmail.com> Date: 2015-08-28 (Fri, 28 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_errors_per_tool.mako M templates/webapps/reports/jobs_per_month_all.mako M templates/webapps/reports/jobs_per_month_in_error.mako M templates/webapps/reports/jobs_per_tool.mako M templates/webapps/reports/jobs_per_user.mako M templates/webapps/reports/jobs_specified_month_all.mako M templates/webapps/reports/jobs_specified_month_in_error.mako M templates/webapps/reports/jobs_tool_per_month.mako M templates/webapps/reports/jobs_user_per_month.mako M templates/webapps/reports/registered_users.mako M templates/webapps/reports/registered_users_per_month.mako M templates/webapps/reports/registered_users_specified_date.mako M templates/webapps/reports/registered_users_specified_month.mako M templates/webapps/reports/requests_per_month_all.mako M templates/webapps/reports/requests_per_user.mako M templates/webapps/reports/requests_user_per_month.mako M templates/webapps/reports/workflows_per_month_all.mako M templates/webapps/reports/workflows_per_user.mako M templates/webapps/reports/workflows_per_workflow.mako M templates/webapps/reports/workflows_user_per_month.mako Log Message: ----------- Fixed change in class overlap Commit: ec8cba20398dcfe0fdd7a46ad93cf78fadc310ec https://github.com/galaxyproject/galaxy/commit/ec8cba20398dcfe0fdd7a46ad93cf... Author: Airistotal <danieltos.bouchard@gmail.com> Date: 2015-08-28 (Fri, 28 Aug 2015) Changed paths: M .ci/flake8_blacklist.txt M .ci/flake8_wrapper.sh M client/galaxy/style/less/reports.less A doc/source/api/quickstart.rst M doc/source/api_doc.rst A doc/source/dev/faq.rst A doc/source/dev/index.rst M doc/source/index.rst M doc/source/ts_api_doc.rst M lib/galaxy/jobs/actions/post.py M lib/galaxy/managers/base.py M lib/galaxy/managers/datasets.py M lib/galaxy/managers/rbac_secured.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/data_manager/manager.py M lib/galaxy/util/xml_macros.py M lib/galaxy/web/framework/base.py M lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/reports/buildapp.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/tool_shed/galaxy_install/repair_repository_manager.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/util/shed_util_common.py M test/base/asserts/__init__.py M test/base/interactor.py M test/base/twilltestcase.py M test/casperjs/casperjs_runner.py M test/casperjs/server_env.py M test/install_and_test_tool_shed_repositories/base/twilltestcase.py M test/install_and_test_tool_shed_repositories/base/util.py M test/install_and_test_tool_shed_repositories/functional/test_install_repositories.py M test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py M test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py M test/qunit/README.txt M test/qunit/package.json M test/unit/managers/test_DatasetManager.py M test/unit/tools/test_tool_loader.py Log Message: ----------- Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev Conflicts: client/galaxy/style/less/reports.less static/style/blue/base.css static/style/blue/reports.css Commit: f61f696724a0b264a8706d6bf682fa09c178bc5e https://github.com/galaxyproject/galaxy/commit/f61f696724a0b264a8706d6bf682f... Author: Nitesh Turaga <nitesh.turaga@gmail.com> Date: 2015-08-31 (Mon, 31 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_errors_per_tool.mako M templates/webapps/reports/jobs_per_month_all.mako M templates/webapps/reports/jobs_per_month_in_error.mako M templates/webapps/reports/jobs_per_tool.mako M templates/webapps/reports/jobs_per_user.mako M templates/webapps/reports/jobs_specified_month_all.mako M templates/webapps/reports/jobs_specified_month_in_error.mako M templates/webapps/reports/jobs_tool_per_month.mako M templates/webapps/reports/jobs_user_per_month.mako M templates/webapps/reports/registered_users.mako M templates/webapps/reports/registered_users_per_month.mako M templates/webapps/reports/registered_users_specified_date.mako M templates/webapps/reports/registered_users_specified_month.mako M templates/webapps/reports/requests_per_month_all.mako M templates/webapps/reports/requests_per_user.mako M templates/webapps/reports/requests_user_per_month.mako M templates/webapps/reports/workflows_per_month_all.mako M templates/webapps/reports/workflows_per_user.mako M templates/webapps/reports/workflows_per_workflow.mako M templates/webapps/reports/workflows_user_per_month.mako Log Message: ----------- Merge pull request #669 from Airistotal/dev Fix centering bug in firefox Compare: https://github.com/galaxyproject/galaxy/compare/d4af323d35e4...f61f696724a0