Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 842d14a0e6fb9d4226012b91ad104b387bd36988 https://github.com/galaxyproject/galaxy/commit/842d14a0e6fb9d4226012b91ad104... Author: Thoba Lose lose.thoba@gmail.com Date: 2017-06-13 (Tue, 13 Jun 2017)

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

Log Message: ----------- Upgrade IE to Neo4j:3.1

Commit: 3461b2654045f36c446556858416db3c60175027 https://github.com/galaxyproject/galaxy/commit/3461b2654045f36c446556858416d... Author: Thoba Lose lose.thoba@gmail.com Date: 2017-06-21 (Wed, 21 Jun 2017)

Changed paths: M .gitignore M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/panels/tool-panel.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/layout/panel.js M client/galaxy/scripts/mvc/grid/grid-view.js A client/galaxy/scripts/mvc/history/history-list.js M client/galaxy/scripts/mvc/history/history-view-edit-current.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/mvc/webhooks.js M client/galaxy/scripts/mvc/workflow/workflow-configure-menu.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/onload.js M client/galaxy/scripts/utils/utils.js M client/galaxy/style/less/base.less M config/plugins/webhooks/demo/tool_list/helper/__init__.py A config/plugins/webhooks/demo/tour_generator/config/tour_generator.yml A config/plugins/webhooks/demo/tour_generator/helper/__init__.py A config/plugins/webhooks/demo/tour_generator/static/script.js A config/plugins/webhooks/demo/tour_generator/static/styles.css M cron/updateucsc.sh.sample M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/mulled/invfile.lua M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_files.py M lib/galaxy/tools/deps/mulled/mulled_build_tool.py M lib/galaxy/webapps/galaxy/api/webhooks.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M scripts/api/library_upload_dir.py M static/maps/layout/menu.js.map M static/maps/layout/page.js.map M static/maps/layout/panel.js.map M static/maps/mvc/grid/grid-view.js.map A static/maps/mvc/history/history-list.js.map M static/maps/mvc/history/history-view-edit-current.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/tool/tool-form-composite.js.map M static/maps/mvc/tool/tool-form.js.map M static/maps/mvc/user/user-preferences.js.map M static/maps/mvc/webhooks.js.map M static/maps/mvc/workflow/workflow-configure-menu.js.map M static/maps/mvc/workflow/workflow.js.map M static/maps/onload.js.map M static/maps/utils/utils.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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 M static/scripts/bundled/login.bundled.js.map M static/scripts/layout/menu.js M static/scripts/layout/page.js M static/scripts/layout/panel.js M static/scripts/mvc/grid/grid-view.js A static/scripts/mvc/history/history-list.js M static/scripts/mvc/history/history-view-edit-current.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/tool/tool-form-composite.js M static/scripts/mvc/tool/tool-form.js M static/scripts/mvc/user/user-preferences.js M static/scripts/mvc/webhooks.js M static/scripts/mvc/workflow/workflow-configure-menu.js M static/scripts/mvc/workflow/workflow.js M static/scripts/onload.js M static/scripts/utils/utils.js M static/style/blue/base.css M templates/js-app.mako R templates/webapps/galaxy/history/grid.mako R templates/webapps/galaxy/history/grid_js.mako R templates/webapps/galaxy/workflow/import.mako R templates/webapps/galaxy/workflow/run.mako M test/functional/webhooks/phdcomics/helper/__init__.py M test/functional/webhooks/trans_object/helper/__init__.py

Log Message: ----------- Merge branch 'dev' of github.com:galaxyproject/galaxy into neo4j-ie

Commit: 009f44c25f9c4ebb467f7c6ceb30b605a0fae923 https://github.com/galaxyproject/galaxy/commit/009f44c25f9c4ebb467f7c6ceb30b... Author: Thoba Lose lose.thoba@gmail.com Date: 2017-06-22 (Thu, 22 Jun 2017)

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

Log Message: ----------- using sanbi-sa image.

Commit: 739fb083f0801d4dfd85fdff0355df1920ea0b1b https://github.com/galaxyproject/galaxy/commit/739fb083f0801d4dfd85fdff0355d... Author: John Chilton jmchilton@gmail.com Date: 2017-06-22 (Thu, 22 Jun 2017)

Changed paths: M .gitignore M config/plugins/interactive_environments/neo/config/allowed_images.yml.sample M config/plugins/interactive_environments/neo/config/neo.ini.sample

Log Message: ----------- Merge pull request #4216 from thobalose/neo4j-ie

Upgrading Neo4j IE to 3.1

Compare: https://github.com/galaxyproject/galaxy/compare/ecdaa04dfd14...739fb083f080