Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9f4764f22cc63f7a734b9ea98707bfcb842aed14 https://github.com/galaxyproject/galaxy/commit/9f4764f22cc63f7a734b9ea98707b... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M lib/galaxy/tools/actions/__init__.py Log Message: ----------- Preserve tags (ignoring collection handling for now) when running tools. Commit: 31d222c91031775629896feb027e00ea535ef7d9 https://github.com/galaxyproject/galaxy/commit/31d222c91031775629896feb027e0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/history/hda-li.js M client/galaxy/style/less/history.less M static/maps/mvc/history/hda-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/history/hda-li.js M static/style/blue/base.css Log Message: ----------- 'name' tag rendering, very basic, needs styling and loading fixes Commit: f6353c28f6f3a7012daf1eb95a7f7bcfd1d58d7c https://github.com/galaxyproject/galaxy/commit/f6353c28f6f3a7012daf1eb95a7f7... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M client/galaxy/style/less/history.less M static/style/blue/base.css Log Message: ----------- Fix underlines in nametags Commit: 9e5008984fc3ce1fd8359acfe502b3010ca76c1f https://github.com/galaxyproject/galaxy/commit/9e5008984fc3ce1fd8359acfe502b... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/history/hda-li.js M static/maps/mvc/history/hda-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/history/hda-li.js Log Message: ----------- nametags first, then hid+title Commit: ef1344f03f291468b87c89d90b3a0f06ec9b0a79 https://github.com/galaxyproject/galaxy/commit/ef1344f03f291468b87c89d90b3a0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M client/galaxy/style/less/history.less M static/style/blue/base.css Log Message: ----------- Adjust margins on labels Commit: a144ce58939b122cc1bfb0575081a2082942e773 https://github.com/galaxyproject/galaxy/commit/a144ce58939b122cc1bfb0575081a... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M lib/galaxy/managers/hdas.py Log Message: ----------- Swap tags to default view for hdas -- may need to revisit this if it proves too expensive. Commit: 4b7fea8d3fe0afa062213f81a75003cac593ad74 https://github.com/galaxyproject/galaxy/commit/4b7fea8d3fe0afa062213f81a7500... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/history/hda-li.js M static/maps/mvc/history/hda-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/history/hda-li.js Log Message: ----------- Adjust positioning again for nametags, below the standard title but still visible above the fold. Commit: a3ab46ef26031ba4c1fb22ebd0232bdb930651e5 https://github.com/galaxyproject/galaxy/commit/a3ab46ef26031ba4c1fb22ebd0232... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-03 (Fri, 03 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/history/hda-li.js M lib/galaxy/managers/hdas.py M static/maps/mvc/history/hda-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/history/hda-li.js Log Message: ----------- Swap to a 'nametags' field in the high level view instead of returning all tags. TODO: Optimize this Commit: 861368ae1c7fa21f4ee7b55fbb682f78e07ece9d https://github.com/galaxyproject/galaxy/commit/861368ae1c7fa21f4ee7b55fbb682... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-03 (Fri, 03 Mar 2017) Changed paths: M lib/galaxy/managers/hdas.py Log Message: ----------- Remove dead code from prior work in nametag collection, change to user_tname usage. Commit: 5055283f49d73b7eb3b420875dfe8ccc1adb85de https://github.com/galaxyproject/galaxy/commit/5055283f49d73b7eb3b420875dfe8... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-06 (Mon, 06 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/history/hda-li.js M client/galaxy/style/less/history.less M lib/galaxy/managers/hdas.py M lib/galaxy/tools/actions/__init__.py A static/maps/analysis.js.map A static/maps/app.js.map A static/maps/app/analysis.js.map M static/maps/mvc/history/hda-li.js.map A static/scripts/analysis.js A static/scripts/app.js A static/scripts/app/analysis.js 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/history/hda-li.js M static/style/blue/base.css Log Message: ----------- Merge branch 'tags_in_history' into dev Compare: https://github.com/galaxyproject/galaxy/compare/179e58c8b3a7...5055283f49d7