Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: a0c59d8f05c011f6c7b002599ed09c3fe091c340 https://github.com/galaxyproject/galaxy/commit/a0c59d8f05c011f6c7b002599ed09... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Try activating conda environment again if previous activation failed Commit: c38c0276afb88ed5b1403ede53ae35247307890d https://github.com/galaxyproject/galaxy/commit/c38c0276afb88ed5b1403ede53ae3... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-05-07 (Sun, 07 May 2017) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Exit with error message when conda environemnt could not be activated (thx @nsoranzo). Commit: 9e6c1529929132414e240e306d2b244ef6853944 https://github.com/galaxyproject/galaxy/commit/9e6c1529929132414e240e306d2b2... Author: John Chilton <jmchilton@gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #4035 from mvdbeek/retry_conda_activation [17.05] Try activating conda environment again if previous activation failed Commit: ced568a9e5974d0a4944abce99a64f1b8eb6e6f6 https://github.com/galaxyproject/galaxy/commit/ced568a9e5974d0a4944abce99a64... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-05-10 (Wed, 10 May 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js M static/maps/mvc/dataset/dataset-li.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/dataset/dataset-li.js Log Message: ----------- Fix destructive tag rerender to be a simple replacement. Left the original template/render in place, we could refactor as this becomes more standardized. Commit: 650691c943c096ee15233c61e4459982b2c6928d https://github.com/galaxyproject/galaxy/commit/650691c943c096ee15233c61e4459... Author: John Chilton <jmchilton@gmail.com> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js M static/maps/mvc/dataset/dataset-li.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/dataset/dataset-li.js Log Message: ----------- Merge pull request #4052 from dannon/1705_fix_tag_drag [17.05] Fix destructive tag rerender to be a simpler, more precise html replacement. Commit: 3e079a9f2c908e53413df0c4d77363995df8425f https://github.com/galaxyproject/galaxy/commit/3e079a9f2c908e53413df0c4d7736... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M lib/galaxy/objectstore/s3.py Log Message: ----------- Fix for s3objectstore _clean_cache method, thanks to @zzsoni and @nsoranzo Commit: b7a66f182ef8607835665035e547e389d93237de https://github.com/galaxyproject/galaxy/commit/b7a66f182ef8607835665035e547e... Author: John Chilton <jmchilton@gmail.com> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M lib/galaxy/objectstore/s3.py Log Message: ----------- Merge pull request #4055 from dannon/s3_objs_fix [17.01] Fix for s3objectstore _clean_cache method Commit: 9940ae70309a56013200d3e30ced5bf9437c75c7 https://github.com/galaxyproject/galaxy/commit/9940ae70309a56013200d3e30ced5... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M lib/galaxy/objectstore/s3.py Log Message: ----------- Merge branch 'release_17.01' into release_17.05 Commit: 2eeabc00b19c26d8ebd1efd7e74d5c3b865e567e https://github.com/galaxyproject/galaxy/commit/2eeabc00b19c26d8ebd1efd7e74d5... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js M lib/galaxy/objectstore/s3.py M lib/galaxy/tools/deps/resolvers/conda.py M static/maps/mvc/dataset/dataset-li.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/dataset-li.js Log Message: ----------- Merge branch 'release_17.05' into dev Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map Compare: https://github.com/galaxyproject/galaxy/compare/2f6d9590feec...2eeabc00b19c