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,509 Commits 69 Branches 243 Tags
1fd38fb3ee467473d5326ef8c197cedcd9472d53
Commit Graph
2983 Commits
Author SHA1 Message Date
Carl Eberhard 1fd38fb3ee Client build: update webpack versions in package.json; recompile 2015-07-21 13:08:43 -04:00
Carl Eberhard 25770f4c7c Client build, webpack: move app-webpack closer to app-base for replacement/inheritance, fix bootstrapping of configuration and use managers 2015-07-17 12:21:44 -04:00
Carl Eberhard 0c03f69c39 Client build, webpack: prototype commit 2015-07-17 11:28:53 -04: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
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
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
Martin Cech 188f90e8f1 remove the test file 2015-06-16 14:22:36 -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 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
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
Aysam Guerler e909be8c5b Merge pull request #311 from jmchilton/workflow_editor_collections 
Extend workflow editor to allow tool output collections.
 2015-06-08 13:51:22 -04:00
guerler e466bcbc44 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002 2015-06-07 22:17:25 -04:00
guerler 6594a46697 Fix spacing 2015-06-07 21:51:49 -04:00
guerler 0652e99f9e Fix indent, no code change 2015-06-07 21:49:32 -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
Dannon Baker 0e584eb4e7 Update galaxy-dev list to non-alias in welcome.rst 2015-06-05 13:03:19 -04:00
John Chilton 620accaaad Extend workflow editor to allow output collections in tools. 
Mostly test cases - because I guess I could have sworn it was going to be harder than this.
 2015-06-04 14:38:38 -04:00
guerler 62de13d075 Replace global by local functions and remove unused function 2015-06-04 12:32:58 -04:00
guerler 613089e75f Re-insert indentation 2015-06-04 12:29:50 -04:00
guerler 5f5336eb07 Remove initial tabs from second workflow module 2015-06-04 12:05:18 -04:00
guerler fb945e06f6 Remove initial tabs from workflow module 2015-06-04 11:59:35 -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
Bjoern Gruening 1cb06bd4ec fix path to spinner icon, grunting 2015-06-02 15:58:24 +02:00