Branch: refs/heads/release_17.05
Home: https://github.com/galaxyproject/galaxy
Commit: f439fd30eb1f803daf8e1898bc1648c8cee131f8
https://github.com/galaxyproject/galaxy/commit/f439fd30eb1f803daf8e1898bc16…
Author: Andrea Bagnacani <andrea.bagnacani(a)uni-rostock.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
Changed paths:
M client/galaxy/scripts/mvc/tours.js
M static/maps/mvc/tool/tool-form-base.js.map
M static/maps/mvc/tours.js.map
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.map
M static/scripts/mvc/tool/tool-form-base.js
M static/scripts/mvc/tours.js
Log Message:
-----------
conditional postclick execution onNext
Commit: e58b24db6133720edf442ca85702e4bba050e9c9
https://github.com/galaxyproject/galaxy/commit/e58b24db6133720edf442ca85702…
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M client/galaxy/scripts/mvc/tours.js
M static/maps/mvc/tool/tool-form-base.js.map
M static/maps/mvc/tours.js.map
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.map
M static/scripts/mvc/tool/tool-form-base.js
M static/scripts/mvc/tours.js
Log Message:
-----------
Merge pull request #4228 from bagnacan/release_17.05_backport_4062
[17.05] conditional postclick execution onNext
Compare: https://github.com/galaxyproject/galaxy/compare/fc613d2d60c1...e58b24db6133
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 390afd6e83c2d8d4a885a28e91664045d6102b1c
https://github.com/galaxyproject/galaxy/commit/390afd6e83c2d8d4a885a28e9166…
Author: anuprulez <anup.rulez(a)gmail.com>
Date: 2017-07-06 (Thu, 06 Jul 2017)
Changed paths:
M client/galaxy/scripts/viz/phyloviz.js
M static/maps/viz/phyloviz.js.map
M static/scripts/viz/phyloviz.js
Log Message:
-----------
Updating the node tooltip to add confidence level information
Commit: ee948063e1795342404187b59faed172e4cfa16d
https://github.com/galaxyproject/galaxy/commit/ee948063e1795342404187b59fae…
Author: anuprulez <anup.rulez(a)gmail.com>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M client/galaxy/scripts/viz/phyloviz.js
M static/maps/viz/phyloviz.js.map
M static/scripts/viz/phyloviz.js
Log Message:
-----------
Show the confidence value as text on phylogenetic tree branches
Commit: 23f3a31d277586a107dc1ecead5191e335b901dc
https://github.com/galaxyproject/galaxy/commit/23f3a31d277586a107dc1ecead51…
Author: anuprulez <anup.rulez(a)gmail.com>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M client/galaxy/scripts/viz/phyloviz.js
M static/maps/viz/phyloviz.js.map
M static/scripts/viz/phyloviz.js
Log Message:
-----------
Round off the confidence values
Commit: c26d06839190e8d75d744bc4884cb670e44a77ee
https://github.com/galaxyproject/galaxy/commit/c26d06839190e8d75d744bc4884c…
Author: anuprulez <anup.rulez(a)gmail.com>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M client/galaxy/scripts/viz/phyloviz.js
M static/maps/viz/phyloviz.js.map
M static/scripts/viz/phyloviz.js
Log Message:
-----------
Update logic to show node name and bootstrap
Commit: 574b470eb29d7e0ee7b5d70a75ab031286ca673c
https://github.com/galaxyproject/galaxy/commit/574b470eb29d7e0ee7b5d70a75ab…
Author: anuprulez <anup.rulez(a)gmail.com>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M client/galaxy/style/less/galaxy_bootstrap/overrides.less
M lib/galaxy/datatypes/tabular.py
M lib/galaxy/tools/__init__.py
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/style/blue/base.css
Log Message:
-----------
Merge branch 'dev' of https://github.com/bgruening/galaxy into enhancement_phylocanvas
Commit: 0d9b60fd749fe5affab68618984d8d1272ca0a76
https://github.com/galaxyproject/galaxy/commit/0d9b60fd749fe5affab68618984d…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M client/galaxy/scripts/viz/phyloviz.js
M static/maps/viz/phyloviz.js.map
M static/scripts/viz/phyloviz.js
Log Message:
-----------
Merge pull request #4292 from bgruening/enhancement_phylocanvas
Enhancement for Phyloviz viz plugin
Compare: https://github.com/galaxyproject/galaxy/compare/c169c3a0908a...0d9b60fd749f
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 26d48c876cd2bd39bd8c0e404d54e6de520ce1df
https://github.com/galaxyproject/galaxy/commit/26d48c876cd2bd39bd8c0e404d54…
Author: Pierrick Roger Mele <pierrick.rogermele(a)icloud.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
Changed paths:
M lib/galaxy/datatypes/tabular.py
A tools/mtbls-dwnld
Log Message:
-----------
Fix empty tabular output error when using discover_datasets.
Commit: 4b9b3724e87e7ea0c6b81da36df5f6b00124c6c6
https://github.com/galaxyproject/galaxy/commit/4b9b3724e87e7ea0c6b81da36df5…
Author: Pierrick Roger Mele <pierrick.rogermele(a)icloud.com>
Date: 2017-06-28 (Wed, 28 Jun 2017)
Changed paths:
R tools/mtbls-dwnld
Log Message:
-----------
Remove tool symbolic link added by accident.
Commit: edbe273a95d727278b37c4457912e27355ec2cf3
https://github.com/galaxyproject/galaxy/commit/edbe273a95d727278b37c4457912…
Author: Pierrick Roger Mele <pierrick.rogermele(a)icloud.com>
Date: 2017-06-28 (Wed, 28 Jun 2017)
Changed paths:
M .ci/flake8_lint_include_list.txt
M .ci/py3_sources.txt
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/interactive_environments/neo/config/allowed_images.yml.sample
M config/plugins/interactive_environments/neo/config/neo.ini.sample
M config/plugins/interactive_environments/neo/config/neo.xml
M config/plugins/webhooks/demo/search/config/searchover.yaml
M config/plugins/webhooks/demo/search/static/script.js
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/datatypes/data.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/model/__init__.py
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/tools/parameters/basic.py
M lib/galaxy/tools/wrappers.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/visualization.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/visualization/list_published.mako
R templates/webapps/galaxy/workflow/import.mako
R templates/webapps/galaxy/workflow/list_published.mako
R templates/webapps/galaxy/workflow/run.mako
M test/functional/tools/sample_datatypes_conf.xml
M test/functional/webhooks/phdcomics/helper/__init__.py
M test/functional/webhooks/trans_object/helper/__init__.py
M tools/filters/wc_gnu.xml
Log Message:
-----------
Merge branch 'dev' into issue-4231-fix-empty-tabular-output
Commit: 8b0187317564d70b3a5bc5f67ee78461879fd43e
https://github.com/galaxyproject/galaxy/commit/8b0187317564d70b3a5bc5f67ee7…
Author: Pierrick Roger Mele <pierrick.rogermele(a)icloud.com>
Date: 2017-07-06 (Thu, 06 Jul 2017)
Changed paths:
M lib/galaxy/datatypes/tabular.py
Log Message:
-----------
Implement Nicola Sorenzo's proposal for set_meta() method.
Commit: 2a737d0b794d03d16774bcd6250561eda92d9abc
https://github.com/galaxyproject/galaxy/commit/2a737d0b794d03d16774bcd62505…
Author: Pierrick Roger Mele <pierrick.rogermele(a)icloud.com>
Date: 2017-07-06 (Thu, 06 Jul 2017)
Changed paths:
M lib/galaxy/datatypes/tabular.py
Log Message:
-----------
Set two blank lines before class definition, in order for travis linting to pass.
Commit: ba5549b47193f1ac87a2fa8d145e3d4d1541c554
https://github.com/galaxyproject/galaxy/commit/ba5549b47193f1ac87a2fa8d145e…
Author: Nicola Soranzo <nsoranzo(a)tiscali.it>
Date: 2017-07-06 (Thu, 06 Jul 2017)
Changed paths:
M lib/galaxy/datatypes/tabular.py
Log Message:
-----------
Merge pull request #4240 from pierrickrogermele/issue-4231-fix-empty-tabular-output
Fix empty tabular output error when using discover_datasets.
Compare: https://github.com/galaxyproject/galaxy/compare/e7731684518e...ba5549b47193
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: eb5843643298e0c8ac5f2a568ffed1cba47adb21
https://github.com/galaxyproject/galaxy/commit/eb5843643298e0c8ac5f2a568ffe…
Author: E Rasche <hxr(a)hx42.org>
Date: 2017-07-04 (Tue, 04 Jul 2017)
Changed paths:
M client/galaxy/style/less/galaxy_bootstrap/overrides.less
M static/scripts/bundled/admin.bundled.js.map
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.map
M static/style/blue/base.css
Log Message:
-----------
Remove p style under blockquote
Commit: 8b3c10553b26fed01c6825c47df397bacdf5d5a2
https://github.com/galaxyproject/galaxy/commit/8b3c10553b26fed01c6825c47df3…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-07-06 (Thu, 06 Jul 2017)
Changed paths:
M client/galaxy/style/less/galaxy_bootstrap/overrides.less
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/style/blue/base.css
Log Message:
-----------
Merge remote-tracking branch 'erasche/blockquotep' into dev
(rebuilt client as well)
Compare: https://github.com/galaxyproject/galaxy/compare/1ecaa0698732...8b3c10553b26