Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 09b42113c6b9fb1bcddbe66a86e299866431c9a4 https://github.com/galaxyproject/galaxy/commit/09b42113c6b9fb1bcddbe66a86e29... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-07-14 (Thu, 14 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 Commit: 3646d08d7ff2303be21e9c12050a55039dc1219a https://github.com/galaxyproject/galaxy/commit/3646d08d7ff2303be21e9c12050a5... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-07-14 (Thu, 14 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 Commit: 510fe47ae19c170001eac652c83316d3fd2b181b https://github.com/galaxyproject/galaxy/commit/510fe47ae19c170001eac652c8331... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-07-14 (Thu, 14 Jul 2016) Changed paths: 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 Log Message: ----------- (bundle scripts) Commit: 4bf21e624ecea88ce67a9a802f6bd08b137e9a79 https://github.com/galaxyproject/galaxy/commit/4bf21e624ecea88ce67a9a802f6bd... Author: John Chilton <jmchilton@gmail.com> Date: 2016-07-18 (Mon, 18 Jul 2016) Changed paths: M client/galaxy/scripts/mvc/history/history-contents.js M lib/galaxy/jobs/runners/kubernetes.py M lib/galaxy/util/__init__.py M lib/galaxy/web/framework/decorators.py 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/mvc/history/history-contents.js M templates/ind_share_base.mako M tools/stats/gsummary.xml Log Message: ----------- Merge remote-tracking branch 'galaxyproject/dev' into HEAD 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 Compare: https://github.com/galaxyproject/galaxy/compare/3b19a061cf89...4bf21e624ece