Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ad20452340d052570c1b3203259d10e1ad94a236 https://github.com/galaxyproject/galaxy/commit/ad20452340d052570c1b3203259d1... Author: Eric Enns <eric.enns@phac-aspc.gc.ca> Date: 2015-10-09 (Fri, 09 Oct 2015) Changed paths: M tools/stats/gsummary.py Log Message: ----------- Fix output to print values and not hash key Commit: ad4458a458d7ccb5238094ab3d1967072b5a0b76 https://github.com/galaxyproject/galaxy/commit/ad4458a458d7ccb5238094ab3d196... Author: Eric Enns <eric.enns@phac-aspc.gc.ca> Date: 2015-10-09 (Fri, 09 Oct 2015) Changed paths: M tools/stats/gsummary.py Log Message: ----------- Revert to previous changes if using rpy2 Commit: 0ec1b17794d53ae1a535b00f13d955c62f702a94 https://github.com/galaxyproject/galaxy/commit/0ec1b17794d53ae1a535b00f13d95... Author: Eric Enns <eric.enns@phac-aspc.gc.ca> Date: 2015-10-14 (Wed, 14 Oct 2015) Changed paths: M tools/stats/gsummary.py Log Message: ----------- Update list comprehension to go through headings instead of summary so that we output in the order we want. Commit: 50c27ace2c6eb260b88aafac72997cfa06ca6c13 https://github.com/galaxyproject/galaxy/commit/50c27ace2c6eb260b88aafac72997... Author: John Chilton <jmchilton@gmail.com> Date: 2015-10-14 (Wed, 14 Oct 2015) Changed paths: M tools/stats/gsummary.py Log Message: ----------- Merge pull request #885 from ericenns/fix_gsummary_in_release_15.07 [15.07] Fix gsummary in release 15.07 Commit: 0911287df7a5d7e810d83bbcd1e4cb1f849314d7 https://github.com/galaxyproject/galaxy/commit/0911287df7a5d7e810d83bbcd1e4c... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-10-14 (Wed, 14 Oct 2015) Changed paths: M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/scripts/mvc/collection/list-of-pairs-collection-creator.js Log Message: ----------- UI, list of pairs collection creator: create regexp from filters for name creation Commit: dc9c2e4b7569726263fac8ab06cefb889c2b8af5 https://github.com/galaxyproject/galaxy/commit/dc9c2e4b7569726263fac8ab06cef... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-10-22 (Thu, 22 Oct 2015) Changed paths: M client/galaxy/scripts/mvc/grid/grid-model.js M client/galaxy/scripts/mvc/grid/grid-view.js M static/maps/mvc/grid/grid-view.js.map M static/scripts/mvc/grid/grid-view.js Log Message: ----------- Fix grid batch operations. This should correctly display and request confirmation for batch operations (such as delete a set of <GalaxyObjects> which is scary without a confirmation). It also fixes it to where grid bulk operations actually work in IE. Commit: 7bcbf140936bfc9d25b8e6bed8a0bc14270b0cf2 https://github.com/galaxyproject/galaxy/commit/7bcbf140936bfc9d25b8e6bed8a0b... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-10-27 (Tue, 27 Oct 2015) Changed paths: M client/galaxy/scripts/mvc/grid/grid-model.js M client/galaxy/scripts/mvc/grid/grid-view.js M static/maps/mvc/grid/grid-view.js.map M static/scripts/mvc/grid/grid-view.js Log Message: ----------- Merge pull request #978 from dannon/graft_to_stable [15.10] Fix grid bulk operations Commit: 3b133d0d9206f6162494b3f5aa4c04581368480e https://github.com/galaxyproject/galaxy/commit/3b133d0d9206f6162494b3f5aa4c0... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-10-28 (Wed, 28 Oct 2015) Changed paths: M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/scripts/mvc/collection/list-of-pairs-collection-creator.js Log Message: ----------- Merge pull request #917 from carlfeberhard/release_15.10 [15.10] UI, list of pairs collection creator: create regexp from filters for … Commit: d20677bb640de726574ae7f3e8d86739a8702cb5 https://github.com/galaxyproject/galaxy/commit/d20677bb640de726574ae7f3e8d86... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-10-29 (Thu, 29 Oct 2015) Changed paths: M lib/galaxy/web/framework/webapp.py Log Message: ----------- Fix Remote User failures due to apache null headers. Commit: 3b8edf6aebfb10d1b52b57701eb4cb07558e9c9e https://github.com/galaxyproject/galaxy/commit/3b8edf6aebfb10d1b52b57701eb4c... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-11-03 (Tue, 03 Nov 2015) Changed paths: M lib/galaxy/web/framework/webapp.py Log Message: ----------- Merge pull request #1003 from dannon/remote_user_apache_fix [15.10] Fix Remote User failures due to apache null headers. Commit: 57d6c9872c21f0bddfde04b170e8e8021d20ff71 https://github.com/galaxyproject/galaxy/commit/57d6c9872c21f0bddfde04b170e8e... Author: John Chilton <jmchilton@gmail.com> Date: 2015-11-09 (Mon, 09 Nov 2015) Changed paths: M tools/stats/gsummary.py Log Message: ----------- Merge remote-tracking branch 'jmchilton/release_15.07' into release_15.10 Commit: dc534bb258d7a9aaf262784acdb9893339ca43c0 https://github.com/galaxyproject/galaxy/commit/dc534bb258d7a9aaf262784acdb98... Author: John Chilton <jmchilton@gmail.com> Date: 2015-11-09 (Mon, 09 Nov 2015) Changed paths: M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M lib/galaxy/web/framework/webapp.py M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/scripts/mvc/collection/list-of-pairs-collection-creator.js M tools/stats/gsummary.py Log Message: ----------- Merge branch 'release_15.10' into dev Conflicts: client/galaxy/scripts/mvc/grid/grid-view.js static/maps/mvc/collection/list-of-pairs-collection-creator.js.map static/scripts/mvc/collection/list-of-pairs-collection-creator.js Commit: 2934c2f3bd2aba6bad02d18f687b4410362738ed https://github.com/galaxyproject/galaxy/commit/2934c2f3bd2aba6bad02d18f687b4... Author: John Chilton <jmchilton@gmail.com> Date: 2015-11-09 (Mon, 09 Nov 2015) Changed paths: M tools/stats/gsummary.py Log Message: ----------- Lint fix for 15.10 to dev merge. Commit: 39ff0e9d767a7a4089546d76b0747d4373ea97c9 https://github.com/galaxyproject/galaxy/commit/39ff0e9d767a7a4089546d76b0747... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-11-10 (Tue, 10 Nov 2015) Changed paths: M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M lib/galaxy/web/framework/webapp.py M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/scripts/mvc/collection/list-of-pairs-collection-creator.js M tools/stats/gsummary.py Log Message: ----------- Merge pull request #1044 from jmchilton/release_15.10_to_dev Bring 15.10 (and 15.07) fixes into dev. Compare: https://github.com/galaxyproject/galaxy/compare/6dfacb6fe648...39ff0e9d767a