Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4ea881caa21602c5562224fa268ff87788eee0dd https://github.com/galaxyproject/galaxy/commit/4ea881caa21602c5562224fa268ff... Author: Eric Rasche rasche.eric@gmail.com Date: 2016-06-26 (Sun, 26 Jun 2016)

Changed paths: M lib/galaxy/web/base/interactive_environments.py

Log Message: ----------- Fix old bug in non-allowed_images.yml GIEs

Commit: 1069a69ae08a4a2db609aebb03c4a8fa53162777 https://github.com/galaxyproject/galaxy/commit/1069a69ae08a4a2db609aebb03c4a... Author: Björn Grüning bjoern@gruenings.eu Date: 2016-06-28 (Tue, 28 Jun 2016)

Changed paths: M lib/galaxy/web/base/interactive_environments.py

Log Message: ----------- Merge pull request #2550 from erasche/asdf

[16.04] Fix old bug in non-allowed_images.yml GIEs

Commit: c3bf89f75093bfe73f09d0f33dff8df6d60f9269 https://github.com/galaxyproject/galaxy/commit/c3bf89f75093bfe73f09d0f33dff8... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-06-28 (Tue, 28 Jun 2016)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/tag.py

Log Message: ----------- Fix tag_autocomplete issue. When we swapped to tag manager the signature changed and some of these were missed.

Commit: 1507bd37fe8cb872975e46a6e7be468e984db0d8 https://github.com/galaxyproject/galaxy/commit/1507bd37fe8cb872975e46a6e7be4... Author: Eric Rasche rasche.eric@gmail.com Date: 2016-07-05 (Tue, 05 Jul 2016)

Changed paths: M lib/galaxy/web/proxy/js/lib/proxy.js

Log Message: ----------- More defensive proxying

Commit: f8e40bb5951cc38dce118cebcc09a5cc3ca96930 https://github.com/galaxyproject/galaxy/commit/f8e40bb5951cc38dce118cebcc09a... Author: Martin Cech cech.marten@gmail.com Date: 2016-07-05 (Tue, 05 Jul 2016)

Changed paths: M lib/galaxy/web/proxy/js/lib/proxy.js

Log Message: ----------- Merge pull request #2585 from erasche/backport-proxy-fix

[16.04] Backport proxy fixes

Commit: 7c2c2ca62a069700725c67e08053389b583680e7 https://github.com/galaxyproject/galaxy/commit/7c2c2ca62a069700725c67e080533... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-06 (Wed, 06 Jul 2016)

Changed paths: M lib/galaxy/datatypes/tabular.py

Log Message: ----------- Tabular dataset chunking fix which should prevent duplicated lines. Skipping to the newline previously shifted the chunk past where it should read.

Commit: acdfd2423f3e8764375d0b7a23dad3c919db47fc https://github.com/galaxyproject/galaxy/commit/acdfd2423f3e8764375d0b7a23dad... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-06 (Wed, 06 Jul 2016)

Changed paths: M lib/galaxy/datatypes/tabular.py

Log Message: ----------- Rename vars to be sensible, add comment to clarify what this is doing.

Commit: 84d152082009418f2fd5dfe0e9001e8924a678fc https://github.com/galaxyproject/galaxy/commit/84d152082009418f2fd5dfe0e9001... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-06 (Wed, 06 Jul 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/data.js M lib/galaxy/datatypes/tabular.py M lib/galaxy/webapps/galaxy/controllers/dataset.py

Log Message: ----------- Absolute positioning for tabular dataset chunking, vs abstract chunk. Ships a minimum of one line regardless of size, and relies on client to know position.

Commit: ca4b51b390d14077188b5226e4c83ed0991dcbb5 https://github.com/galaxyproject/galaxy/commit/ca4b51b390d14077188b5226e4c83... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-06 (Wed, 06 Jul 2016)

Changed paths: M static/maps/mvc/dataset/data.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/dataset/data.js

Log Message: ----------- Make client with new tabular display.

Commit: a65faa961ca434901baaaeffe2e5926d4ac523c1 https://github.com/galaxyproject/galaxy/commit/a65faa961ca434901baaaeffe2e59... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-06 (Wed, 06 Jul 2016)

Changed paths: M lib/galaxy/datatypes/tabular.py M lib/galaxy/webapps/galaxy/controllers/dataset.py

Log Message: ----------- Fix tabular chunked display offset=0 request, pass through ck_size to allow client specification of chunk size overriding the app defaults (neither of these are used by the js client currently though)

Commit: d7cdf74bdf2690ab1d83cb262021251ae3e28d14 https://github.com/galaxyproject/galaxy/commit/d7cdf74bdf2690ab1d83cb2620212... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-06 (Wed, 06 Jul 2016)

Changed paths: M lib/galaxy/datatypes/tabular.py

Log Message: ----------- Handle the case when the last character of the initial read is a newline.

Commit: b7718a0f9ae3a626ab88080e0798a451597984c8 https://github.com/galaxyproject/galaxy/commit/b7718a0f9ae3a626ab88080e0798a... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-06 (Wed, 06 Jul 2016)

Changed paths: M lib/galaxy/datatypes/tabular.py

Log Message: ----------- Swap ck_size default from 0 to None to indicate unset. This does not change any behavior at all, but @nsoranzo requested the change to make usage more clear.

Commit: 1d8f39d987217c09048e05e1d5443173eb02a9f2 https://github.com/galaxyproject/galaxy/commit/1d8f39d987217c09048e05e1d5443... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-07 (Thu, 07 Jul 2016)

Changed paths: M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/text.py M lib/galaxy/webapps/galaxy/controllers/dataset.py

Log Message: ----------- Remove old, unused arguments from some display_dataset methods, minor argument tweaks.

Commit: 4da2119c2560c68cb716270933959eb8cf3d48ed https://github.com/galaxyproject/galaxy/commit/4da2119c2560c68cb716270933959... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-07 (Thu, 07 Jul 2016)

Changed paths: M lib/galaxy/webapps/galaxy/api/datasets.py

Log Message: ----------- Remove explicit 'chunk' parameter passthrough in datasets API

Commit: ab2e48bae7395661ce1112363fe167968582e919 https://github.com/galaxyproject/galaxy/commit/ab2e48bae7395661ce1112363fe16... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2016-07-08 (Fri, 08 Jul 2016)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/tag.py

Log Message: ----------- Merge pull request #2569 from dannon/workflow_tag_fixes

[16.04] Fix tag_autocomplete issue in workflow editor.

Commit: 05c063b13a3fb4acf99af4ecbeb5d2350369301d https://github.com/galaxyproject/galaxy/commit/05c063b13a3fb4acf99af4ecbeb5d... Author: Martin Cech cech.marten@gmail.com Date: 2016-07-08 (Fri, 08 Jul 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/data.js M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/datatypes/text.py M lib/galaxy/webapps/galaxy/api/datasets.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/data.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/dataset/data.js

Log Message: ----------- Merge pull request #2587 from dannon/backport_tabular_fix

[16.04] Tabular Dataset Display Fixes

Commit: a74a23764cc1aa0a481d0e2ea65ac26a8f151865 https://github.com/galaxyproject/galaxy/commit/a74a23764cc1aa0a481d0e2ea65ac... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-08 (Fri, 08 Jul 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/data.js M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/datatypes/text.py M lib/galaxy/webapps/galaxy/api/datasets.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/tag.py M static/maps/mvc/dataset/data.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/dataset/data.js

Log Message: ----------- Merge branch 'release_16.04' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/77f547ed89a9...a74a23764cc1