Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 97c16db8245570196b556854570b0c120abcb8b0 https://github.com/galaxyproject/galaxy/commit/97c16db8245570196b556854570b0... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-08-02 (Wed, 02 Aug 2017) Changed paths: M lib/galaxy/datatypes/proteomics.py Log Message: ----------- Add ImzML composite defintion Commit: e2f69a9c5bc7d11274190e223493d6d12d33afb3 https://github.com/galaxyproject/galaxy/commit/e2f69a9c5bc7d11274190e223493d... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-08-02 (Wed, 02 Aug 2017) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- add imzml to the datatypes conf file Commit: 1d609ca2caa158422adcdee0bbc65e73ce0527d2 https://github.com/galaxyproject/galaxy/commit/1d609ca2caa158422adcdee0bbc65... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-08-02 (Wed, 02 Aug 2017) Changed paths: M lib/galaxy/datatypes/proteomics.py Log Message: ----------- add edam format Commit: e768e77392471a60425984ae518fb4f34a0552ee https://github.com/galaxyproject/galaxy/commit/e768e77392471a60425984ae518fb... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-08-02 (Wed, 02 Aug 2017) Changed paths: M lib/galaxy/datatypes/proteomics.py Log Message: ----------- fix pep8 Commit: 6b2a2582002d38665b2f3def1245675d638e6c75 https://github.com/galaxyproject/galaxy/commit/6b2a2582002d38665b2f3def12456... Author: Eric Rasche <hxr@hx42.org> Date: 2017-08-03 (Thu, 03 Aug 2017) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/proteomics.py Log Message: ----------- Merge pull request #4370 from bgruening/mzml Add imzML datatype Compare: https://github.com/galaxyproject/galaxy/compare/ade8844d11aa...6b2a2582002d