Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: f6ac13568f62731fb785e3aafafbf3aacf21a7a2 https://github.com/galaxyproject/galaxy/commit/f6ac13568f62731fb785e3aafafbf... Author: John Chilton <jmchilton@gmail.com> Date: 2018-02-18 (Sun, 18 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/history/history-view-edit.js Log Message: ----------- Don't fail rest of multi-action queue when attempting to purge a collection. Fixes https://github.com/galaxyproject/galaxy/issues/5117. Commit: 5e6a2572f8bfabd6c674ff218d8a3ee1f9f22615 https://github.com/galaxyproject/galaxy/commit/5e6a2572f8bfabd6c674ff218d8a3... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M lib/galaxy/auth/providers/ldap_ad.py Log Message: ----------- Allow LDAP options not starting with OPT_ Fix https://github.com/galaxyproject/galaxy/issues/5486 Commit: d964d594a5314b85def7676f5ae39c949420f4f0 https://github.com/galaxyproject/galaxy/commit/d964d594a5314b85def7676f5ae39... Author: John Chilton <jmchilton@gmail.com> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/history/hdca-li-edit.js Log Message: ----------- [18.01] Do not reload page when deleting collections. Fixes #5499 reported by @mvdbeek (thanks for catching that). Commit: e7f7d5e29a0fc746625d5c8634d8976d4c2b667c https://github.com/galaxyproject/galaxy/commit/e7f7d5e29a0fc746625d5c8634d89... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/history/hdca-li-edit.js Log Message: ----------- Merge pull request #5558 from jmchilton/deletion_cleanup_1 [18.01] Do not reload page when deleting collections. Commit: af7b0ab1b65f5a54b8a8adda1c095fc9a8c2e912 https://github.com/galaxyproject/galaxy/commit/af7b0ab1b65f5a54b8a8adda1c095... Author: John Chilton <jmchilton@gmail.com> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M lib/galaxy/auth/providers/ldap_ad.py Log Message: ----------- Merge pull request #5556 from nsoranzo/release_18.01_fix_5486 [18.01] Allow LDAP options not starting with OPT_ Commit: 6a3ce34c09bd516a18bd7d8f04851e1155d6d174 https://github.com/galaxyproject/galaxy/commit/6a3ce34c09bd516a18bd7d8f04851... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/history/history-view-edit.js Log Message: ----------- Merge pull request #5443 from jmchilton/fix5117 [18.01] Don't silently fail rest of multi-action queue when attempting to purge a collection. Commit: 3cf84ea3da0ec4fa84d423a050f4ef82271bc0c5 https://github.com/galaxyproject/galaxy/commit/3cf84ea3da0ec4fa84d423a050f4e... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-02-20 (Tue, 20 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/scripts/mvc/history/history-view-edit.js M lib/galaxy/auth/providers/ldap_ad.py Log Message: ----------- Merge branch 'release_18.01' into dev Compare: https://github.com/galaxyproject/galaxy/compare/49a8a317e886...3cf84ea3da0e