Branch: refs/heads/release_15.10 Home: https://github.com/galaxyproject/galaxy Commit: 774487ddcc9c0e793b6b15b26c971c3df5822644 https://github.com/galaxyproject/galaxy/commit/774487ddcc9c0e793b6b15b26c971... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-03-07 (Mon, 07 Mar 2016)

Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.js.map M static/scripts/mvc/citation/citation-model.js

Log Message: ----------- Fix citation-model to fail silently/gracefully when a non-parsable bibtex entry is tried

Commit: d225aebc8879b3e96963724d3b5b11aec1d50ed5 https://github.com/galaxyproject/galaxy/commit/d225aebc8879b3e96963724d3b5b1... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-07 (Mon, 07 Mar 2016)

Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.js.map M static/scripts/mvc/citation/citation-model.js

Log Message: ----------- Merge pull request #1884 from carlfeberhard/release_15.10

[15.10] Fix citation-model to fail silently/gracefully

Compare: https://github.com/galaxyproject/galaxy/compare/b5949bcbbfbc...d225aebc8879