Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: a5c445966ef3ea8385493ffd2ca6bf6dce8611aa https://github.com/galaxyproject/galaxy/commit/a5c445966ef3ea8385493ffd2ca6b... 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 A static/maps/libs/showdown.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 A static/scripts/libs/showdown.js M static/scripts/mvc/ui/ui-misc.js Log Message: ----------- Swap the client's ui-misc.Message to escape by default. Commit: e1083132b89f854e2ec824f97f187e925ba0abe6 https://github.com/galaxyproject/galaxy/commit/e1083132b89f854e2ec824f97f187... 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 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: ----------- Add UnescapedMessage, for when we actually need to display a message with html contents. Any users of this must escape contents on their own. Commit: cc4cd55c1df0fd3ae78bdbff99ad70c2ed723def https://github.com/galaxyproject/galaxy/commit/cc4cd55c1df0fd3ae78bdbff99ad7... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2017-01-12 (Thu, 12 Jan 2017) Changed paths: M config/plugins/interactive_environments/rstudio/templates/rstudio.mako Log Message: ----------- Fix RStudio login Thanks @shiltemann for reporting this Commit: 3060da4ee53e44c0814eebe2c468f2d3dc352233 https://github.com/galaxyproject/galaxy/commit/3060da4ee53e44c0814eebe2c468f... 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 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: ----------- Export UnescapedMessage from ui-misc. Commit: 45a9d586b6e1db89bf0813aa93af5b3bbaf72efc https://github.com/galaxyproject/galaxy/commit/45a9d586b6e1db89bf0813aa93af5... 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 M static/maps/mvc/ui/ui-misc.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Formatting cleanup. Commit: 890107334d25b80ee1fc02d00df011f2e7e9d88a https://github.com/galaxyproject/galaxy/commit/890107334d25b80ee1fc02d00df01... 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 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: ----------- Reversion of ui-misc messagebox changes. Commit: 2d69909218b287f8085a599e0a2a1214480330c9 https://github.com/galaxyproject/galaxy/commit/2d69909218b287f8085a599e0a2a1... Author: John Chilton <jmchilton@gmail.com> Date: 2017-01-12 (Thu, 12 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: ----------- Merge pull request #3415 from dannon/revert_uimisc [16.10]Reversion of ui-misc messagebox changes. Commit: c94ccb3f28cdf3acbfe863b386c5dcb58752fe50 https://github.com/galaxyproject/galaxy/commit/c94ccb3f28cdf3acbfe863b386c5d... Author: John Chilton <jmchilton@gmail.com> Date: 2017-01-13 (Fri, 13 Jan 2017) Changed paths: M config/plugins/interactive_environments/rstudio/templates/rstudio.mako Log Message: ----------- Merge pull request #3414 from erasche/fix-rstudio-login [16.10] Fix RStudio login Commit: b2cf773befd655ccae204c358703c9061916a32f https://github.com/galaxyproject/galaxy/commit/b2cf773befd655ccae204c358703c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-01-13 (Fri, 13 Jan 2017) Changed paths: M config/plugins/interactive_environments/rstudio/templates/rstudio.mako A static/maps/libs/showdown.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map A static/scripts/libs/showdown.js Log Message: ----------- Merge remote-tracking branch 'upstream/release_16.10' into dev Compare: https://github.com/galaxyproject/galaxy/compare/1f9812b5d522...b2cf773befd6