Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 66a02b6af192c78f53ad2901f55515cd9f712ab7 https://github.com/galaxyproject/galaxy/commit/66a02b6af192c78f53ad2901f5551... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M doc/source/admin/index.rst A doc/source/admin/tool_panel.rst M doc/source/conf.py M doc/source/dev/index.rst M doc/source/dev/interactive_environments.rst M doc/source/index.rst M doc/source/project/issues.rst Log Message: ----------- modify our docs in preparation for restructuring start moving admin content from old wiki Commit: 817a9db1f7bca855fe8f35c4b188c10a5c3a6653 https://github.com/galaxyproject/galaxy/commit/817a9db1f7bca855fe8f35c4b188c... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: R doc/source/admin/chat-0.png R doc/source/admin/chat-1.png R doc/source/admin/chat-2.png R doc/source/admin/chat-3.png R doc/source/admin/chat-4.png R doc/source/admin/chat.rst R doc/source/admin/communication_server.png R doc/source/admin/communication_server_rooms.png R doc/source/admin/grt.rst M doc/source/admin/index.rst R doc/source/admin/interactive_environments.png R doc/source/admin/interactive_environments.rst R doc/source/admin/interactive_environments.svg R doc/source/admin/mulled_containers.rst A doc/source/admin/special_topics/chat-0.png A doc/source/admin/special_topics/chat-1.png A doc/source/admin/special_topics/chat-2.png A doc/source/admin/special_topics/chat-3.png A doc/source/admin/special_topics/chat-4.png A doc/source/admin/special_topics/chat.rst A doc/source/admin/special_topics/communication_server.png A doc/source/admin/special_topics/communication_server_rooms.png A doc/source/admin/special_topics/grt.rst A doc/source/admin/special_topics/index.rst A doc/source/admin/special_topics/interactive_environments.png A doc/source/admin/special_topics/interactive_environments.rst A doc/source/admin/special_topics/interactive_environments.svg A doc/source/admin/special_topics/mulled_containers.rst A doc/source/admin/special_topics/webhooks.rst R doc/source/admin/webhooks.rst M doc/source/index.rst Log Message: ----------- move some admin docs to separate special topics section Commit: 6f8deb6f4a07bd57493d24cd90a9862dbf7e6d0c https://github.com/galaxyproject/galaxy/commit/6f8deb6f4a07bd57493d24cd90a98... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: R doc/source/admin/images_webhooks/history-menu.png R doc/source/admin/images_webhooks/masthead.png R doc/source/admin/images_webhooks/masthead_trans_object.png R doc/source/admin/images_webhooks/tool.png R doc/source/admin/images_webhooks/workflow.png A doc/source/admin/special_topics/images_webhooks/history-menu.png A doc/source/admin/special_topics/images_webhooks/masthead.png A doc/source/admin/special_topics/images_webhooks/masthead_trans_object.png A doc/source/admin/special_topics/images_webhooks/tool.png A doc/source/admin/special_topics/images_webhooks/workflow.png Log Message: ----------- move webhooks images where they belong Commit: 4b6373f042ad98f4f3ac664911ab35611280f204 https://github.com/galaxyproject/galaxy/commit/4b6373f042ad98f4f3ac664911ab3... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M doc/source/admin/index.rst Log Message: ----------- fix outdated links Commit: 3d092d683efef26bde2d2d453c07caa8a8c4322e https://github.com/galaxyproject/galaxy/commit/3d092d683efef26bde2d2d453c07c... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-03-15 (Wed, 15 Mar 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/galaxy.interactive_environments.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/tool/tools.js M client/galaxy/scripts/mvc/user/user-preferences.js M config/datatypes_conf.xml.sample M config/dependency_resolvers_conf.xml.sample M config/galaxy.ini.sample M config/plugins/interactive_environments/bam_iobio/static/js/bam_iobio.js M config/plugins/interactive_environments/bam_iobio/templates/bam_iobio.mako M config/plugins/interactive_environments/common/templates/ie.mako M config/plugins/interactive_environments/jupyter/static/js/jupyter.js M config/plugins/interactive_environments/jupyter/templates/jupyter.mako M config/plugins/interactive_environments/neo/static/js/neo.js M config/plugins/interactive_environments/neo/templates/neo.mako M config/plugins/interactive_environments/phinch/static/js/phinch.js M config/plugins/interactive_environments/phinch/templates/phinch.mako M config/plugins/interactive_environments/rstudio/static/js/rstudio.js M config/plugins/interactive_environments/rstudio/templates/rstudio.mako A config/plugins/webhooks/demo/search/config/searchover.yaml A config/plugins/webhooks/demo/search/static/script.js A config/plugins/webhooks/demo/search/static/styles.css A config/swarm_manager_conf.yml.sample R cron/clean_docker_swarm_mode_services.sh M doc/source/admin/dependency_resolvers.rst M doc/source/admin/special_topics/interactive_environments.rst M lib/galaxy/config.py A lib/galaxy/container/__init__.py A lib/galaxy/container/docker_swarm.py M lib/galaxy/dependencies/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/model/__init__.py M lib/galaxy/queue_worker.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/util/json.py M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/framework/base.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/web/proxy/js/lib/mapper.js M lib/galaxy/webapps/galaxy/api/tool_dependencies.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/history.py A lib/galaxy/webapps/galaxy/controllers/interactive_environments.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/workflow/steps.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M static/maps/galaxy.interactive_environments.js.map M static/maps/layout/menu.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/grid/grid-template.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/mvc/tool/tools.js.map M static/maps/mvc/user/user-preferences.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/galaxy.interactive_environments.js M static/scripts/layout/menu.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/grid/grid-template.js M static/scripts/mvc/grid/grid-view.js M static/scripts/mvc/tool/tools.js M static/scripts/mvc/user/user-preferences.js M templates/grid_base.mako M templates/webapps/galaxy/admin/index.mako A templates/webapps/galaxy/admin/manage_dependencies.mako R templates/webapps/galaxy/user/manage_info.mako M templates/webapps/tool_shed/repository/common.mako M test/integration/test_resolvers.py Log Message: ----------- Merge branch 'dev' into admin-docs-from-hub Commit: 27cb4fbedca6ab44ecc5a154e3102462bd0a09af https://github.com/galaxyproject/galaxy/commit/27cb4fbedca6ab44ecc5a154e3102... Author: John Chilton <jmchilton@gmail.com> Date: 2017-03-15 (Wed, 15 Mar 2017) Changed paths: R doc/source/admin/chat-0.png R doc/source/admin/chat-1.png R doc/source/admin/chat-2.png R doc/source/admin/chat-3.png R doc/source/admin/chat-4.png R doc/source/admin/chat.rst R doc/source/admin/communication_server.png R doc/source/admin/communication_server_rooms.png R doc/source/admin/grt.rst R doc/source/admin/images_webhooks/history-menu.png R doc/source/admin/images_webhooks/masthead.png R doc/source/admin/images_webhooks/masthead_trans_object.png R doc/source/admin/images_webhooks/tool.png R doc/source/admin/images_webhooks/workflow.png M doc/source/admin/index.rst R doc/source/admin/interactive_environments.png R doc/source/admin/interactive_environments.rst R doc/source/admin/interactive_environments.svg R doc/source/admin/mulled_containers.rst A doc/source/admin/special_topics/chat-0.png A doc/source/admin/special_topics/chat-1.png A doc/source/admin/special_topics/chat-2.png A doc/source/admin/special_topics/chat-3.png A doc/source/admin/special_topics/chat-4.png A doc/source/admin/special_topics/chat.rst A doc/source/admin/special_topics/communication_server.png A doc/source/admin/special_topics/communication_server_rooms.png A doc/source/admin/special_topics/grt.rst A doc/source/admin/special_topics/images_webhooks/history-menu.png A doc/source/admin/special_topics/images_webhooks/masthead.png A doc/source/admin/special_topics/images_webhooks/masthead_trans_object.png A doc/source/admin/special_topics/images_webhooks/tool.png A doc/source/admin/special_topics/images_webhooks/workflow.png A doc/source/admin/special_topics/index.rst A doc/source/admin/special_topics/interactive_environments.png A doc/source/admin/special_topics/interactive_environments.rst A doc/source/admin/special_topics/interactive_environments.svg A doc/source/admin/special_topics/mulled_containers.rst A doc/source/admin/special_topics/webhooks.rst A doc/source/admin/tool_panel.rst R doc/source/admin/webhooks.rst M doc/source/conf.py M doc/source/dev/index.rst M doc/source/dev/interactive_environments.rst M doc/source/index.rst M doc/source/project/issues.rst Log Message: ----------- Merge pull request #3738 from martenson/admin-docs-from-hub modify our docs in preparation for restructuring Compare: https://github.com/galaxyproject/galaxy/compare/0498c7f833fa...27cb4fbedca6