Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c260e0b0c8ec1b8c479ab2aa2f60b7dfd533b324 https://github.com/galaxyproject/galaxy/commit/c260e0b0c8ec1b8c479ab2aa2f60b... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/hda-li.js M client/galaxy/scripts/mvc/history/hdca-li.js M static/maps/mvc/dataset/dataset-li.js.map M static/maps/mvc/history/hda-li.js.map M static/maps/mvc/history/hdca-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 M static/scripts/mvc/history/hda-li.js M static/scripts/mvc/history/hdca-li.js Log Message: ----------- Sort tags for display (note, this is stupid to have in 3 places -- refactor) Commit: 967c363786f36a4d4aab020a073b7c5e7eefbce6 https://github.com/galaxyproject/galaxy/commit/967c363786f36a4d4aab020a073b7... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M lib/galaxy/jobs/actions/post.py Log Message: ----------- Filter tags for empties (fixes #4127) Commit: 0c43954e8d09f9f6dc7ac3af02b14821e8fc53ae https://github.com/galaxyproject/galaxy/commit/0c43954e8d09f9f6dc7ac3af02b14... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M lib/galaxy/jobs/actions/post.py Log Message: ----------- Slight tweak of logic in tag filtering PJA Commit: 12905321ca8083e4b41eb0fe03193463b8efb019 https://github.com/galaxyproject/galaxy/commit/12905321ca8083e4b41eb0fe03193... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M lib/galaxy/jobs/actions/post.py Log Message: ----------- Allow hashtag usage in workflow PJA tag addition mechanism Commit: 0954290e5dfe74ab4d7a658dca9e2896e7aa020e https://github.com/galaxyproject/galaxy/commit/0954290e5dfe74ab4d7a658dca9e2... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M lib/galaxy/jobs/actions/post.py Log Message: ----------- Combine list comprehensions, slightly tweak logic. Commit: 0272e188a81b89d743c22956c88e6cdac433b8db https://github.com/galaxyproject/galaxy/commit/0272e188a81b89d743c22956c88e6... Author: Aysam Guerler <aysam.guerler@gmail.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/hda-li.js M client/galaxy/scripts/mvc/history/hdca-li.js M lib/galaxy/jobs/actions/post.py M static/maps/mvc/dataset/dataset-li.js.map M static/maps/mvc/history/hda-li.js.map M static/maps/mvc/history/hdca-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 M static/scripts/mvc/history/hda-li.js M static/scripts/mvc/history/hdca-li.js Log Message: ----------- Merge pull request #4139 from dannon/tag_sorting [17.05] Tag fixes Commit: d807ed0f75c6bc764a5a3a66b44172f34cd7b094 https://github.com/galaxyproject/galaxy/commit/d807ed0f75c6bc764a5a3a66b4417... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/hda-li.js M client/galaxy/scripts/mvc/history/hdca-li.js M lib/galaxy/jobs/actions/post.py M static/maps/mvc/dataset/dataset-li.js.map M static/maps/mvc/history/hda-li.js.map M static/maps/mvc/history/hdca-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 M static/scripts/mvc/history/hda-li.js M static/scripts/mvc/history/hdca-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 static/scripts/bundled/login.bundled.js.map Compare: https://github.com/galaxyproject/galaxy/compare/20d2303d3463...d807ed0f75c6