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
18,557 Commits 69 Branches 243 Tags
1f62be4e1aec00a82b4c66209d486ebda695554a
Commit Graph
599 Commits
Author SHA1 Message Date
Dannon Baker e1bbbe5ae8 Merge branch 'dev' into lint-additions 2015-07-13 14:20:24 -04:00
carlfeberhard 4792825924 Merge pull request #446 from jgoecks/trackster-close-files 
Trackster fixes: (a) close data provider files after reading from the…
 2015-07-13 11:36:02 -04:00
Dannon Baker 2bf2844b21 Merge pull request #440 from dctrud/trackster_nowrap 
Stop trackster location wrap in chrome
 2015-07-13 11:17:01 -04:00
Martin Cech e9aa6e843d Merge pull request #426 from ericenns/feature/library_folder_export_to_history 
Feature/library folder export to history
 2015-07-13 16:29:01 +02:00
Nicola Soranzo 43aa5fa482 Lint various Python files. 2015-07-13 00:13:21 +01:00
Jeremy Goecks 75ab206ca5 Trackster fixes: (a) close data provider files after reading from them (but there are some data providers that currently lack close functions so those files will remain open); (b) fix running tools by correcting HDA manager function call; (c) remove use of underscore template because uglify does not handle it well. 2015-07-09 12:47:15 +02:00
David Trudgian b734aee99c Stop trackster location wrap in chrome 2015-07-07 10:59:42 -05:00
Eric Enns 8787f94cbb Replace lf_ids with folder_ids 2015-07-05 07:31:28 -05:00
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
Eric Enns 34d60749a0 Fixed download in beta library view to work with folders 2015-07-05 05:51:06 -05:00
Eric Enns a917852759 Removed commented out line which wasn't needed 2015-07-05 04:53:17 -05:00
Eric Enns 33abc49473 Fixed bug where panel wouldn't show unless a folder was present 2015-07-05 04:48:14 -05:00
Eric Enns 5a3b6564bc Icon now changes properly when folder row selected in beta library interface 2015-07-05 04:27:08 -05:00
Eric Enns 61a909978b Updated library view to show toolbar when folder or file present instead of only when file present 2015-07-05 04:05:25 -05:00
Eric Enns 5deb35a106 Updated library folder row to toggle checkbox when row is clicked 2015-07-05 03:54:12 -05:00
Eric Enns 52b0332f24 Updated galaxy library beta ui to be able to select a library folder for import 2015-07-04 12:57:19 -05: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
guerler 1ae11cbe08 Fix default qunit test cases for the workflow editor 2015-06-24 12:08:40 -04:00
Aysam Guerler 07a0ae0763 Merge pull request #3 from jmchilton/workflow_form_002_tests2 
Modify a few references to underscore.
 2015-06-22 14:11:07 -04:00
guerler cc1db3543e Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002 
Conflicts:
	templates/webapps/galaxy/workflow/editor_tool_form.mako
 2015-06-22 08:53:28 -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
Martin Cech 9d807b8599 add more fields; include category links; some minor bugfixes 2015-06-17 15:09:40 -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
Martin Cech 6eddbf524b allow the js dependencies to use generalized path 
using requirejs paths to provide the relative prefix
 2015-06-15 13:57: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 91b00044dc Use proper convention for main workflow view name 2015-06-15 04:38:09 -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
John Chilton 07072bd568 Merge pull request #326 from martenson/ts-groups 
TS groups
 2015-06-13 17:26:32 -04:00
Airistotal a2c44b4c8b Renamed new class and moved inline styling 2015-06-12 13:01:20 -05:00
Airistotal a09dd64d61 Added new css class for panel scrolling and compiled 2015-06-12 12:49:50 -05:00
Airistotal a91c81679c Fixed bug where the left panel didn't scroll when the screen was too smal 2015-06-12 12:30:44 -05:00
Carl Eberhard 6cc2e6bb73 Client build, toolshed: fix default task param in GruntFile 2015-06-11 09:41:36 -04:00
Carl Eberhard 7bea3621b6 Client build, toolshed: allow passing an 'app' option to the client/GruntFile, use 'grunt --app=toolshed' to watch for changes in toolshed scripts, duplicate our (unusual) galaxy scripts directories for the toolshed app (test-file.js to be removed). 2015-06-11 09:33:53 -04:00
guerler 66fa7c2ad2 Fix generic forms for modules 2015-06-10 03:13:38 -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 4411455ee9 Fix style import 2015-06-08 02:55:20 -04:00
guerler 6594a46697 Fix spacing 2015-06-07 21:51:49 -04:00