Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3a4cc360a4d5e68571f6498b3345b4741add5ab3 https://github.com/galaxyproject/galaxy/commit/3a4cc360a4d5e68571f6498b3345b... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-05-11 (Fri, 11 May 2018) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-row.js M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js Log Message: ----------- fix upload status colors to work with bs4 Commit: 35b96475a16b48242a674a6de45d5ef3959deae8 https://github.com/galaxyproject/galaxy/commit/35b96475a16b48242a674a6de45d5... Author: John Chilton <jmchilton@gmail.com> Date: 2018-05-11 (Fri, 11 May 2018) Changed paths: M test/api/test_tools_upload.py Log Message: ----------- Missing upload tests. Lots of upload and datatype behavior changes conflicting in 18.05 - these tests would have helped a lot. Commit: 5f99db40d247c6bdac7b33fca3aece80d443986d https://github.com/galaxyproject/galaxy/commit/5f99db40d247c6bdac7b33fca3aec... Author: Dannon <dannon.baker@gmail.com> Date: 2018-05-14 (Mon, 14 May 2018) Changed paths: M test/api/test_tools_upload.py Log Message: ----------- Merge pull request #6125 from jmchilton/upload_tests_3 [18.05] Fix missing upload tests. Commit: 19c5c7395e2deba983f3e7f80a9cdccaf9a2b8d6 https://github.com/galaxyproject/galaxy/commit/19c5c7395e2deba983f3e7f80a9cd... Author: Dannon <dannon.baker@gmail.com> Date: 2018-05-14 (Mon, 14 May 2018) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-row.js M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js Log Message: ----------- Merge pull request #6124 from martenson/fix-upload-colorstate [18.05] fix upload status colors to work with bs4 Commit: 1fc06c22f884444543655ffcb66f10d71439283f https://github.com/galaxyproject/galaxy/commit/1fc06c22f884444543655ffcb66f1... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-05-14 (Mon, 14 May 2018) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-row.js M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M test/api/test_tools_upload.py Log Message: ----------- Merge remote-tracking branch 'upstream/release_18.05' into dev Compare: https://github.com/galaxyproject/galaxy/compare/9dd6773ced15...1fc06c22f884 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.