Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 37ef9a982488fd7601d9fab9d11fca5a7c66cf81 https://github.com/galaxyproject/galaxy/commit/37ef9a982488fd7601d9fab9d11fc... Author: Peter van Heusden <pvh@sanbi.ac.za> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/managers/collections.py M lib/galaxy/model/__init__.py Log Message: ----------- Copy tags on HDCA, add tags when dictifying Commit: f0e5ec175df397cb5a22499be6fb08b137f35a1a https://github.com/galaxyproject/galaxy/commit/f0e5ec175df397cb5a22499be6fb0... Author: Peter van Heusden <pvh@sanbi.ac.za> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M client/galaxy/scripts/galaxy.library.js M client/galaxy/scripts/mvc/library/library-librarylist-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M lib/galaxy/managers/workflows.py M static/maps/galaxy.library.js.map M static/maps/mvc/library/library-librarylist-view.js.map M static/maps/mvc/library/library-librarytoolbar-view.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/scripts/bundled/admin.bundled.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/galaxy.library.js M static/scripts/mvc/library/library-librarylist-view.js M static/scripts/mvc/library/library-librarytoolbar-view.js M static/scripts/mvc/tool/tool-form-base.js A test-data/5_Ig-like.gff M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_attribute.xml M tools/filters/wc_gnu.xml Log Message: ----------- Merge branch 'dev' of github.com:pvanheus/galaxy into dev Commit: 37cb522db431c000ec4cf9a33f385863346c3519 https://github.com/galaxyproject/galaxy/commit/37cb522db431c000ec4cf9a33f385... Author: Peter van Heusden <pvh@sanbi.ac.za> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/managers/collections.py Log Message: ----------- copy tags using tag manager Commit: bf8b15632551f2e22cf890d192dae5d812e0c71b https://github.com/galaxyproject/galaxy/commit/bf8b15632551f2e22cf890d192dae... Author: Peter van Heusden <pvh@sanbi.ac.za> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Move tag copying into HasTags mixin Commit: 484d581099fd0d54aec8d5128e61322add4db7ea https://github.com/galaxyproject/galaxy/commit/484d581099fd0d54aec8d5128e613... Author: Peter van Heusden <pvh@sanbi.ac.za> Date: 2017-07-06 (Thu, 06 Jul 2017) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Remove inheritance from object in HasTags Commit: 35d67eaf488689d2f46c1d579ced77a029e8bfab https://github.com/galaxyproject/galaxy/commit/35d67eaf488689d2f46c1d579ced7... Author: Peter van Heusden <pvh@sanbi.ac.za> Date: 2017-07-06 (Thu, 06 Jul 2017) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Put back inheritance from object in HasTags Commit: 0f2fe60af44c4d2a811cd7a98ccea1ab17cdc015 https://github.com/galaxyproject/galaxy/commit/0f2fe60af44c4d2a811cd7a98ccea... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-07-14 (Fri, 14 Jul 2017) Changed paths: M lib/galaxy/managers/collections.py M lib/galaxy/model/__init__.py Log Message: ----------- Merge pull request #4277 from pvanheus/dev Ensure tags are copied and presented when moving Collections Compare: https://github.com/galaxyproject/galaxy/compare/edb762d2675a...0f2fe60af44c