Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 050a3f26bbd4c1372f55bdaf2d774f48bdb1b490 https://github.com/galaxyproject/galaxy/commit/050a3f26bbd4c1372f55bdaf2d774... Author: Scott Szakonyi sszakony@nd.edu Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths: M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/scratchbook.js M static/maps/layout/menu.js.map M static/maps/layout/scratchbook.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js M static/scripts/layout/scratchbook.js
Log Message: ----------- Addressing issue 2747
Commit: 7eacecab0e40fb592393b57fdebed4c789ba088b https://github.com/galaxyproject/galaxy/commit/7eacecab0e40fb592393b57fdebed... Author: Scott Szakonyi sszakony@nd.edu Date: 2016-08-19 (Fri, 19 Aug 2016)
Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/datatypes/data.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/model/__init__.py M lib/galaxy/model/migrate/check.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/util/template.py M lib/galaxy/webapps/galaxy/api/history_contents.py M lib/galaxy/webapps/tool_shed/api/repositories.py M lib/galaxy/webapps/tool_shed/app.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/controllers/repository.py 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 A test/functional/tools/dbkey_output_action.xml M test/functional/tools/samples_tool_conf.xml
Log Message: ----------- Merge remote branch 'upstream/dev' into dev
Commit: b83b93451c88e87e489a672996bdea9ab4aa2369 https://github.com/galaxyproject/galaxy/commit/b83b93451c88e87e489a672996bde... Author: Scott Szakonyi sszakony@nd.edu Date: 2016-08-22 (Mon, 22 Aug 2016)
Changed paths: M config/galaxy.ini.sample M lib/galaxy/web/proxy/__init__.py M lib/galaxy/web/proxy/js/lib/main.js M lib/galaxy/web/proxy/js/lib/proxy.js M lib/galaxy/web/proxy/js/package.json
Log Message: ----------- Merge remote branch 'upstream/dev' into dev
Commit: 7a496d404afd38a7f85ae55eda799d655ff90241 https://github.com/galaxyproject/galaxy/commit/7a496d404afd38a7f85ae55eda799... Author: Scott Szakonyi sszakony@nd.edu Date: 2016-08-22 (Mon, 22 Aug 2016)
Changed paths: R database/info.txt 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
Log Message: ----------- Updating to lastest upstream commit
Commit: c09bd5688a8adb309df33049fd3c8cee0e6b80ac https://github.com/galaxyproject/galaxy/commit/c09bd5688a8adb309df33049fd3c8... Author: Scott Szakonyi sszakony@nd.edu Date: 2016-08-31 (Wed, 31 Aug 2016)
Changed paths: M .ci/flake8_lint_include_list.txt M Makefile M client/galaxy/scripts/mvc/dataset/data.js M client/galaxy/scripts/mvc/form/form-data.js M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/ui/ui-color-picker.js M client/galaxy/scripts/mvc/ui/ui-tabs.js M client/galaxy/scripts/utils/utils.js M config/galaxy.ini.sample M config/plugins/visualizations/charts/static/app.css M config/plugins/visualizations/charts/static/app.js R config/plugins/visualizations/charts/static/charts/forms/default.js M config/plugins/visualizations/charts/static/charts/jqplot/bar/config.js M config/plugins/visualizations/charts/static/charts/jqplot/bar/wrapper.js M config/plugins/visualizations/charts/static/charts/jqplot/boxplot/config.js M config/plugins/visualizations/charts/static/charts/jqplot/boxplot/wrapper.js M config/plugins/visualizations/charts/static/charts/jqplot/common/config.js M config/plugins/visualizations/charts/static/charts/jqplot/common/plot-config.js M config/plugins/visualizations/charts/static/charts/jqplot/common/wrapper.js M config/plugins/visualizations/charts/static/charts/jqplot/histogram_discrete/config.js M config/plugins/visualizations/charts/static/charts/jqplot/histogram_discrete/wrapper.js M config/plugins/visualizations/charts/static/charts/jqplot/line/config.js M config/plugins/visualizations/charts/static/charts/jqplot/line/wrapper.js M config/plugins/visualizations/charts/static/charts/jqplot/scatter/config.js M config/plugins/visualizations/charts/static/charts/jqplot/scatter/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/bar/config.js M config/plugins/visualizations/charts/static/charts/nvd3/bar/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/bar_horizontal/config.js M config/plugins/visualizations/charts/static/charts/nvd3/bar_horizontal/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/bar_horizontal_stacked/config.js M config/plugins/visualizations/charts/static/charts/nvd3/bar_horizontal_stacked/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/bar_stacked/config.js M config/plugins/visualizations/charts/static/charts/nvd3/bar_stacked/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/common/config.js M config/plugins/visualizations/charts/static/charts/nvd3/common/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/histogram/config.js M config/plugins/visualizations/charts/static/charts/nvd3/histogram/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/histogram_discrete/config.js M config/plugins/visualizations/charts/static/charts/nvd3/histogram_discrete/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/line/config.js M config/plugins/visualizations/charts/static/charts/nvd3/line/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/line_focus/config.js M config/plugins/visualizations/charts/static/charts/nvd3/line_focus/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/pie/config.js M config/plugins/visualizations/charts/static/charts/nvd3/pie/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/scatter/config.js M config/plugins/visualizations/charts/static/charts/nvd3/scatter/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/stackedarea/config.js M config/plugins/visualizations/charts/static/charts/nvd3/stackedarea/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/stackedarea_full/config.js M config/plugins/visualizations/charts/static/charts/nvd3/stackedarea_full/wrapper.js M config/plugins/visualizations/charts/static/charts/nvd3/stackedarea_stream/config.js M config/plugins/visualizations/charts/static/charts/nvd3/stackedarea_stream/wrapper.js A config/plugins/visualizations/charts/static/charts/others/example/config.js A config/plugins/visualizations/charts/static/charts/others/example/logo.png A config/plugins/visualizations/charts/static/charts/others/example/wrapper.js M config/plugins/visualizations/charts/static/charts/others/heatmap/config.js M config/plugins/visualizations/charts/static/charts/others/heatmap/heatmap-parameters.js M config/plugins/visualizations/charts/static/charts/others/heatmap/heatmap-plugin.js M config/plugins/visualizations/charts/static/charts/others/heatmap/wrapper.js M config/plugins/visualizations/charts/static/charts/others/heatmap_cluster/config.js M config/plugins/visualizations/charts/static/charts/others/heatmap_cluster/wrapper.js A config/plugins/visualizations/charts/static/charts/overview.js R config/plugins/visualizations/charts/static/charts/tools.js M config/plugins/visualizations/charts/static/charts/types.js A config/plugins/visualizations/charts/static/charts/utilities/tabular-datasets.js A config/plugins/visualizations/charts/static/charts/utilities/tabular-form.js A config/plugins/visualizations/charts/static/charts/utilities/tabular-inputs.js A config/plugins/visualizations/charts/static/charts/utilities/tabular-utilities.js A config/plugins/visualizations/charts/static/components/jobs.js A config/plugins/visualizations/charts/static/components/model.js A config/plugins/visualizations/charts/static/components/screenshot.js A config/plugins/visualizations/charts/static/components/storage.js R config/plugins/visualizations/charts/static/library/datasets.js R config/plugins/visualizations/charts/static/library/jobs.js R config/plugins/visualizations/charts/static/library/screenshot.js R config/plugins/visualizations/charts/static/library/storage.js R config/plugins/visualizations/charts/static/models/chart.js R config/plugins/visualizations/charts/static/models/config.js A config/plugins/visualizations/charts/static/views/description.js M config/plugins/visualizations/charts/static/views/editor.js M config/plugins/visualizations/charts/static/views/groups.js M config/plugins/visualizations/charts/static/views/settings.js M config/plugins/visualizations/charts/static/views/types.js M config/plugins/visualizations/charts/static/views/viewer.js M config/plugins/visualizations/charts/static/views/viewport.js M config/plugins/visualizations/charts/templates/charts.mako M config/reports.ini.sample M config/tool_shed.ini.sample A doc/source/admin/chat-0.png A doc/source/admin/chat-1.png A doc/source/admin/chat-2.png A doc/source/admin/chat-3.png A doc/source/admin/chat-4.png A doc/source/admin/chat.rst A doc/source/admin/communication_server.png A doc/source/admin/communication_server_rooms.png A doc/source/admin/conda_faq.rst M doc/source/admin/index.rst A doc/source/releases/16.07.rst M doc/source/releases/16.07_announce.rst A doc/source/releases/16.10_announce.rst M lib/galaxy/auth/providers/ldap_ad.py M lib/galaxy/config.py M lib/galaxy/jobs/__init__.py M lib/galaxy/security/validate_user_input.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/watcher.py M lib/galaxy/util/postfork.py M lib/galaxy/web/framework/base.py A lib/galaxy/web/framework/middleware/batch.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/tool_shed/config.py M scripts/bootstrap_history.py M static/maps/mvc/dataset/data.js.map M static/maps/mvc/form/form-data.js.map M static/maps/mvc/form/form-view.js.map M static/maps/mvc/ui/ui-color-picker.js.map M static/maps/mvc/ui/ui-tabs.js.map M static/maps/utils/utils.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/mvc/dataset/data.js M static/scripts/mvc/form/form-data.js M static/scripts/mvc/form/form-view.js M static/scripts/mvc/ui/ui-tabs.js M static/scripts/utils/utils.js R templates/admin/tool_shed_repository/browse_categories.mako A templates/admin/tool_shed_repository/browse_toolsheds.mako R templates/admin/tool_shed_repository/preview_repository.mako M templates/webapps/galaxy/workflow/display.mako M templates/webapps/tool_shed/index.mako A test/api/test_api_batch.py A test/casperjs/api-batch-tests.js
Log Message: ----------- Merge remote branch 'upstream/dev' into dev
Commit: 0d160900ace430f370330a3343e3c3ed79c78450 https://github.com/galaxyproject/galaxy/commit/0d160900ace430f370330a3343e3c... Author: Aysam Guerler aysam.guerler@gmail.com Date: 2016-08-31 (Wed, 31 Aug 2016)
Changed paths: M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/scratchbook.js R database/info.txt M static/maps/layout/menu.js.map M static/maps/layout/scratchbook.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js M static/scripts/layout/scratchbook.js
Log Message: ----------- Merge pull request #2808 from sszakony/dev
Addressing issue 2747, login appearing in scratchbook window
Compare: https://github.com/galaxyproject/galaxy/compare/5ebdefe40f1d...0d160900ace4