Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e37850386ecc8122abeb6695ffc76eb513f34516 https://github.com/galaxyproject/galaxy/commit/e37850386ecc8122abeb6695ffc76... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-li.js M static/maps/mvc/collection/collection-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/collection/collection-li.js

Log Message: ----------- UI, HDCAs: render element_count when available

- Adds a change event for element_count that renders the subtitle - Subtitle now renders the count or nothing if not available

Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map

Commit: 6b64af72deafee0382cb5b9c83ed39a3fa42e1c9 https://github.com/galaxyproject/galaxy/commit/6b64af72deafee0382cb5b9c83ed3... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-li.js M client/galaxy/scripts/mvc/history/history-contents.js M static/maps/mvc/collection/collection-li.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map

Log Message: ----------- UI, history: doc updates

Conflicts: client/galaxy/scripts/mvc/history/history-contents.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map

Commit: 654748763af10aa87d3afe9fdf9ea686520ede7e https://github.com/galaxyproject/galaxy/commit/654748763af10aa87d3afe9fdf9ea... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-li.js M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/collection/collection-view.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/scripts/mvc/history/hdca-li.js M client/galaxy/scripts/mvc/history/hdca-model.js M client/galaxy/scripts/mvc/history/history-contents.js M static/maps/mvc/collection/collection-li.js.map M static/maps/mvc/collection/collection-model.js.map M static/maps/mvc/collection/collection-view-edit.js.map M static/maps/mvc/collection/collection-view.js.map M static/maps/mvc/history/hdca-li-edit.js.map M static/maps/mvc/history/hdca-li.js.map M static/maps/mvc/history/hdca-model.js.map M static/maps/mvc/history/history-contents.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/collection/collection-li.js M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/collection/collection-view-edit.js M static/scripts/mvc/collection/collection-view.js M static/scripts/mvc/history/hdca-li-edit.js M static/scripts/mvc/history/hdca-li.js M static/scripts/mvc/history/hdca-model.js M static/scripts/mvc/history/history-contents.js

Log Message: ----------- UI, history: implement list:list

Conflicts: static/maps/mvc/history/history-contents.js.map static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map static/scripts/mvc/history/history-contents.js

Commit: d550024d56c063bb78e4855395cfbf0cc440fe08 https://github.com/galaxyproject/galaxy/commit/d550024d56c063bb78e4855395cfb... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M client/galaxy/scripts/mvc/history/history-contents.js M static/maps/mvc/history/history-contents.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 M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/history/history-contents.js

Log Message: ----------- UI, history: more feedback on bad collection type

Conflicts: static/maps/mvc/history/history-contents.js.map 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 static/scripts/bundled/login.bundled.js.map static/scripts/mvc/history/history-contents.js

Commit: 0d49b06bac4a5c4a4b94e48517d1c0f5de713d42 https://github.com/galaxyproject/galaxy/commit/0d49b06bac4a5c4a4b94e48517d1c... Author: Martin Cech cech.marten@gmail.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M static/maps/mvc/history/history-contents.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 M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/history/history-contents.js

Log Message: ----------- repack

Commit: 132bd4dd57e084ec8e743e1360e7d2a0faa29ac6 https://github.com/galaxyproject/galaxy/commit/132bd4dd57e084ec8e743e1360e7d... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-21 (Thu, 21 Jul 2016)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-li.js M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/collection/collection-view.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/scripts/mvc/history/hdca-li.js M client/galaxy/scripts/mvc/history/hdca-model.js M client/galaxy/scripts/mvc/history/history-contents.js M static/maps/mvc/collection/collection-li.js.map M static/maps/mvc/collection/collection-model.js.map M static/maps/mvc/collection/collection-view-edit.js.map M static/maps/mvc/collection/collection-view.js.map M static/maps/mvc/history/hdca-li-edit.js.map M static/maps/mvc/history/hdca-li.js.map M static/maps/mvc/history/hdca-model.js.map M static/maps/mvc/history/history-contents.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/collection/collection-li.js M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/collection/collection-view-edit.js M static/scripts/mvc/collection/collection-view.js M static/scripts/mvc/history/hdca-li-edit.js M static/scripts/mvc/history/hdca-li.js M static/scripts/mvc/history/hdca-model.js M static/scripts/mvc/history/history-contents.js

Log Message: ----------- Merge branch 'backport_2613' into release_16.04 (and rebuild client)

Commit: 2b3a0334e0bdfa3ef92c88c7d697eccce447083b https://github.com/galaxyproject/galaxy/commit/2b3a0334e0bdfa3ef92c88c7d697e... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-21 (Thu, 21 Jul 2016)

Log Message: ----------- Merge branch 'release_16.04' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/c6c22a977f97...2b3a0334e0bd