Commit Graph
1294 Commits
Author SHA1 Message Date
Jeremy Goecks ec1855f56e Merge in stable to default 2013-11-11 12:26:06 -05:00
Jeremy Goecks c1d4a49d6d Trackster: hide tool by default. Pack script. 2013-11-11 12:18:40 -05:00
Carl Eberhard 0d2ee886fc History panel: display error message when anon user tries to create a new history, do not re-render; pack scripts 2013-11-11 11:48:28 -05:00
Jeremy Goecks 901a787793 Merge in stable branch. 2013-11-10 13:10:04 -05:00
Jeremy Goecks a16d94ca3e Trackster: fix bug in positioning read connector. Pack scripts. 2013-11-10 13:07:43 -05:00
James Taylor 688d90babc Merge stable -> default 2013-11-09 17:07:16 -05:00
James Taylor e2684b4d1f Fix trackster dbkey selection in safari 2013-11-09 17:05:34 -05:00
Carl Eberhard 571405de76 UI, hda model and user model: prefix urlRoots with galaxy_config.root 2013-11-08 15:29:17 -05:00
Jeremy Goecks f300313a97 Trackster: (a) less-ify stylesheet; (b) update styles to project track header over data and adjust other styles as needed; (c) update styles to compress tracks and data as much as possible. 2013-11-08 11:28:41 -05:00
Jeremy Goecks 6bde18ad2e Automated merge of stable branch 2013-11-08 11:16:52 -05:00
Jeremy Goecks bf20e2db8a Trackster: only sort amongst tracks and groups, not other items. 2013-11-08 11:14:43 -05:00
Carl Eberhard 108f30d541 Popupmenu mvc: fix anchor target in renderOptions; Visualizations registry: default link target to galaxy_main; Scatterplot (in registry): general refactoring and cleanup, paginate data instead of loading all, allow zoom and pan; pack scripts 2013-11-08 11:02:23 -05:00
Carl Eberhard a55fab57f8 UI, user model: make urlRoot path absolute 2013-11-08 10:44:39 -05:00
Carl Eberhard 8fda012fab History panel: fix naming bug in purge async error handling 2013-11-05 11:33:06 -05:00
Dannon Baker 8882948eb6 Merged in sjguest/galaxy-central (pull request #247)
Fixed bug in Trackster alert message, reporting dbkey as blank when can't load chroms.
2013-11-05 16:23:51 -05:00
Carl Eberhard 6ae1abe55f History panel: add better protection v. lack of Galaxy, Galaxy.currUser 2013-11-05 16:18:21 -05:00
Carl Eberhard bc4d6467a0 HDA API, show: remove force_history_refresh, add annotation; update: allow annotation or genome_build == None; Users API: add 'tags_used' as list of unique tags used by the user; History panel tags & annotations: into Backbone sub-views, cleanup; pack scripts 2013-11-05 15:32:07 -05:00
Aysam Guerler 80501157d7 UI: Rename galaxy.master.js to galaxy.masthead.js 2013-11-05 13:52:35 -05:00
Aysam Guerler 4789f253f5 UI: Rename frame_manager to frame 2013-11-05 13:36:07 -05:00
Aysam Guerler b6734f720b UI: Translate masthead mako code into js 2013-11-05 12:34:42 -05:00
Carl Eberhard 6ae6da9e2d History panel: remove refs to urls.tags 2013-11-02 12:41:18 -04:00
Carl Eberhard d297415e85 History panel, tags: use select2 for tag controls; Fix broken tags set implementation for HDAs; pack scripts 2013-11-01 15:25:41 -04:00
Carl Eberhard e441e788ab History panel: fix broken onclick event for display buttons; pack scripts 2013-10-31 14:44:34 -04:00
Aysam Guerler 1216a2e697 UI: Fix eye icon in iconbar 2013-10-31 14:42:03 -04:00
Simon Guest a9cdd4e7fa Fixed bug in Trackster alert message, reporting dbkey as blank when can't load chroms. 2013-10-31 14:27:19 +13:00
Carl Eberhard 3dbaac5334 History panel, style: use font awesome icons for dataset states, use lessc more effectively; pack scripts 2013-10-30 17:38:37 -04:00
Carl Eberhard eba81fd629 History panel: replace fugue sprites with font-awesome icons, style changes; pack scripts 2013-10-30 14:00:06 -04:00
Carl Eberhard 28fb375971 UI: update to font-awesome 4.0.1 (Note: there is a new syntax and naming scheme for fa icons - names and classes have changed) 2013-10-30 10:52:28 -04:00
Carl Eberhard a8b758ccae History panel: restore broken on_click event for frames 2013-10-29 14:21:48 -04:00
Aysam Guerler 5191e57403 Re-insert api tools name fix 2013-10-29 12:23:14 -04:00
Carl Eberhard 8ef5e50365 History panel: add packed versions of new templates to repo 2013-10-28 14:53:13 -04:00
Carl Eberhard 80ba62d901 History panel: simplify html and css, use make_text_editable in annotations and name, consolidate templates, move less into history.less, simplify loading indicator and decrease drama, do not render HDA when sliding down with details; pack scripts 2013-10-28 14:50:57 -04:00
Jeremy Goecks e0a740ff9e Tool JS module: put template references into render() rather than model definition to allow for module loading when templates are not available. 2013-10-24 10:47:36 -04:00
Jeremy Goecks 316794c480 Automated merge of next-stable 2013-10-23 16:02:13 -04:00
Jeremy Goecks da43bca74a Fix type in b8482a0c41ae 2013-10-23 16:01:29 -04:00
Jeremy Goecks 022949ff1a Automated merge of next-stable 2013-10-23 15:51:00 -04:00
Jeremy Goecks 1af851e7a0 Trackster: only show summary label if there are multiple samples. 2013-10-23 15:50:39 -04:00
Carl Eberhard b0aeb4b812 QuotaMeter: remove handlebars templates, render within view, update for bootstrap 3.0; pack scripts 2013-10-23 14:22:20 -04:00
Carl Eberhard 2176b729cd UI: remove template for popupmenu (inside view now) 2013-10-23 13:24:46 -04:00
Carl Eberhard 7a61f7270b History panel: cleanup, todo list, docs; pack scripts 2013-10-23 13:03:59 -04:00
Jeremy Goecks f905f04ac8 Use galaxy_config.root for HDA URLs to support URL rewriting. 2013-10-23 12:31:52 -04:00
Jeremy Goecks 3294c94e9e Use galaxy_config.root for history URLs to support URL rewriting. 2013-10-23 12:22:43 -04:00
Jeremy Goecks 61a564aa45 Use galaxy_config.root for history URLs to support URL rewriting. 2013-10-23 12:11:58 -04:00
Carl Eberhard d239cf2e55 History panel: fix empty body on expanded and updating, do not show panel error on double zeros; HDA API: do not attempt set on non-hda; pack scripts 2013-10-22 14:13:37 -04:00
Aysam Guerler f2ad6b28d2 Use refreshHdas to refresh history during upload 2013-10-21 22:00:42 -04:00
Jeremy Goecks 899d81d7a3 Automated merge of next-stable 2013-10-21 20:59:36 -04:00
Jeremy Goecks df6c5e1e8c Fix track height calculation. 2013-10-21 20:58:20 -04:00
Jeremy Goecks ce179dd405 Pack script. 2013-10-21 18:41:45 -04:00
Carl Eberhard 647e224dad History panel: remove from iframe, general improvements; pack scripts 2013-10-21 16:26:47 -04:00
Jeremy Goecks 59eee0c267 Trackster: add needed height config preference. 2013-10-19 15:59:43 -04:00