Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 45ba2b4e101c7e73494fa6237bc27f6b34f44210 https://github.com/galaxyproject/galaxy/commit/45ba2b4e101c7e73494fa6237bc27... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-05-09 (Mon, 09 May 2016) Changed paths: M lib/galaxy/managers/hdcas.py Log Message: ----------- API, history: add DCE count to HDCA serializer Commit: a16ba6c615558ddcd8847e236575f155638a7064 https://github.com/galaxyproject/galaxy/commit/a16ba6c615558ddcd8847e236575f... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-05-09 (Mon, 09 May 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 Commit: f9afb7bcdca49add9d0112e4b46e61c423665202 https://github.com/galaxyproject/galaxy/commit/f9afb7bcdca49add9d0112e4b46e6... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-05-09 (Mon, 09 May 2016) Changed paths: M client/galaxy/scripts/mvc/history/history-contents.js M lib/galaxy/managers/hdcas.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.map M static/scripts/mvc/history/history-contents.js Log Message: ----------- UI & API, history: return element_count by default - Adds element_count to summary serialization for hdcas through history/{:id}/contents - Implements a HistoryContents fetch method to decorate the hdcas after loading if necessary Commit: 8ce93d7fed04163ae524c829bac12f54068e3ee0 https://github.com/galaxyproject/galaxy/commit/8ce93d7fed04163ae524c829bac12... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-05-09 (Mon, 09 May 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 Commit: 3aaccdac7b626f58303602dd9cf4728c9b0c7796 https://github.com/galaxyproject/galaxy/commit/3aaccdac7b626f58303602dd9cf47... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-05-09 (Mon, 09 May 2016) Changed paths: M client/galaxy/scripts/mvc/history/history-view.js M lib/galaxy/managers/hdcas.py M static/maps/mvc/history/history-view.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/history-view.js Log Message: ----------- UI, history: get element_counts after history load - Waits 2s after history contents loading and fetches element_count for all dataset collections in the history - Removes element_count as a default summary field for HDCAs Commit: ab60901cdc678bd57dd11caaa8ba49b557a439ff https://github.com/galaxyproject/galaxy/commit/ab60901cdc678bd57dd11caaa8ba4... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-05-10 (Tue, 10 May 2016) Changed paths: M Makefile R config/plugins/visualizations/graphview/config/graphview.xml R config/plugins/visualizations/graphview/static/graphview.css R config/plugins/visualizations/graphview/static/graphview.js R config/plugins/visualizations/graphview/static/jquery.rdfquery.core.js R config/plugins/visualizations/graphview/templates/graphview.mako Log Message: ----------- (merge conflicts) Commit: a0291c61426cda865e0a2535fc7fa0a8acccaaf9 https://github.com/galaxyproject/galaxy/commit/a0291c61426cda865e0a2535fc7fa... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-05-16 (Mon, 16 May 2016) Changed paths: M client/galaxy/scripts/mvc/collection/collection-li.js M client/galaxy/scripts/mvc/history/history-contents.js M client/galaxy/scripts/mvc/history/history-view.js M lib/galaxy/managers/hdcas.py M static/maps/mvc/collection/collection-li.js.map M static/maps/mvc/history/history-contents.js.map M static/maps/mvc/history/history-view.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/history/history-contents.js M static/scripts/mvc/history/history-view.js Log Message: ----------- Merge branch 'show-dce-count' into dev Compare: https://github.com/galaxyproject/galaxy/compare/28acca5276b5...a0291c61426c