https://github.com/galaxyproject/galaxy
Revision 90bed00ebe8a5b4a7e0aeb61c23c991daae03fb8 authored by John Chilton on 08 January 2016, 15:14:52 UTC, committed by John Chilton on 08 January 2016, 15:14:52 UTC
Merge remote-tracking branch 'jmchilton/release_15.07' into release_15.10 Conflicts: client/galaxy/scripts/mvc/history/multi-panel.js lib/galaxy/webapps/galaxy/controllers/external_service.py lib/galaxy/webapps/galaxy/controllers/forms.py lib/galaxy/webapps/galaxy/controllers/library_admin.py lib/galaxy/webapps/galaxy/controllers/request_type.py lib/galaxy/webapps/galaxy/controllers/requests_admin.py lib/galaxy/webapps/galaxy/controllers/requests_common.py lib/galaxy/webapps/galaxy/controllers/visualization.py lib/galaxy/webapps/reports/controllers/jobs.py lib/galaxy/webapps/reports/controllers/sample_tracking.py lib/galaxy/webapps/reports/controllers/workflows.py lib/tool_shed/grids/admin_grids.py lib/tool_shed/grids/repository_grids.py lib/tool_shed/grids/repository_review_grids.py static/maps/mvc/history/multi-panel.js.map static/maps/mvc/ui/ui-select-default.js.map static/scripts/mvc/collection/list-collection-creator.js static/scripts/mvc/collection/list-of-pairs-collection-creator.js static/scripts/mvc/dataset/dataset-li-edit.js static/scripts/mvc/dataset/dataset-li.js static/scripts/mvc/history/history-panel.js static/scripts/mvc/history/multi-panel.js static/scripts/mvc/list/list-panel.js static/scripts/mvc/ui/ui-select-default.js
Tip revision: 90bed00ebe8a5b4a7e0aeb61c23c991daae03fb8 authored by John Chilton on 08 January 2016, 15:14:52 UTC
Merge 15.07 into 15.10.
Merge 15.07 into 15.10.
Tip revision: 90bed00
| File | Mode | Size |
|---|---|---|
| .ci | ||
| client | ||
| config | ||
| contrib | ||
| cron | ||
| database | ||
| display_applications | ||
| doc | ||
| external_service_types | ||
| lib | ||
| locale | ||
| openid | ||
| scripts | ||
| static | ||
| templates | ||
| test | ||
| test-data | ||
| tool-data | ||
| tools | ||
| .coveragerc | -rw-r--r-- | 43 bytes |
| .gitignore | -rw-r--r-- | 2.1 KB |
| .travis.yml | -rw-r--r-- | 278 bytes |
| CITATION | -rw-r--r-- | 2.1 KB |
| CODE_OF_CONDUCT.md | -rw-r--r-- | 5.2 KB |
| CONTRIBUTING.md | -rw-r--r-- | 5.4 KB |
| CONTRIBUTORS.md | -rw-r--r-- | 5.4 KB |
| LICENSE.txt | -rw-r--r-- | 10.8 KB |
| README.rst | -rw-r--r-- | 1.8 KB |
| buildbot_setup.sh | -rw-r--r-- | 3.4 KB |
| create_db.sh | -rwxr-xr-x | 60 bytes |
| dist-eggs.ini | -rw-r--r-- | 2.6 KB |
| eggs.ini | -rw-r--r-- | 1.7 KB |
| extract_dataset_parts.sh | -rwxr-xr-x | 146 bytes |
| install_and_test_tool_shed_repositories.sh | -rw-r--r-- | 5.4 KB |
| manage_db.sh | -rwxr-xr-x | 238 bytes |
| manage_tools.sh | -rw-r--r-- | 63 bytes |
| requirements.txt | -rw-r--r-- | 1.7 KB |
| rolling_restart.sh | -rwxr-xr-x | 69 bytes |
| run.sh | -rwxr-xr-x | 2.8 KB |
| run_reports.sh | -rwxr-xr-x | 1.4 KB |
| run_tests.sh | -rwxr-xr-x | 12.6 KB |
| run_tool_shed.sh | -rwxr-xr-x | 777 bytes |
| set_metadata.sh | -rwxr-xr-x | 63 bytes |
| setup.cfg | -rw-r--r-- | 357 bytes |
| tool_list.py | -rw-r--r-- | 3.0 KB |
| tox.ini | -rw-r--r-- | 536 bytes |
Computing file changes ...
