opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,619 Commits 72 Branches 243 Tags
182fbd1bc61f8ff8bd2cf29c23fca47c8eac7002
Commit Graph
2406 Commits
Author SHA1 Message Date
John Chilton 74cba741bc Merge pull request #255 from guerler/fix_none_selection 
[15.05] Accept 'None' as valid value for selections
 2015-05-13 13:24:21 -05:00
guerler e5d19d9999 Accept 'None' as valid value 2015-05-13 11:24:32 -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
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
Martin Cech c6f0b0ef67 Merge pull request #187 from martenson/new-logo 
[15.05] include new logo in the new release
 2015-05-04 09:48:03 -04:00
Carl Eberhard c6adf6e4c2 History panel: side-step creation of mutant collections instead of erroring 2015-05-01 12:05:47 -04:00
Dannon Baker c87c2a90a4 Merge branch 'expand_optionals' of https://github.com/guerler/galaxy into guerler-expand_optionals 
Conflicts:
	static/maps/mvc/form/form-section.js.map
	static/scripts/mvc/form/form-section.js
 2015-04-30 15:52:35 -04:00
guerler d9b857ee13 Fix typo 2015-04-29 21:25:05 -04:00
guerler 83750b418b Allow fallback to name for missing tool parameter labels 2015-04-29 21:09:48 -04:00
guerler 2f714044c9 Expand optional parameters, disable collapsing 2015-04-29 20:55:23 -04:00
Martin Cech af638403c4 add a margin to the logo picture to match the space in front of text 2015-04-29 15:40:29 -04:00
Martin Cech 357d5f2e44 fix for UI duplication bug reported bo Bjorn 
occured when folder contents were re-sorted
 2015-04-28 12:37:23 -04:00
guerler 8899453118 Fix empty default values for numeric parameters with min/max 2015-04-25 09:59:34 -04:00
Dannon Baker a2ba53f2c6 Merge pull request #134 from carlfeberhard/collections 
Collections
 2015-04-20 17:41:58 -04:00
Carl Eberhard 37cc9a0511 (cleanup debug statement) 2015-04-20 10:09:54 -04:00
Carl Eberhard ad29625d04 UI, collection creators: move no valid message into the alert box 2015-04-20 10:02:39 -04:00
Carl Eberhard 0dec475c80 UI, collection creators: minor tweaking 2015-04-17 10:53:26 -04:00
Carl Eberhard 9ada2f6c43 UI, Histories: improve highlighting of current/active content in current history panel 2015-04-16 16:01:23 -04:00
Carl Eberhard a92a719fe5 UI, collection creators: attempt to unify validity/error handling between list and pair creators 2015-04-16 12:33:54 -04:00
Carl Eberhard b2c7344f8f UI, Pair creator: handle invalid selections better, clean up, document; revert history.mako as a test bed 2015-04-15 12:22:12 -04:00
Carl Eberhard bf733670ca UI, Pair creator: initial (sloppy) refactor of pair creator to inherit from list creator 2015-04-14 16:39:18 -04:00
Carl Eberhard f5049a7ca0 UI, List creator: refactor some of the init code, clean up, documentation 2015-04-14 12:18:05 -04:00
Carl Eberhard ef484e648c UI, List creator: move hoverhighlight to its own module 2015-04-14 10:29:22 -04:00
Carl Eberhard b1d3a41a63 UI, List creator: autofocus name, mangle duplicate element names, turn off sorting 2015-04-14 10:23:48 -04:00
Carl Eberhard 951301cbdd UI, Collections: begin refactoring the list of pairs creator into a list collection creator: a subclass for all three (current) collection creators 2015-04-14 09:49:58 -04:00
guerler c1bf66b9b0 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into revise_validation 
Conflicts:
	lib/galaxy/tools/__init__.py
	static/maps/mvc/form/form-view.js.map
	static/scripts/mvc/form/form-view.js
 2015-04-10 19:59:56 -04:00
John Chilton e09fc21e6c Merge pull request #104 from guerler/revise_default_values 
Fix default value handling in new tool form
 2015-04-10 07:56:14 -05:00
John Chilton 38b06a704b Merge pull request #35 from guerler/tool_form_section_tag 
Tool form section tag
 2015-04-10 07:52:37 -05:00
guerler 182fac5ad6 Re-insert classic tool form 2015-04-10 01:07:36 -04:00
guerler 3ff5204801 Fix default tool parameter value handling in current form 2015-04-09 22:44:16 -04:00
guerler e625190219 Fix default value handling in new tool form 2015-04-09 22:18:41 -04:00
Carl Eberhard 237c857f8d UI, Histories: respect subtitle dataset hiding switch and prevent bad autohiding of newly added datasets. 2015-04-09 15:03:31 -04:00
Carl Eberhard fb1048bb09 UI, history multipanel: attempt to solve undefined context in underscore.debounce<-checkColumnsInView by removing context binding 2015-04-09 11:05:34 -04:00
guerler 7f479ff32c WorkflowForm: Use is_workflow instead of is_dynamic for workflow editor 2015-04-09 00:28:37 -04:00
guerler e7b7281be7 WorkflowForm: Convert selection arrays to proper strings 2015-04-08 18:47:10 -04:00
guerler 388587de1c Merge branch 'dev' of https://github.com/galaxyproject/galaxy into tool_form_section_tag 
Conflicts:
	lib/galaxy/tools/__init__.py
 2015-04-06 12:30:17 -04:00
Carl Eberhard b9fc715dd5 Fix url for DatasetAssociationCollection (and expansion of datasets in dataset-choice.js) 2015-04-02 17:16:46 -04:00
Dannon Baker 9257817afd Strip out unused lunr dependency -- a different approach was pursued for tool searching. 2015-04-01 11:41:15 -04:00
Dannon Baker 3a397ee7d3 Merge circster fix from release_15.03 to dev 2015-03-31 17:39:48 -04:00
Carl Eberhard f7669f3cd6 Fix to ba44452: properly scope mod_icon_btn in define not require 2015-03-31 17:05:50 -04:00
guerler 5aa73d0e05 Merge branch 'dev' into tool_form_section_tag 
Conflicts:
	lib/galaxy/tools/test.py
 2015-03-26 17:04:29 -04:00
Martin Cech 9496c9e9a4 Merge branch 'release_15.03' into dev 
Conflicts:
	static/scripts/mvc/library/library-dataset-view.js
	static/scripts/mvc/library/library-folder-view.js
	static/scripts/mvc/library/library-foldertoolbar-view.js
	static/scripts/mvc/library/library-library-view.js
	static/scripts/mvc/library/library-model.js
	static/scripts/packed
	static/scripts/packed/mvc/library/library-dataset-view.js
	static/scripts/packed/mvc/library/library-folder-view.js
	static/scripts/packed/mvc/library/library-foldertoolbar-view.js
	static/scripts/packed/mvc/library/library-library-view.js
	static/scripts/packed/mvc/library/library-model.js
 2015-03-25 16:33:44 -04:00
Martin Cech d5aeb952ce Merge pull request #37 from martenson/release_15.03 
[STABLE] fix libraries to work with proxy prefix
 2015-03-25 15:23:17 -04:00
John Chilton f11a3a80fe Add file lost in previous merge (b52e562369). 2015-03-25 14:29:38 -04:00
John Chilton b52e562369 Merge remote-tracking branch 'galaxyproject/release_15.03' into dev 
Conflicts:
	client/galaxy/scripts/mvc/tools/tools-parameters.js
	static/scripts/mvc/history/history-model.js
	static/scripts/packed
	static/scripts/packed/mvc/history/history-model.js
	static/scripts/packed/mvc/tools/tools-parameters.js
 2015-03-25 14:19:54 -04:00
Carl Eberhard 5ace814041 UI, History: fix model setAsCurrent to use galaxy_config.root proxy prefix 2015-03-24 17:03:59 -04:00
Martin Cech 4f53a85ea1 add root prefix to all ajax calls in data libraries 2015-03-24 14:11:41 -04:00
Martin Cech 9eed7ddb56 add root prefix to all library BB model urls 2015-03-24 11:14:11 -04:00
Carl Eberhard ec89d4c7cf Client: fix to base.js to remove Backbone dependency until we stop loading it via script tag (this should fix a trackster load error where backbone was attempting to reload jquery without a shim) 2015-03-23 18:53:40 -04:00
guerler 6b86b8c86f Parameters: Add expanded attribute to section input parameter 2015-03-23 15:41:32 -04:00