Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2acdbe54f76312cb748693e018d2d505cf95c3a2 https://github.com/galaxyproject/galaxy/commit/2acdbe54f76312cb748693e018d2d... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-12-14 (Mon, 14 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.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/citation/citation-model.js M templates/webapps/galaxy/workflow/editor.mako Log Message: ----------- UI, Citations: fix citation-model's import of bibtex to use *either* commonjs or global Commit: 4c3dfc7cd471181edc406724ca8f039e6b2a83d1 https://github.com/galaxyproject/galaxy/commit/4c3dfc7cd471181edc406724ca8f0... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-14 (Mon, 14 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.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/citation/citation-model.js M templates/webapps/galaxy/workflow/editor.mako Log Message: ----------- Merge pull request #1321 from carlfeberhard/fix.citations UI, Citations: fix citation-model's import of bibtex to use *either* … Compare: https://github.com/galaxyproject/galaxy/compare/5bf926bf3ec1...4c3dfc7cd471