Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: cde04ad52d40b5d7b26a0c636d9d24bf6adbdc92 https://github.com/galaxyproject/galaxy/commit/cde04ad52d40b5d7b26a0c636d9d2... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-04-12 (Tue, 12 Apr 2016)

Changed paths: M lib/galaxy/web/framework/helpers/grids.py

Log Message: ----------- markupsafe.escape() in Python2 does not work on str containing non-ASCII characters.

Fix #2135.

Commit: 34900f87f5bc52bc84efe866371588004a049ebf https://github.com/galaxyproject/galaxy/commit/34900f87f5bc52bc84efe86637158... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M tools/stats/grouping.py M tools/stats/grouping.xml

Log Message: ----------- Fix grouping tool broken in 7347d75a4a36d42f8060e11d708291d796b266a5 / fd85979a8651e0907bebce05cdfb59d77f0d0f64, and enhance performance when removing lines.

Commit: 18c00899a30cd162cd0bb3a251a49cff2143d3a3 https://github.com/galaxyproject/galaxy/commit/18c00899a30cd162cd0bb3a251a49... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M lib/galaxy/web/framework/helpers/grids.py

Log Message: ----------- Merge pull request #2138 from nsoranzo/release_16.01_fix_for_2135

[16.01] markupsafe.escape() in Python2 does not work on str containing non-ASCII characters

Commit: 7f101b8da8d09121a302a6707610434e1e2d3cdf https://github.com/galaxyproject/galaxy/commit/7f101b8da8d09121a302a67076104... Author: John Chilton jmchilton@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M tools/stats/grouping.py M tools/stats/grouping.xml

Log Message: ----------- Merge pull request #2166 from blankenberg/release_16.04

[16.04] Fix grouping tool and enhance performance when removing lines.

Commit: 7488e3b7be059eb5759020b148c6bff369a15ea6 https://github.com/galaxyproject/galaxy/commit/7488e3b7be059eb5759020b148c6b... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-04-15 (Fri, 15 Apr 2016)

Changed paths: M lib/galaxy/web/framework/helpers/grids.py

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

Conflicts: lib/galaxy/web/framework/helpers/grids.py

Commit: 58f510fda94d12a1041460a603ac56dd7f0f1928 https://github.com/galaxyproject/galaxy/commit/58f510fda94d12a1041460a603ac5... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-04-15 (Fri, 15 Apr 2016)

Changed paths: M lib/galaxy/web/framework/helpers/grids.py M tools/stats/grouping.py M tools/stats/grouping.xml

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

Compare: https://github.com/galaxyproject/galaxy/compare/88db9e6a0f0b...58f510fda94d