Branch: refs/heads/usegalaxy Home: https://github.com/galaxyproject/galaxy Commit: 25952e81e7cc7c2985379f039915d40bc8142d98 https://github.com/galaxyproject/galaxy/commit/25952e81e7cc7c2985379f039915d... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-02-14 (Wed, 14 Feb 2018) Changed paths: M config/reports.yml.sample M config/tool_shed.yml.sample Log Message: ----------- Map static content by default for Reports and Tool Shed webapps. Commit: 13e72e84c523bda22bda792bbebf4720d28542d5 https://github.com/galaxyproject/galaxy/commit/13e72e84c523bda22bda792bbebf4... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2018-02-16 (Fri, 16 Feb 2018) Changed paths: M config/reports.yml.sample M config/tool_shed.yml.sample Log Message: ----------- Merge pull request #5534 from natefoo/17.09-static-map-fix [17.09] Map static content by default for Reports and Tool Shed webapps Commit: 0d029b39ac9ae6bc21a6c1834fe6e05280d8e0d0 https://github.com/galaxyproject/galaxy/commit/0d029b39ac9ae6bc21a6c1834fe6e... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-02-16 (Fri, 16 Feb 2018) Changed paths: M config/reports.yml.sample M config/tool_shed.yml.sample Log Message: ----------- Merge branch 'release_17.09' into release_18.01 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: 39f245433c57581d65d5486c5755ab86c6cb9065 https://github.com/galaxyproject/galaxy/commit/39f245433c57581d65d5486c5755a... Author: nekrut <anton@nekrut.org> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M config/datatypes_conf.xml.sample A lib/galaxy/datatypes/converters/fastagz_to_fasta.xml M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py Log Message: ----------- added fasta.gz Commit: 91bb57bfb55bcc4e6124bd54f3a32ed07b7e5fb0 https://github.com/galaxyproject/galaxy/commit/91bb57bfb55bcc4e6124bd54f3a32... Author: nekrut <anton@nekrut.org> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M lib/galaxy/datatypes/sequence.py Log Message: ----------- fixed flake8 errors Commit: a456c645f0a115f12c66544f13921010449869f0 https://github.com/galaxyproject/galaxy/commit/a456c645f0a115f12c66544f13921... Author: nekrut <anton@nekrut.org> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M lib/galaxy/datatypes/sequence.py Log Message: ----------- removing stray whitespace Commit: 2978145fbf4c73732f0930758c2822e1f1ea6ce8 https://github.com/galaxyproject/galaxy/commit/2978145fbf4c73732f0930758c282... Author: nekrut <anton@nekrut.org> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M lib/galaxy/datatypes/converters/fastagz_to_fasta.xml Log Message: ----------- fixed name of fastagz->fasta converter Commit: 0f4510298e7417b67bf533a1c427e28290baa69d https://github.com/galaxyproject/galaxy/commit/0f4510298e7417b67bf533a1c427e... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M lib/galaxy/datatypes/converters/fastagz_to_fasta.xml Log Message: ----------- fix copypasta Commit: c786adf01c07fe5b3608250f9f26b8d6d255a27c https://github.com/galaxyproject/galaxy/commit/c786adf01c07fe5b3608250f9f26b... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M lib/galaxy/datatypes/sequence.py Log Message: ----------- fix more fasta copypasta Commit: fa283b525f4412fbc3d05ad10feb7176b52a27f3 https://github.com/galaxyproject/galaxy/commit/fa283b525f4412fbc3d05ad10feb7... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-02-19 (Mon, 19 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/history/hdca-li-edit.js M config/reports.yml.sample M config/tool_shed.yml.sample M lib/galaxy/auth/providers/ldap_ad.py Log Message: ----------- Merge remote-tracking branch 'upstream/release_18.01' into usegalaxy Compare: https://github.com/galaxyproject/galaxy/compare/a63b0e7f857a...fa283b525f44