Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b97281920b341d141fe0b94ecd5c8ecc5f175454 https://github.com/galaxyproject/galaxy/commit/b97281920b341d141fe0b94ecd5c8... Author: Eric Rasche rasche.eric@gmail.com Date: 2016-08-18 (Thu, 18 Aug 2016)

Changed paths: M config/plugins/interactive_environments/rstudio/static/js/rstudio.js M config/plugins/interactive_environments/rstudio/templates/rstudio.mako

Log Message: ----------- Cleanup for 16.10 rstudio

Commit: 0aeb9e816a9807117b26691c248483cbad07e16a https://github.com/galaxyproject/galaxy/commit/0aeb9e816a9807117b26691c24848... Author: Eric Rasche rasche.eric@gmail.com Date: 2016-08-19 (Fri, 19 Aug 2016)

Changed paths: M config/plugins/interactive_environments/rstudio/static/js/rstudio.js M config/plugins/interactive_environments/rstudio/templates/rstudio.mako

Log Message: ----------- Clean up rstudio conf, now working again

Commit: 56a8c01fef6c419d3fb23cec85dbac726831d789 https://github.com/galaxyproject/galaxy/commit/56a8c01fef6c419d3fb23cec85dba... Author: Eric Rasche rasche.eric@gmail.com Date: 2016-08-19 (Fri, 19 Aug 2016)

Changed paths: M config/plugins/interactive_environments/rstudio/config/allowed_images.yml.sample

Log Message: ----------- Bump image

Commit: 65fe971008967bbf477b578852e004e94657e215 https://github.com/galaxyproject/galaxy/commit/65fe971008967bbf477b578852e00... Author: nturaga nitesh.turaga@gmail.com Date: 2016-08-23 (Tue, 23 Aug 2016)

Changed paths: M config/plugins/interactive_environments/rstudio/templates/rstudio.mako

Log Message: ----------- add correct login url

Commit: 198c6d92e608ca78454ca9c06dc2bd8865d8387c https://github.com/galaxyproject/galaxy/commit/198c6d92e608ca78454ca9c06dc2b... Author: Eric Rasche rasche.eric@gmail.com Date: 2016-08-23 (Tue, 23 Aug 2016)

Changed paths: M config/plugins/interactive_environments/rstudio/templates/rstudio.mako

Log Message: ----------- Merge pull request #17 from nturaga/rstudio_mako_url

add correct login url

Commit: 92105d99fae6ec892f2eb6eb60c31d68196b061a https://github.com/galaxyproject/galaxy/commit/92105d99fae6ec892f2eb6eb60c31... Author: Martin Cech cech.marten@gmail.com Date: 2016-11-16 (Wed, 16 Nov 2016)

Changed paths: M config/plugins/interactive_environments/rstudio/config/allowed_images.yml.sample M config/plugins/interactive_environments/rstudio/static/js/rstudio.js M config/plugins/interactive_environments/rstudio/templates/rstudio.mako

Log Message: ----------- Merge pull request #2818 from erasche/rstudio-1610

Return of RStudio

Compare: https://github.com/galaxyproject/galaxy/compare/31b73fd5869f...92105d99fae6