Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4de8912c144bbb059318492a05c98bfcc5110346 https://github.com/galaxyproject/galaxy/commit/4de8912c144bbb059318492a05c98... Author: guerler <aysam.guerler@gmail.com> Date: 2017-11-01 (Wed, 01 Nov 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js M static/maps/mvc/grid/grid-template.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/grid/grid-template.js Log Message: ----------- Fix status handling for grids Commit: b5c8d6c6d1c53429425b63c1d07e2ba9ce046288 https://github.com/galaxyproject/galaxy/commit/b5c8d6c6d1c53429425b63c1d07e2... Author: guerler <aysam.guerler@gmail.com> Date: 2017-11-01 (Wed, 01 Nov 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js M static/maps/mvc/grid/grid-template.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/grid/grid-template.js Log Message: ----------- Remove wrong str statement Commit: 5d2f3338468c024d2cf9bb976e839310498903a7 https://github.com/galaxyproject/galaxy/commit/5d2f3338468c024d2cf9bb976e839... Author: guerler <aysam.guerler@gmail.com> Date: 2017-11-01 (Wed, 01 Nov 2017) Changed paths: M config/galaxy.ini.sample M lib/galaxy/app.py M lib/galaxy/config.py M lib/galaxy/jobs/handler.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/model/migrate/check.py A lib/galaxy/util/monitors.py M lib/galaxy/workflow/scheduling_manager.py Log Message: ----------- Merge branch 'dev' into fix_status_matching Commit: 155ed585e1a0adfdedeebeed69c0eb2332dea8a6 https://github.com/galaxyproject/galaxy/commit/155ed585e1a0adfdedeebeed69c0e... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-01 (Wed, 01 Nov 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js M static/maps/mvc/grid/grid-template.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/grid/grid-template.js Log Message: ----------- Merge pull request #4913 from guerler/fix_status_matching Fix status handling for grids Compare: https://github.com/galaxyproject/galaxy/compare/c0a3148b84b3...155ed585e1a0