Commit Graph
3452 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
carlfeberhard b55635f71b Client, upload: fix passing of nginx_upload_path and ftp_upload_site to upload-view, fix default nginx_upload_path in configuration serializer 2015-12-06 12:10: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 198cb7c9a1 Fix rebase issue 2015-12-04 11:51:17 -06: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 a3e3bde6a2 Webpack: restore redirect for after login when require_login; remove allowed_paths for require_login: /index, /tool_menu, /masthead, library/browse, history/list, dataset/list 2015-12-03 14:35:13 -05:00
carlfeberhard 963d8637e8 Webpack: remove cruft galaxy.tools.js and (remnants of) galaxy.workflows.js 2015-12-02 15:41:48 -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 f397584538 Webpack: add link rel='index' with href to Galaxy.root, rework browser testing to use the same when redirecting to error pages 2015-11-25 14:17:03 -05:00
carlfeberhard 68da000470 Client, rgenetics: 'Nuke 'em all' - R.Lazarus 2015-11-25 10:12:02 -05:00
carlfeberhard e3e9579a81 Webpack: pack scripts, move galaxy-app-base.js to galaxy.js 2015-11-24 16:49:03 -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
carlfeberhard b15a408293 Client: remove duplicate rgenetics directory tools/rgenetics 2015-11-24 12:30:03 -05:00
carlfeberhard f3f8fef28a Webpack: move Galaxy object creation from mako to app js, clean up and localize page, panels, and app 2015-11-24 12:18:52 -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
John Chilton a664deeee7 Merge pull request #1130 from dannon/repack_dev
Enforce client build deps are up-to-date.  Rebuild style with lessc > 2.5
2015-11-20 16:15:35 -05:00
carlfeberhard baeaae9905 Webpack: rebuild bundles using webpack 1.12.8 as defined in the package.json 2015-11-20 16:01:59 -05:00
carlfeberhard 51e0986490 Webpack: add in the libs bundles, Carl. They're kinda important. 2015-11-20 15:43:06 -05:00
carlfeberhard 119e26f4e5 Merge pull request #1142 from dannon/menu_onclick_addition
Menu onclick addition
2015-11-20 15:15:08 -05:00
carlfeberhard 844facd1f1 UI, Lists: throttle selector animation when number of list items > 20 2015-11-20 14:55:14 -05:00
Dannon Baker 81f1b7f8e0 Remove debugging logic and shortcut. 2015-11-20 13:17:46 -05:00
carlfeberhard dba7e6640f Webpack: correct handlebars template generation to return an AMD function - this normalizes import of templates between webpack and require, fix sweepster tools import and templates 2015-11-20 12:36:05 -05:00
Dannon Baker f0e28555af Support onclick for menu items. 2015-11-20 12:11:55 -05:00
carlfeberhard 9c5d4cfc0e (merge dev) 2015-11-20 10:29:23 -05:00
carlfeberhard 7cd5713dbb Webpack: simplify query routes in analysis, remove duplicate js in display.mako and tabular_chunked.mako, change order of requirejs import; testing, casperjs: quiet requirejs scripterrors when navigating away from pages 2015-11-20 10:08:44 -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
Dannon Baker 5c285eaee7 Add grunt check task to verify npm modules are up to date 2015-11-19 11:34:49 -05:00