opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,049 Commits 62 Branches 243 Tags
499f76e1d93bf77aaade47f50c7c1906b8ba31ba
Commit Graph
3171 Commits
Author SHA1 Message Date
carlfeberhard 54dca064fa UI, Multi-history: fix drop event handler to use dataTransfer of original event 2016-01-11 10:21:06 -05:00
John Chilton f8a7ac0820 Merge release_15.10 into release_16.01. 
Conflicts:
	eggs.ini
	lib/galaxy/tools/__init__.py
	lib/galaxy/tools/actions/__init__.py
	lib/galaxy/tools/toolbox/base.py
	static/maps/mvc/collection/list-collection-creator.js.map
	static/maps/mvc/library/library-foldertoolbar-view.js.map
	static/maps/utils/uploadbox.js.map
	static/scripts/mvc/collection/list-collection-creator.js
	static/scripts/mvc/library/library-foldertoolbar-view.js
	static/scripts/utils/uploadbox.js
	test/base/twilltestcase.py
	test/functional/tools/samples_tool_conf.xml
 2016-01-08 18:06:28 +00:00
guerler 237ecc7789 Add form help class 2016-01-05 16:15:55 -05:00
Dannon Baker a1a549ea67 Re-add identifiers to masthead, new ones for scratchbook (thanks @guerler) 2016-01-05 14:04:22 -05:00
Dannon Baker 9416e6f3f7 Merge and resolve conflicts, rebuilding. 2016-01-05 13:18:46 -05:00
Dannon Baker 5924857c2c Fix pre/postclick that got broken somewhere along the way w/ patches&merges. 2016-01-05 13:08:33 -05:00
guerler 884b1d42db Change scratchbook close icon 2016-01-05 11:45:31 -05:00
Dannon Baker 1d97e4271e Merge dev to include menu/onclick fix. 2016-01-05 11:00:10 -05:00
Dannon Baker 62b80dfcc5 Fix onclick broken in #1407 2016-01-05 10:04:03 -05:00
Dannon Baker 4ef3e21c95 Fix onclick handling broken w/ #1407 2016-01-05 09:44:06 -05:00
Dannon Baker da8b943f53 Merge. 2016-01-04 19:23:06 -05:00
Eric Rasche 5a441044fb Merge pull request #1308 from jmchilton/multi_collection_types 
Allow input collections to specify multiple collection types.
 2016-01-04 14:43:37 -06:00
guerler c9870cb89d Fix url formatting 2016-01-04 08:34:56 -05:00
guerler 4cd621dd37 Add test cases 2015-12-31 01:46:37 -05:00
guerler 339ad57f3f Cleanup Masthead and Scratchbook 
Cleanup Masthead and Scratchbook
 2015-12-30 16:31:59 -05:00
Dannon Baker 401583d730 Move TOURS.giveTour at the top level of the namespace instead of a method of the view. 2015-12-29 09:50:47 -05:00
Dannon Baker 578e201d64 Launch tour on GET arg (?tour_id=core.galaxy_ui). 2015-12-28 14:19:34 -05:00
Bjoern Gruening 1873d2c5ed update js scripts 2015-12-25 18:56:55 +01:00
Dannon Baker e325eba37c Some tweaks care of @bgruening. This adds (slightly tweaked) functionality to support a series of clicks, still needs a delay between clicks, and since it's the most common case that pre/postclick will be a single item, a list shouldn't be required here. 2015-12-21 13:08:15 -05:00
guerler 17d733b042 Move closing events to show/hide function 2015-12-19 17:20:02 -05:00
guerler 39e7f025eb Refine popover wrapper 
Revise popover, add tests
 2015-12-19 17:08:51 -05:00
guerler 048561d282 Avoid duplicate upload entries, revise modals, add tests 
Revise styles

Add more tests
 2015-12-19 17:08:49 -05:00
Dannon Baker 2c5241dc3b Full client rebuild. 2015-12-18 16:26:47 -05:00
Dannon Baker aecc5d864f Make tours.js safe (but possibly not functional wrt/ listing) to use on pages without Galaxy object. 2015-12-18 16:24:19 -05:00
Dannon Baker 38b3c6e97a Build client, bundle. 2015-12-18 14:19:17 -05:00
Dannon Baker 4efa8e73b3 Consolidate to standard options dict, minor refactorings. 2015-12-18 14:15:17 -05:00
Dannon Baker 8c1beb2af5 title override, working on fixing style. 2015-12-18 13:44:34 -05:00
Dannon Baker ffede65302 Debugging cruft. 2015-12-18 13:22:11 -05:00
Dannon Baker 5a3524245b Actually let people end a tour. 2015-12-18 13:20:57 -05:00
Dannon Baker 9e7eaaa7aa Finish sessionStorage and restart of tours across multiple pages. 2015-12-18 13:10:09 -05:00
Dannon Baker 7110a0cc5e Document necessary tweak. 2015-12-18 12:38:43 -05:00
Dannon Baker 1e5640163a Tour shim in onload, check sessionStorage (or would local be more appropriate?) 2015-12-18 12:23:40 -05:00
Dannon Baker f107b17928 Refactor a bit, adjust textinsert action to trigger 'change' on the element. 2015-12-18 12:01:07 -05:00
Dannon Baker 0203a69d88 Tours. 2015-12-18 10:26:22 -05:00
Dannon Baker 04f5ed4552 Reimplement menu onclick functionality that appears to have been dropped (probably a bad merge?) in the webpack PR. 2015-12-17 19:35:17 -05:00
John Chilton abd51e7f79 Merge pull request #1358 from guerler/fix_same_upload_000 
[15.10] Fix change handler association
 2015-12-17 14:31:17 -05:00
Martin Cech b4683fbce4 raise and show specific exception and warning when no files detected 2015-12-17 12:40:09 -05:00
guerler b0deead9c3 Fix change handler association 2015-12-17 11:40:25 -05:00
guerler 2ff3bf0c0c Fix label change handling 2015-12-16 17:12:37 -05:00
guerler 12014cc225 Show correct subworkflow name 2015-12-16 17:12:23 -05:00
guerler b4bfde4089 Fix attribute 2015-12-16 15:24:02 +00:00
guerler f10b968075 Build section dom in js 2015-12-16 15:22:25 +00:00
guerler f88ad8d4e3 Fix Change type label in editor form 2015-12-16 15:22:18 +00:00
John Chilton 157939aa8f Implement nested workflows. 
Details:

 - Add a new workflow module describing subworkflows.
 - Add workflow list to editor side panel - with options to link in a subworkflow module or copy the target workflow into the workflow being editted node for node.
 - Update workflow, workflow step, and workflow invocation models to track subworkflow connections and execution.
 - Extend workflow outputs with concepts of labels (and UUIDs while I'm there) to match workflow inputs. This allow us to have something to label outputs with in the workflow editor and to reference in the format 2 workflow description language.
 - Extend workflow editor UI to allow labeling workflow outputs (and enforce that these are unique across a workflow).
 - Extend workflow invocation and progress tracking to allow invoking a subworkflow as part of another workflow invocation.
 - Extend workflow import and export code to allow a nested representation of workflows.
 - Update format 2 workflow description to allow testing nested workflows.

Most relevant new and modified test cases can be run using the following commands:

```
./run_tests.sh -api test/api/test_workflows.py:WorkflowsApiTestCase.test_run_subworkflow_simple
./run_tests.sh -api test/api/test_workflows_from_yaml.py:WorkflowsFromYamlApiTestCase.test_subworkflow_simple
./run_tests.sh -api test/api/test_workflows_from_yaml.py:WorkflowsFromYamlApiTestCase.test_outputs
nosetests test/unit/test_galaxy_mapping.py
nosetests test/unit/workflows/test_workflow_progress.py
```
 2015-12-16 15:22:18 +00:00
Dannon Baker cf5d209e0f Manual merge of #1303 to resolve build artifact conflicts. 2015-12-16 06:51:12 -05:00
John Chilton 7f7010dbd9 Remove left over packed scripts. 
The source files have been deleted.
 2015-12-14 19:38:06 +00:00
carlfeberhard 2acdbe54f7 UI, Citations: fix citation-model's import of bibtex to use *either* commonjs or global 2015-12-14 17:22:58 -05:00
guerler 3108ba5c01 Ensure that text fields only display text 2015-12-14 13:29:01 -05:00
guerler 42edfca679 Repack, refix section validation 2015-12-14 11:24:25 -05:00
guerler c61a5529b4 Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004 2015-12-14 10:37:45 -05:00