Commit Graph
1280 Commits
Author SHA1 Message Date
carlfeberhard d72dd3735c Client, polyfills: check for sessionStorage using a more cross-browser (apparently) way 2015-12-09 14:10:36 -05:00
Martin Cech fe1c9dd293 Merge pull request #1251 from jmchilton/workflow_labels_2
Workflow Editor UI for Step Labels
2015-12-08 12:04:26 -05:00
carlfeberhard 6ba86d89bc UI, Citations: don't create new BibtexParser, remove debugging 2015-12-08 10:57:41 -05:00
carlfeberhard 5ff09896f7 UI, Citations: fix require of bibtex parser 2015-12-08 10:27:09 -05:00
John Chilton 3f8950628c Workflow label UI refinement.
- Escape workflow labels in mako.
 - Handle unlabelling steps properly (restore original node name to node and editor form titles).
2015-12-08 09:22:11 +00:00
Martin Cech ef0b6cc459 show notifications as Toasts and not like JS alerts (bleh) 2015-12-07 15:07:14 -05:00
John Chilton 3a023f4cae Merge pull request #818 from mvdbeek/cross_toolshed_tool_fetching
Look up installed tools from different toolshed(s)
2015-12-06 15:56:31 -05:00
John Chilton e3161b4671 Add support for workflow step labels in editor.
- If a step has a label, display it in the step editor side panel title.
 - Allow clicking the title to change the label.
 - Display the label (if set) as the workflow node box title.
 - Add icon to workflow node since the title might not be related to type anymore.
 - Enforce unique labels accross the workflow in the editor.
 - Qunit test cases for some of this behavior and other recent changes.
2015-12-06 12:27:13 +00:00
John Chilton 1fdde2cb4d Refactor generic side workflow editor panel toward backbone. 2015-12-05 16:37:08 +00:00
Björn Grüning 6126bd0e93 Merge pull request #1214 from jmchilton/format_2_1
Small enhancements in workflow inputs and outputs
2015-12-05 21:37:50 +01:00
Marius van den Beek 4f1359a0a6 Merge branch 'dev' of github.com:galaxyproject/galaxy into cross_toolshed_tool_fetching 2015-12-05 12:34:37 +01:00
Marius van den Beek 1be4f85404 Add messages inform users of changes in the tool_id. 2015-12-05 12:28:46 +01:00
John Chilton c91a2eb339 Multi data parameter improvements.
Allow multiple collections to be fed to a multi data parameter in one reduction step. Fixes #750 and will really simplify certain classes of tools.

Rebased original with fixes for rerun of such reductions.

Manually tested workflow execution and everything seems fine. The workflow editor already thought this was possible, so that is another bug corrected by this enhancement.

To run the associated API test, execute the following command:

./run_tests.sh -with_framework_test_tools -api test/api/test_tools.py:ToolsTestCase.test_reduce_multiple_lists_on_multi_data

Conflicts:
	static/maps/mvc/dataset/dataset-choice.js.map
	static/maps/mvc/form/form-select-content.js.map
	static/scripts/mvc/form/form-select-content.js
2015-12-04 20:41:21 +00:00
John Chilton cee9d4d1b3 Grunt the workflow JS. 2015-12-04 20:37:35 +00:00
carlfeberhard 9e8068f367 (merge dev) 2015-12-04 13:17:29 -05:00
Eric Rasche 9bd2712c5d Just going to clobber everything 2015-12-04 11:46:27 -06:00
Eric Rasche 564f12c50f Remove icons 2015-12-04 11:46:00 -06:00
Eric Rasche 1cc57b1eb2 Add icons and reorganise history menu 2015-12-04 11:46:00 -06:00
carlfeberhard b72035c9fc Webpack: fix/re-work the pub-sub connection between the quotameter and the history panel so that the meter updates properly when a new dataset is added 2015-12-03 16:01:18 -05:00
carlfeberhard 002bc6b40a (merge dev) 2015-12-02 12:00:51 -05:00
Dannon Baker 84464288b1 Merge pull request #1184 from guerler/fix_download_links_002
Filter download links, avoid warning dialog
2015-12-01 10:19:22 -05:00
Nate Coraor 9e28f2e786 Merge branch 'release_15.10' into dev 2015-11-30 14:13:26 -05:00
guerler 2e97553194 Filter download links 2015-11-28 04:35:58 -05:00
carlfeberhard 9f91b82245 Client: remove IE7/8 and excanvas polyfills 2015-11-24 16:12:31 -05:00
carlfeberhard d921b42431 Webpack: remove mvc/app 2015-11-24 12:34:09 -05:00
Martin Cech e19b7f656f fix the extra slash in URL when creating folder 2015-11-23 15:14:15 -05:00
Martin Cech e142beaffe replace wrong class name 2015-11-23 15:08:25 -05:00
guerler 368da171f5 Call onbeforeunload before hiding iframe through display()
Validated message
2015-11-23 11:12:03 -05:00
carlfeberhard 844facd1f1 UI, Lists: throttle selector animation when number of list items > 20 2015-11-20 14:55:14 -05:00
carlfeberhard 9c5d4cfc0e (merge dev) 2015-11-20 10:29:23 -05:00
Dannon Baker f61ec1c3c0 Merge and rebuild client 2015-11-19 20:34:32 -05:00
Dannon Baker 0fdca7d40a A large assortment of escaping fixes to primarily grids and javascript templating, and one bad-data-ingress fix (copy history name). 2015-11-19 20:27:25 -05:00
guerler 0a09de5453 Show welcome page with required login, remove iframes
Reinsert iframe for login

Use iframes
2015-11-16 14:47:59 -05:00
carlfeberhard b8870bfedc (merge dev) 2015-11-16 10:09:58 -05:00
carlfeberhard 2956b12e9b Webpack: correct tool menu template loading in requirejs/galaxy.panels.mako by using require.config.map; normalize galaxy_config.root and Galaxy.options.root to Galaxy.root across the templates and js 2015-11-13 18:05:26 -05:00
carlfeberhard cc6c15f3b1 Webpack: normalize tags, annotations, and tools (change refs - 3 of 3) 2015-11-13 16:28:39 -05:00
carlfeberhard 894af4c5de Webpack: normalize tags, annotations, and tools (2 of 3) 2015-11-13 16:11:26 -05:00
carlfeberhard 6f754216a4 Webpack: normalize list-panel to list-view 2015-11-13 16:05:52 -05:00
carlfeberhard 55068dea28 Webpack: normalize 'panel' names part-2: history and collection modules 2015-11-12 16:15:49 -05:00
carlfeberhard c66bc7ab76 Webpack: normalize history and panel module names with other mvc modules (history-panel is not a panel - just a view) 2015-11-12 15:17:32 -05:00
carlfeberhard 6d0ab669ec Webpack: correctly load jQuery-ui, require bibtex in citations, and move polyfills to first loaded 2015-11-12 15:06:17 -05:00
carlfeberhard 372c2e9e43 Webpack: move data.js into dataset/data.js; pack scripts 2015-11-12 14:52:11 -05:00
carlfeberhard 2f0b646137 Webpack: move tools.js into mvc/tools/ 2015-11-12 14:41:45 -05:00
Mark Einon 67d0bcb5b3 Trivial: Replace unnecessary duplicated var check with 'else if' 2015-11-12 15:38:18 +00:00
carlfeberhard a4edf159be (merge dev) 2015-11-12 10:04:38 -05:00
carlfeberhard c1cc3bd483 Webpack: fix masthead in libraries; update Panel usage in base_panels.mako, galaxy.panels.mako 2015-11-12 09:42:29 -05:00
carlfeberhard b1266b45dc Webpack: move panel to Backbone, implement ToolPanel and HistoryPanel; simplify js-app.mako (by removing alternate layouts); clean up debugging info, make Galaxy less chatty before logging setup 2015-11-11 17:48:11 -05:00
Marius van den Beek 36797b3195 Add changed static files. 2015-11-10 12:25:01 -05:00
Martin Cech 75d6489348 Merge pull request #1049 from mvdbeek/library_add_from_history
Fix import of history datasets into library.
2015-11-10 12:22:49 -05:00
Marius van den Beek 4f824cb920 Add changed static files. 2015-11-10 17:37:28 +01:00