Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 68f5bc7a1ae092da266dae78adba5de8ebfd6eb2 https://github.com/galaxyproject/galaxy/commit/68f5bc7a1ae092da266dae78adba5... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-01-12 (Thu, 12 Jan 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-misc.js Log Message: ----------- Reapply ui-misc.Message changes post-reversion. Following up with fixes to other uses of this component. Commit: b798895af0c815783f741aa8c6278ed71ee6f0f2 https://github.com/galaxyproject/galaxy/commit/b798895af0c815783f741aa8c6278... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-01-12 (Thu, 12 Jan 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-view.js M static/maps/mvc/form/form-view.js.map M static/maps/mvc/ui/ui-misc.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/form/form-view.js M static/scripts/mvc/ui/ui-misc.js Log Message: ----------- Swap form-view to use the new UnescapedMessage Commit: 08454cfa2a0ff2d02b3ec2a61740dd429c8a67f8 https://github.com/galaxyproject/galaxy/commit/08454cfa2a0ff2d02b3ec2a61740d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-01-13 (Fri, 13 Jan 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-misc.js M static/maps/mvc/ui/ui-misc.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/ui/ui-misc.js Log Message: ----------- Name function appropriately for Javascript instead of being stuck in Python. Commit: 02a8a7da0a0f2e3ff9c6d3cb7c5f2e1d56621a24 https://github.com/galaxyproject/galaxy/commit/02a8a7da0a0f2e3ff9c6d3cb7c5f2... Author: John Chilton <jmchilton@gmail.com> Date: 2017-01-15 (Sun, 15 Jan 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/ui/ui-misc.js M static/maps/mvc/form/form-view.js.map M static/maps/mvc/ui/ui-misc.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/form/form-view.js M static/scripts/mvc/ui/ui-misc.js Log Message: ----------- Merge pull request #3416 from dannon/ui_misc_message_fixes [16.10] Sanitize ui-misc.Message, implement UnescapedMessage for uses where we need html Commit: 8cb61626811d51afef0f7e27e9713fa98e6b664a https://github.com/galaxyproject/galaxy/commit/8cb61626811d51afef0f7e27e9713... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-01-16 (Mon, 16 Jan 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/ui/ui-misc.js M static/maps/mvc/form/form-view.js.map M static/maps/mvc/ui/ui-misc.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/form/form-view.js M static/scripts/mvc/ui/ui-misc.js Log Message: ----------- Merge branch 'release_16.10' into dev Conflicts: static/maps/mvc/ui/ui-misc.js.map static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map static/scripts/mvc/ui/ui-misc.js Compare: https://github.com/galaxyproject/galaxy/compare/ebf18440ac09...8cb61626811d