Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 59e5b17ac704e1c45cf693187174225d3eefe994 https://github.com/galaxyproject/galaxy/commit/59e5b17ac704e1c45cf6931871742... Author: mvdbeek m.vandenbeek@gmail.com Date: 2017-10-04 (Wed, 04 Oct 2017)

Changed paths: M config/local_conda_mapping.yml.sample

Log Message: ----------- Fix path to example conda mapping

Commit: aef5f4fa95c56362029dba6cf636103cf235fd13 https://github.com/galaxyproject/galaxy/commit/aef5f4fa95c56362029dba6cf6361... Author: John Chilton jmchilton@gmail.com Date: 2017-10-26 (Thu, 26 Oct 2017)

Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt

Log Message: ----------- [16.10] Fix test fixtures dependency.

It should have never been in the pinned requirements and has disappeared from PyPI.

Commit: 7bf2bbfa405029898a65f1ea092d8cacd2903483 https://github.com/galaxyproject/galaxy/commit/7bf2bbfa405029898a65f1ea092d8... Author: John Chilton jmchilton@gmail.com Date: 2017-10-27 (Fri, 27 Oct 2017)

Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt

Log Message: ----------- Merge pull request #4873 from jmchilton/fix_test_fixtures

[16.10] Fix test fixtures dependency.

Commit: 676f6a5960a185c80d7400b9cb8c92d5217bfae4 https://github.com/galaxyproject/galaxy/commit/676f6a5960a185c80d7400b9cb8c9... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-10-30 (Mon, 30 Oct 2017)

Changed paths: M client/galaxy/style/less/upload.less M static/style/blue/base.css

Log Message: ----------- Fix uploadbox text content formatting.

Commit: 09fdac513d59ca6dad440616a53daa97751ff905 https://github.com/galaxyproject/galaxy/commit/09fdac513d59ca6dad440616a53da... Author: John Chilton jmchilton@gmail.com Date: 2017-10-30 (Mon, 30 Oct 2017)

Changed paths: M scripts/common_startup.sh

Log Message: ----------- Fix extra index URL call in common startup.

- Use it for dev requirements also. - Use more correct API target that supports older versions of dependencies on PyPI.

xref https://gist.github.com/jmchilton/ad8f180f5ac1eb5f689f815b04f603fa

Commit: 45d4fefe63d59627063cbacaf6cdd797ee81d158 https://github.com/galaxyproject/galaxy/commit/45d4fefe63d59627063cbacaf6cdd... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2017-10-30 (Mon, 30 Oct 2017)

Changed paths: M scripts/common_startup.sh

Log Message: ----------- Merge pull request #4898 from jmchilton/fix_extra_index

[17.09] Fix extra index URL call in common startup.

Commit: a537aa4ca4f7622bafe20da7339d5652e263d78f https://github.com/galaxyproject/galaxy/commit/a537aa4ca4f7622bafe20da7339d5... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2017-10-30 (Mon, 30 Oct 2017)

Changed paths: M config/local_conda_mapping.yml.sample

Log Message: ----------- Merge pull request #4749 from mvdbeek/conda_mapping_path_fix

[17.05] Fix path to example conda mapping

Commit: 1664a2c7e644ee12a3bd599bfd08c5a618443ef0 https://github.com/galaxyproject/galaxy/commit/1664a2c7e644ee12a3bd599bfd08c... Author: Martin Cech marten@bx.psu.edu Date: 2017-10-30 (Mon, 30 Oct 2017)

Changed paths: M client/galaxy/style/less/upload.less M static/style/blue/base.css

Log Message: ----------- Merge pull request #4897 from dannon/uploadbox_wrap_fix

[17.09] Fix uploadbox text content formatting.

Commit: c7b09f870d31b93dab87a2eaaa95ace7f6f503b4 https://github.com/galaxyproject/galaxy/commit/c7b09f870d31b93dab87a2eaaa95a... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2017-10-30 (Mon, 30 Oct 2017)

Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt

Log Message: ----------- Merge branch 'release_16.10' into release_17.01

Conflicts: lib/galaxy/dependencies/pinned-requirements.txt

Commit: 7688b057e604f4e6e38a21fca3e47ce65c16c413 https://github.com/galaxyproject/galaxy/commit/7688b057e604f4e6e38a21fca3e47... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2017-10-30 (Mon, 30 Oct 2017)

Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt

Log Message: ----------- Merge branch 'release_17.01' into release_17.05

Commit: be30d6824d4975f6cb15fdd9519f4edf3e9e3079 https://github.com/galaxyproject/galaxy/commit/be30d6824d4975f6cb15fdd9519f4... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2017-10-30 (Mon, 30 Oct 2017)

Changed paths: M config/local_conda_mapping.yml.sample M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt

Log Message: ----------- Merge branch 'release_17.05' into release_17.09

Commit: aacdf8d939e554ef9dca9fea3075813f1c0862d3 https://github.com/galaxyproject/galaxy/commit/aacdf8d939e554ef9dca9fea30758... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2017-10-30 (Mon, 30 Oct 2017)

Changed paths: M client/galaxy/style/less/upload.less M config/local_conda_mapping.yml.sample M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M scripts/common_startup.sh M static/style/blue/base.css

Log Message: ----------- Merge branch 'release_17.09' into dev

Conflicts: static/style/blue/base.css

Compare: https://github.com/galaxyproject/galaxy/compare/c2f4b5ac8f8d...aacdf8d939e5