Commit Graph
1746 Commits
Author SHA1 Message Date
Jeremy Goecks 606dff1089 Trackster: disable mousewheel scrolling for now until a better usage model can be created. 2014-07-01 18:36:28 -04:00
Jeremy Goecks 46d9937ff5 Fixes for Trackster and Circster, mostly around preference selection and usage. 2014-07-01 18:27:15 -04:00
Jeremy Goecks dc20caec65 Circster: add config options for min/max values and color. 2014-06-26 10:56:05 -04:00
Nate Coraor c6c6be08f4 Merge stable. 2014-06-26 09:11:36 -04:00
Dannon Baker 0923ea9e8e Merged in jgoecks/galaxy-central-gcc-2014-fixes/stable (pull request #425)
Trackster fixes
2014-06-26 09:02:02 -04:00
Jeremy Goecks a35fc2a598 Pack script. 2014-06-26 08:49:37 -04:00
Carl Eberhard bdcbb78fc0 Fix: phantomjs apparently lacks the bind fn on the Function prototype - correct failures in history-panel (line 252) by using underscore bind instead; up the standard upload timeout interval for api tests 2014-06-24 17:02:23 -04:00
Carl Eberhard 00f5f5d8f8 Style fix: use Safari/webkit specific syntax for flexbox to correct layout of paired-collection-creator in Safari 2014-06-24 15:46:12 -04:00
Aysam Guerler 1e65d0b59b Charts plugin update 2014-06-24 13:38:13 -04:00
Jeremy Goecks 39406fd0ef Trackster: remove mousewheel scrolling amplifier and clarify comment. 2014-06-23 16:11:46 -04:00
Jeremy Goecks 0fda9feb0f Trackster: resize viewport when showing reference track to avoid inadvertently hiding scroll bar. 2014-06-23 15:46:45 -04:00
Carl Eberhard 3ac10858ca Remove debugging from 4d11f59; add packed script 2014-06-18 10:04:10 -04:00
Carl Eberhard c12a713e93 Paired collections: prototype creator modal (accessible from the multi-select commands) allowing the user to create a paired collection 2014-06-18 09:56:29 -04:00
John Chilton 940e47d803 Pack scripts. 2014-06-16 13:09:54 -05:00
John Chilton bc6430c98a Redo 74826a5: Attempt fix of UI problems when collections & datasets in same history have same id.
Approach outlined by Carl, introduces separation between Backbone model id and underlying Galaxy id. Backbone id now includes type in the id. Lots of switching around which id is used where - probably introduces some bugs if I failed to update which id is to be used or switched to wrong one.
2014-06-16 13:08:37 -05:00
Aysam Guerler e0449af979 Charts: Add custom heatmap, unify chart configuration 2014-06-13 19:04:41 -04:00
John Chilton 1eff9e7330 Rollback UI commit - not quite ready after more testing. 2014-06-13 15:45:41 -05:00
John Chilton 54fced6483 Pack scripts. 2014-06-13 14:41:51 -05:00
John Chilton 712e4c5578 Progress on UI problems when collections and datasets in same history have same id.
Approach outlined by Carl, introduces separation between Backbone model id and underlying Galaxy id. Backbone id now includes type in the id. Lots of switching around which id is used where - probably introduces some bugs if I failed to update which id is to be used or switched to wrong one.
2014-06-13 14:25:36 -05:00
John Chilton b513c3cc1d Modifications to history_contents API and client consumption...
... to reflect the fact that history can now contain two kinds of objects with potentially overlapping ids.
2014-06-13 14:25:36 -05:00
Aysam Guerler fc248a33b6 Charts: Unify multi-panel viewing 2014-06-11 13:57:13 -04:00
Dannon Baker a71add8ea1 Pack scripts. 2014-06-10 16:41:53 -04:00
Dannon Baker fe47d137bd Tabular view -- automatically populate full height page. This handles situations like reported by pjacock where the scroll bars never appear for particularly 'wide' datasets. 2014-06-10 16:41:26 -04:00
Dannon Baker 4aee495f3d Pack scripts 2014-06-10 16:39:39 -04:00
Dannon Baker 4642217554 Prevent rendering of sometimes sometimes empty lines in tabular display. 2014-06-10 16:38:51 -04:00
John Chilton 4db123b664 Merge latest stable. 2014-06-08 19:41:51 -05:00
John Chilton 550ad865d9 Pack scripts. 2014-06-07 12:31:44 -05:00
John Chilton b90852c55d Bugfix: Tool form logic for displaying allow_remap option was inverted. 2014-06-07 12:30:02 -05:00
Aysam Guerler f259ac94bd Charts: Adding chart subset selection filter, setting zoomable charts as default 2014-06-04 01:49:43 -04:00
Dannon Baker 1db9a64b79 Pack scripts. 2014-06-03 17:42:17 -04:00
Dannon Baker c43d604f4f Stop loading indicator at the end of get_next_chunk regardless of result. 2014-06-03 17:40:00 -04:00
Carl Eberhard 2b89dde726 History panel: allow multi-select with shift key to select range of datasets 2014-06-03 11:20:15 -04:00
Aysam Guerler e630af1211 Ui/Charts: Improve css structure, pack scripts 2014-05-31 02:49:30 -04:00
Aysam Guerler 4d241eb79a Updated UI elements and styles, added zoomable charts 2014-05-30 21:42:28 -04:00
Jeremy Goecks f8ac447e00 Small fix for Trackster location routing. 2014-05-30 19:16:30 -04:00
Jeremy Goecks 27e7499781 Load datasets into Scratchbook using divs rather than an iframe. Push URLs for TabularChunkedView into model, enable Scratchbook to use a function to load content, enable scrolling in frames, and some code/documentation fixes. 2014-05-30 16:28:17 -04:00
Dannon Baker 87743bb14d Pack scripts. 2014-05-30 16:00:49 -04:00
Dannon Baker 067074d7ea Pack scripts. 2014-05-30 15:59:32 -04:00
Dannon Baker 0b80e2227d Merge next-stable. 2014-05-30 15:53:13 -04:00
Dannon Baker 027655ad25 Fix loading indicator jqmigrate griping. Also improve it to where it's not looking for a global ajaxstart/ajaxstop. 2014-05-30 15:52:49 -04:00
Dannon Baker 385d14c580 Merge. 2014-05-30 11:37:13 -04:00
Dannon Baker 9338288d55 Merge next-stable. 2014-05-30 11:33:18 -04:00
Dannon Baker 5eae3a39ab Pack scripts. 2014-05-30 11:33:08 -04:00
Dannon Baker d1badb7103 Merge. 2014-05-30 11:11:46 -04:00
Dannon Baker 06cdba00da Add loading indicator back that disappeared (unintentionally?) in b12b245510be 2014-05-30 11:11:32 -04:00
Dannon Baker d76fb90e15 Merge next-stable. 2014-05-29 08:23:03 -04:00
Jeremy Goecks df9ef1f107 Enhance TabularChunkedView to load first chunk from server if it's not already available. This enables TabularChunkedView to be loaded dynamically rather than relying on bootstrapped data. 2014-05-28 17:20:15 -04:00
Carl Eberhard e82a1ad9af HDA view: properly compile underscore template on first load, override template fn to pass localizer (_l) into template fn 2014-05-28 13:41:07 -04:00
John Chilton a7b7519e3f Remove invalid comment. 2014-05-28 11:58:33 -05:00
Dannon Baker f610d230c3 Cleanup prior to tabular work. 2014-05-28 09:47:22 -04:00