Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b5945ad3e3a972acb41c87c2ddeeff222779020c https://github.com/galaxyproject/galaxy/commit/b5945ad3e3a972acb41c87c2ddeef... Author: greg <ghv2@psu.edu> Date: 2018-02-02 (Fri, 02 Feb 2018) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/genetics.py Log Message: ----------- Add IdeasPre datatype subclassed from Rgenetics Commit: 3fdd4edc5c1954dc750dfeff03cb3205ee1b6042 https://github.com/galaxyproject/galaxy/commit/3fdd4edc5c1954dc750dfeff03cb3... Author: greg <ghv2@psu.edu> Date: 2018-02-02 (Fri, 02 Feb 2018) Changed paths: M lib/galaxy/datatypes/genetics.py Log Message: ----------- Subclass IdeasPre from Html Commit: b463be78a5066c7e6c389c43af2bd863f05e4a80 https://github.com/galaxyproject/galaxy/commit/b463be78a5066c7e6c389c43af2bd... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M lib/galaxy/dependencies/pipfiles/develop/Pipfile M lib/galaxy/dependencies/pipfiles/develop/Pipfile.lock M lib/galaxy/dependencies/pipfiles/develop/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pipfiles/develop/pinned-requirements.txt Log Message: ----------- Add nodeenv to dev requirements Commit: 977bbf1481b2fd36512f869c01f0af6ba4099a92 https://github.com/galaxyproject/galaxy/commit/977bbf1481b2fd36512f869c01f0a... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M scripts/common_startup.sh Log Message: ----------- Install node and yarn in common_startup.sh using nodeenv and the venv's npm. Commit: eba3fb4b35570fc704dbb9a70c733293a2ee4514 https://github.com/galaxyproject/galaxy/commit/eba3fb4b35570fc704dbb9a70c733... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M client/package.json M scripts/common_startup.sh Log Message: ----------- Fix common_startup.sh for galaxy tarballs Do not assume git is installed and the `.git` directory is present. Fix https://github.com/galaxyproject/galaxy/issues/5466 Commit: 3f50b45a4e3016a211dcbd0876bb95acb29cf900 https://github.com/galaxyproject/galaxy/commit/3f50b45a4e3016a211dcbd0876bb9... Author: Dave B <dave@bx.psu.edu> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/genetics.py Log Message: ----------- Merge pull request #5445 from gregvonkuster/add-ideaspre [18.01] Add support for the ideaspre datatype Commit: d91078024bf3e9404aaca1c8655a5bc2b451ebc8 https://github.com/galaxyproject/galaxy/commit/d91078024bf3e9404aaca1c8655a5... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M client/package.json M lib/galaxy/dependencies/pipfiles/develop/Pipfile M lib/galaxy/dependencies/pipfiles/develop/Pipfile.lock M lib/galaxy/dependencies/pipfiles/develop/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pipfiles/develop/pinned-requirements.txt M scripts/common_startup.sh Log Message: ----------- Merge pull request #5491 from nsoranzo/release_18.01_fix_common_startup_for_bare_clone [18.01] Fix common_startup.sh for galaxy tarballs Commit: 10ff797ac77da470cf2078059b3235cee04570ff https://github.com/galaxyproject/galaxy/commit/10ff797ac77da470cf2078059b323... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M client/package.json M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/genetics.py M scripts/common_startup.sh Log Message: ----------- Merge branch 'release_18.01' into dev Conflicts: scripts/common_startup.sh Compare: https://github.com/galaxyproject/galaxy/compare/0ca7afb343d8...10ff797ac77d