Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: f3bfa2f56bb71f737ff8faa622271102652c7592 https://github.com/galaxyproject/galaxy/commit/f3bfa2f56bb71f737ff8faa622271... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-10-21 (Wed, 21 Oct 2015) Changed paths: M client/galaxy/scripts/reports_webapp/run_stats.js M static/maps/reports_webapp/run_stats.js.map M static/scripts/reports_webapp/run_stats.js Log Message: ----------- remove the autorefresh on Reports app because of how long each page takes on Main the request for a subpage would timeout because new autorefresh request would be automatically issued Commit: ee327702d75415261085796af1e5c1ff5b1308ee https://github.com/galaxyproject/galaxy/commit/ee327702d75415261085796af1e5c... Author: guerler <aysam.guerler@gmail.com> Date: 2015-10-21 (Wed, 21 Oct 2015) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Fix workflow extraction from history Fix history extraction by returning value dictionary Remove previous fix Commit: 9d3893ed632d95d8b70fdbc8a95ba9c44a9a5207 https://github.com/galaxyproject/galaxy/commit/9d3893ed632d95d8b70fdbc8a95ba... Author: guerler <aysam.guerler@gmail.com> Date: 2015-10-21 (Wed, 21 Oct 2015) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Undo commit, wrong branch Commit: 8a0a445ec334d5c98ef601d80fff1bf111b6c453 https://github.com/galaxyproject/galaxy/commit/8a0a445ec334d5c98ef601d80fff1... Author: guerler <aysam.guerler@gmail.com> Date: 2015-10-21 (Wed, 21 Oct 2015) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Fix workflow extraction from history Commit: 82e96140a17e75a0766c45a9071eb73d4b58a0e7 https://github.com/galaxyproject/galaxy/commit/82e96140a17e75a0766c45a9071eb... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-10-22 (Thu, 22 Oct 2015) Changed paths: M client/galaxy/scripts/reports_webapp/run_stats.js M static/maps/reports_webapp/run_stats.js.map M static/scripts/reports_webapp/run_stats.js Log Message: ----------- Merge pull request #967 from martenson/remove-reports-autorefresh [15.10] remove the autorefresh on Reports app homepage Commit: 3fe148dd1981b516452df9ace6db75e95879df03 https://github.com/galaxyproject/galaxy/commit/3fe148dd1981b516452df9ace6db7... Author: John Chilton <jmchilton@gmail.com> Date: 2015-10-22 (Thu, 22 Oct 2015) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Merge pull request #970 from guerler/fix_history_extract_001 [15.10] Fix workflow extraction from history Commit: 57d0620292d3272b3bd6f8f7e9ec3833931c62be https://github.com/galaxyproject/galaxy/commit/57d0620292d3272b3bd6f8f7e9ec3... Author: Vimalkumar Velayudhan <vimalkumarvelayudhan@gmail.com> Date: 2015-10-22 (Thu, 22 Oct 2015) Changed paths: M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/imp_exp/export_history.py Log Message: ----------- Fix for missing included files on history export and import. Notes: If a history was exported previously, galaxy would just serve the cached version. In that case, it is better to make some changes to the history for example, by re-running the last job and then exporting it. Export of histories that haven't been exported previously should work without problems. (cherry picked from commit 9ea0fee48aa57361147e9145be8deaaafb2a0960) Commit: dfb59002ba78373dac32d8aebefd7b2de324260b https://github.com/galaxyproject/galaxy/commit/dfb59002ba78373dac32d8aebefd7... Author: Vimalkumar Velayudhan <vimalkumarvelayudhan@gmail.com> Date: 2015-10-22 (Thu, 22 Oct 2015) Changed paths: M lib/galaxy/tools/imp_exp/__init__.py Log Message: ----------- Use object store for imported history datasets and included files (cherry picked from commit ea89dd8f149778b6c2f0f3f4a34c8b21f7033af7) Commit: dab1ce3f03c25d35604d0ed75fc8aa6e3702c26d https://github.com/galaxyproject/galaxy/commit/dab1ce3f03c25d35604d0ed75fc8a... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-10-22 (Thu, 22 Oct 2015) Changed paths: M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/imp_exp/export_history.py Log Message: ----------- Merge pull request #973 from natefoo/composite-history-import-export [15.10] Fix for missing included files on history export and import Commit: 6d7be0a2186882c6090584a1cd58c59c18a0a519 https://github.com/galaxyproject/galaxy/commit/6d7be0a2186882c6090584a1cd58c... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-10-27 (Tue, 27 Oct 2015) Changed paths: M client/galaxy/scripts/reports_webapp/run_stats.js M lib/galaxy/tools/__init__.py M static/maps/reports_webapp/run_stats.js.map M static/scripts/reports_webapp/run_stats.js Log Message: ----------- Merge branch 'release_15.10' of https://github.com/galaxyproject/galaxy into dev Compare: https://github.com/galaxyproject/galaxy/compare/5f3fbdefbeb5...6d7be0a21868