Commit Graph
965 Commits
Author SHA1 Message Date
Carl Eberhard b18cfa09b0 UI, collections: fix DatasetCollectionElement and DatasetAssociation id collision in DCECollection by preserving Element id in idAttribute 'element_id' 2015-07-05 13:13:13 +01:00
guerler 61024b832e Add missing packed files 2015-06-24 15:42:46 -04:00
guerler e51cd719dc Fix remaining qunit test cases for the workflow editor 2015-06-24 13:56:02 -04:00
guerler 63fee8f7ce Undo merged fixed, replace underscore path rewrite 2015-06-24 12:33:17 -04:00
John Chilton 110b12e571 Modify a few references to underscore.
This fixes these references when importing these modules through qunit.
2015-06-17 22:26:26 -04:00
guerler cc979583ce Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002 2015-06-17 16:04:37 -04:00
John Chilton fe625bc6cf Merge pull request #351 from guerler/add_argument_001
Add parenthesis to argument name search
2015-06-16 15:03:35 -04:00
John Chilton 042ec77100 Merge pull request #347 from martenson/ts-refactor-static
refactor TS javascript files to be separated from Galaxy JS
2015-06-16 14:23:33 -04:00
guerler 0c69c5b92f Add parenthesis to argument name search 2015-06-15 14:58:20 -04:00
guerler d2da9d9a17 Only add argument name if unavailable in help text 2015-06-15 13:46:01 -04:00
Martin Cech e8087f7b12 refactor TS javascript files to be separated from Galaxy JS
thanks to Carl for helping me with this
2015-06-15 13:31:16 -04:00
guerler ca832ced32 Add tool parameter argument to parameter help 2015-06-15 13:25:39 -04:00
guerler 97212e9b32 Remove globals from workflow-node module 2015-06-15 12:27:29 -04:00
guerler 0b96cbd0e9 Remove unnecessary files 2015-06-15 12:22:38 -04:00
guerler 6bf4a45e25 Remove unnecessary export of OutputCalloutView 2015-06-15 04:27:56 -04:00
guerler 614b35e3a9 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002
Conflicts:
	client/galaxy/scripts/galaxy.workflows.js
	static/maps/galaxy.workflows.js.map
	static/scripts/galaxy.workflows.js
2015-06-15 04:01:26 -04:00
guerler fd9f027a5c Further workflow front-end refactoring 2015-06-15 03:50:49 -04:00
Martin Cech cfe9620192 backbone base of TS groups
fix backbone hash problem; some more formatting and API polishing

refactor group API controller; better format group detail view

more formating and refactoring

add column to group detail

update details, add some more info to API response
2015-06-09 16:13:10 -04:00
guerler 4bceafcbf4 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002
Conflicts:
	client/galaxy/scripts/galaxy.workflow_editor.canvas.js
	static/maps/galaxy.workflow_editor.canvas.js.map
	static/scripts/galaxy.workflow_editor.canvas.js
2015-06-08 14:43:04 -04:00
guerler c18616d14a Import js changes from https://github.com/galaxyproject/galaxy/pull/311/files 2015-06-08 14:37:41 -04:00
John Chilton 732abcc0db Merge remote-tracking branch 'jmchilton/release_15.05' into dev 2015-06-08 14:04:28 -04:00
guerler d22f1fb96d Replace global js variables by shared object module 2015-06-06 17:06:59 -04:00
guerler 2815354989 Follow jquery blog suggestions on attr vs prop usage 2015-06-05 15:45:11 -04:00
guerler 38037e487d Always open tool help links in a new window tab 2015-06-05 15:15:29 -04:00
guerler 62de13d075 Replace global by local functions and remove unused function 2015-06-04 12:32:58 -04:00
guerler 0bfd30a1a9 Move global add_node function to workflow class 2015-06-04 11:58:41 -04:00
guerler a00461eaf6 Merge workflow_001 2015-06-04 02:42:53 -04:00
guerler d01c108375 Reduce form mako to json generation, load form just once 2015-05-24 15:37:00 -04:00
guerler 44739c6457 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_000 2015-05-20 23:20:06 -04:00
Carl Eberhard 2257bdc665 UI, Tool form: remove select2 search.blur handler that re-focuses its search and prevents focusing on other elements 2015-05-20 18:10:26 -04:00
guerler 3217a20927 Update integer fields while editing 2015-05-20 01:52:19 -04:00
guerler 0742b43cc7 Change set at runtime icons 2015-05-20 01:09:20 -04:00
guerler 45b7a625ae Explicitly identify runtime value in handling process 2015-05-19 23:21:32 -04:00
guerler 5691d345fa Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_000
Conflicts:
	lib/galaxy/tools/__init__.py
2015-05-19 18:44:29 -04:00
guerler 4fcd23c0f3 Extend checksum to account for collapsed input tool parameters 2015-05-19 18:41:51 -04:00
guerler ab2238e533 Merge branch 'tool_form_000' into workflow_form_000
Conflicts:
	static/maps/mvc/form/form-data.js.map
	static/scripts/mvc/form/form-data.js
2015-05-19 18:37:08 -04:00
guerler 2fa3dabf0e Remove debug output 2015-05-19 17:39:27 -04:00
guerler 2db905c5c1 Add field id to checksum 2015-05-19 17:39:04 -04:00
guerler bf436582a8 Fix checksum to detect tool form changes 2015-05-19 17:32:04 -04:00
Carl Eberhard b5615d28a4 Merge remote-tracking branch 'origin' into bitbucket.dataset-choice 2015-05-19 11:57:36 -04:00
Carl Eberhard 6d20093f7b UI, Dataset chooser: fix underscore templating and right,left border 2015-05-19 11:55:15 -04:00
guerler da63f0bef9 Add RuntimeValue handling for new workflow editor form 2015-05-19 00:27:59 -04:00
guerler 32e027d431 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into library_data_parameter
Conflicts:
	static/maps/mvc/form/form-section.js.map
	static/scripts/mvc/form/form-section.js
2015-05-13 04:19:08 -04:00
Carl Eberhard 19d00d6ac6 Testing, qunit: remove unfortunately silent error of missing global Galaxy when running via require and phantom by checking scope first, update list of pairs tests with recent option changes, remove debugging cruft 2015-05-07 13:26:38 -04:00
Martin Cech d28ea45556 Merge branch 'release_15.05' into dev
Conflicts:
	config/plugins/visualizations/common/templates/script_entry_point.mako
2015-05-07 13:09:24 -04:00
Carl Eberhard c2d52fdddd History UI: in published/annotated panels, fix metafile download dropdowns (BAM files, etc.) to open properly, remove console statement in template 2015-05-07 10:53:30 -04:00
Nate Coraor 3e80076e6a Merge pull request #233 from guerler/workflow_1
Fix post action job and annotation parsing in new workflow editor
2015-05-07 09:00:06 -04:00
guerler 08d76ee0cf Fix automated section expansion for post job actions 2015-05-07 02:07:53 -04:00
John Chilton 21aea9cef7 Merge pull request #219 from carlfeberhard/testing
Update qunit tests
2015-05-06 08:38:44 -05:00
Carl Eberhard afd8344a8d Testing, qunit: remove unfortunately silent error of missing global Galaxy when running via require and phantom by checking scope first, update list of pairs tests with recent option changes, remove debugging cruft 2015-05-05 17:04:13 -04:00