Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d61356dfeaaa4e2e7f0b0a58875a90da67aa210c https://github.com/galaxyproject/galaxy/commit/d61356dfeaaa4e2e7f0b0a58875a9... Author: Anne Fouilloux annefou@uio.no Date: 2016-12-09 (Fri, 09 Dec 2016)
Changed paths: M config/galaxy.ini.sample M lib/galaxy/datatypes/text.py
Log Message: ----------- changed ipython to jupyter
When converting jupyter notebook to html, ipython command is used instead of jupyter (ipython is becoming obsolete).
Commit: 93da60c48e9947b2ae5f7ff080db20fbcd59c51f https://github.com/galaxyproject/galaxy/commit/93da60c48e9947b2ae5f7ff080db2... Author: Anne Fouilloux annefou@uio.no Date: 2016-12-12 (Mon, 12 Dec 2016)
Changed paths: M config/galaxy.ini.sample M doc/source/admin/interactive_environments.rst M doc/source/admin/interactive_environments.svg M doc/source/dev/interactive_environments.rst M lib/galaxy/config.py M lib/galaxy/datatypes/text.py M lib/galaxy/visualization/plugins/plugin.py M lib/galaxy/visualization/plugins/registry.py M lib/galaxy/web/framework/middleware/sentry.py M lib/galaxy/web/proxy/js/Dockerfile M test/unit/visualizations/plugins/test_VisualizationsRegistry.py
Log Message: ----------- Changed ipython with jupyter
not only for converting jupyter notebook to HTML (with nbconvert) but also where ipython/IPython was referenced.
Some files still contain ipython but this is mostly related to documentation or to the IE docker container itself.
Commit: 7468ea3d34312b1562454d43a2eaf0158ac5478e https://github.com/galaxyproject/galaxy/commit/7468ea3d34312b1562454d43a2eaf... Author: Anne Fouilloux annefou@uio.no Date: 2016-12-12 (Mon, 12 Dec 2016)
Changed paths: M doc/Makefile A doc/fix_schema_rst.sh M doc/source/admin/index.rst M doc/source/admin/webhooks.rst M doc/source/project/organization.rst M doc/source/releases/16.10.rst M doc/source/releases/16.10_announce.rst M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/tools/deps/installable.py M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map
Log Message: ----------- Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev
to take into account the latest changes done on the galaxyproject
Commit: 553f781d39218d9b717e5a09ebfcf5214e680e16 https://github.com/galaxyproject/galaxy/commit/553f781d39218d9b717e5a09ebfcf... Author: John Chilton jmchilton@gmail.com Date: 2016-12-16 (Fri, 16 Dec 2016)
Changed paths: M config/galaxy.ini.sample M doc/source/admin/interactive_environments.rst M doc/source/admin/interactive_environments.svg M doc/source/dev/interactive_environments.rst M lib/galaxy/config.py M lib/galaxy/datatypes/text.py M lib/galaxy/visualization/plugins/plugin.py M lib/galaxy/visualization/plugins/registry.py M lib/galaxy/web/framework/middleware/sentry.py M lib/galaxy/web/proxy/js/Dockerfile M test/unit/visualizations/plugins/test_VisualizationsRegistry.py
Log Message: ----------- Merge pull request #3294 from annefou/dev
changed ipython to jupyter
Compare: https://github.com/galaxyproject/galaxy/compare/330cb432e819...553f781d3921