opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,834 Commits 69 Branches 243 Tags
656d9bef506cac653d66735ecfeff6437bb51422
Commit Graph
2425 Commits
Author SHA1 Message Date
Nate Coraor 656d9bef50 Merge remote-tracking branch 'upstream/release_15.05' into dev 
Conflicts:
	lib/galaxy/version.py
 2015-05-14 11:11:46 -04:00
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
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
Aysam Guerler 117a3415d3 Merge pull request #241 from carlfeberhard/client.update-d3 
Client libs: update d3 from 3.4.8 to 3.5.5
 2015-05-07 14:51:05 -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 edf794233d Client libs: update d3 from 3.4.8 to 3.5.5 2015-05-07 13:16: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
Dannon Baker e0f351ae2a Merge pull request #221 from carlfeberhard/client.update-libs 
Update client libs
 2015-05-06 16:30:17 -04:00
Carl Eberhard b18d215c44 Client libs: update requirejs to 2.1.17, correct bower installation for same 2015-05-06 10:24:25 -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
Carl Eberhard 801adcd694 Client libs: minor version bumps to jQuery and Raven 2015-05-05 13:28:31 -04:00
guerler 32eb1ea0fc Fix flat sections 2015-05-04 14:32:10 -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
guerler 0a506dc561 Workflow editor adjustments 2015-05-02 16:00:38 -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
guerler eb538e00bd Add ftpfile tool parameter 2015-04-24 04:35:19 -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
guerler 3832de63b8 Add multiple option to library dataset parameter 2015-04-20 01:43:27 -04:00
guerler f026690d27 Add optional feature to list input element 2015-04-19 23:48:20 -04:00
guerler 5dec24c21e Merge branch 'dev' of https://github.com/galaxyproject/galaxy into library_data_parameter 2015-04-19 22:59:16 -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 5c8ad19ddb New library data selector for tool form 2015-04-14 02:27:38 -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