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
20,621 Commits 69 Branches 243 Tags
d72dd3735c0dfd652fb45a117fe1942f10ff726d
Commit Graph
258 Commits
Author SHA1 Message Date
Marius van den Beek 4f1359a0a6 Merge branch 'dev' of github.com:galaxyproject/galaxy into cross_toolshed_tool_fetching 2015-12-05 12:34:37 +01:00
Marius van den Beek 1be4f85404 Add messages inform users of changes in the tool_id. 2015-12-05 12:28:46 +01:00
carlfeberhard 002bc6b40a (merge dev) 2015-12-02 12:00:51 -05:00
guerler 2e97553194 Filter download links 2015-11-28 04:35:58 -05:00
carlfeberhard 894af4c5de Webpack: normalize tags, annotations, and tools (2 of 3) 2015-11-13 16:11:26 -05:00
carlfeberhard 372c2e9e43 Webpack: move data.js into dataset/data.js; pack scripts 2015-11-12 14:52:11 -05:00
carlfeberhard 2f0b646137 Webpack: move tools.js into mvc/tools/ 2015-11-12 14:41:45 -05:00
guerler 76bcfaa0ff Fix log comments 
Use emit

Fix namespace

Fix namespace

Remove empty line

Check if logger exists

Fix comment

Redo

More

Fix yet another log

Fix statements

More fixes

Move emitter
 2015-11-07 00:45:00 -05:00
guerler 2e21e027b0 Insert promises 
Revision

Revise deferred class to use promises

Update charts

Fix comment

Use resolve and reject properly

Fix comments

Fix comments

Fix comments

Fix comment

Improve naming/comments

Remove unnecessary queue handler

Fix naming
 2015-11-02 12:59:16 -05:00
guerler c70c1aabd8 Fix deferred dom removal 
Remove empty line

Fix comments

Fix log location

Fix comments
 2015-10-27 15:37:39 -04:00
guerler b80eb8d47c Fix tool url building 2015-10-19 18:05:41 -04:00
guerler 45763bf85e Use common exceptions in tools 2015-10-08 12:00:34 -04:00
guerler 59885c3afd Fix error message handling 
Use common exception handlers

Fix error message

Fix error message

More fixes
 2015-10-05 19:01:48 -04:00
guerler 082c8952e0 Undo initial errors 2015-09-29 15:59:25 -04:00
guerler 6d00f38f0a Merge branch 'dev' of https://github.com/galaxyproject/galaxy into tool_form_003 
Conflicts:
	client/galaxy/scripts/mvc/tools/tools-form.js
	static/maps/mvc/tools/tools-form.js.map
	static/scripts/mvc/tools/tools-form.js
 2015-09-29 15:55:59 -04:00
Nate Coraor 90dc2b1093 Merge branch 'release_15.07' into dev 2015-09-29 13:55:22 -04:00
guerler c1faf48d81 Add large message style and use for initial tool loading notifications 2015-09-28 01:48:07 -04:00
Daniel Blankenberg e52b9ac255 Show tool parameter errors on initial tool form load. Needed for e.g. proper rerun display behavoir. 2015-09-25 16:42:31 -04:00
carlfeberhard b58c7203d0 UI, datasets: Move support for rerunnable to dataset-li expansion; remove redundant listener set up 2015-09-24 15:25:29 -04:00
guerler 57f023529a Remove tool form mako 
Fix new-line
 2015-09-23 16:10:56 -04:00
Dannon Baker 53f7ac02d2 Don't use a local reference to modal -- the intent here was to allow component-isolated modals as in other places, but we can do (or not) that at a later time. 2015-09-23 11:10:10 -04:00
Dannon Baker 6804ce681b Merge dev, resolve conflicts from console re-enablement. 2015-09-23 10:39:46 -04:00
Dannon Baker 8b404205c0 Resolve client merge conflict, repack. 2015-09-23 09:47:35 -04:00
Dannon Baker fe642fe7fa Tweak tool execution to automatically pull detail ids for new hdas on execution success model update so rerun can be immediate. 2015-09-22 19:48:59 -04:00
Dannon Baker acfd8673b6 Merge from dev." 2015-09-21 17:28:39 -04:00
Daniel Blankenberg 7ca661bb01 Fix for displaying tool form errors caused by http exceptions and when tool form doesn't exist. 2015-09-21 16:09:51 -04:00
Dannon Baker 83bd9dd541 repack without --develop 2015-09-21 12:01:44 -04:00
Dannon Baker b9913d2931 Swap tool form to use Galaxy.modal 2015-09-21 11:53:29 -04:00
Dannon Baker c51bfaa51a Flip API endpoint to the jobs API instead of hacking it into the existing tools api. 2015-09-16 14:04:50 -04:00
Dannon Baker 2b43a271ed Merge pull request #706 from guerler/ui_revision_000 
UI revision (panel rendering, iframes and tool forms)
 2015-09-09 14:18:09 -04:00
Dannon Baker ca5717d203 Address the regression in #674, add input name list back to rename PJA helptext. 2015-09-08 15:02:52 -04:00
Dannon Baker e2542d7296 Swap argument to pja_arg, being more indicative of how this is used. This also obviates the need for the togglable show_arg. 2015-09-08 14:12:36 -04:00
Dannon Baker d55c47a14c Optional argument id display (in workflow editor PJAs we don't care to see this, for example -- and this has been toggled off here) 2015-09-08 11:20:33 -04:00
guerler 4971a8f540 Disable iframe for tool form 2015-09-05 05:43:24 -04:00
guerler af6a51f004 Fix admin check 2015-09-05 02:09:38 -04:00
guerler 00806d484b Use Galaxy object instead of galaxy_config 2015-09-04 17:36:39 -04:00
Nicola Soranzo bcbeb75a68 Merge branch 'master' into dev 
Conflicts:
	lib/tool_shed/dependencies/tool/tag_attribute_handler.py
 2015-09-02 16:10:03 +01:00
Carl Eberhard b1841e22d9 Client build: do not drop console when compressing, when not compressing do not mangle variable names 2015-09-01 10:55:41 -04:00
guerler 4dd6304f05 Fix version parsing in tool form 2015-08-31 12:34:26 -04:00
Dannon Baker 63d6c37a39 Rebuild client w/ new options. 2015-08-13 15:23:55 -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
John Chilton 732abcc0db Merge remote-tracking branch 'jmchilton/release_15.05' into dev 2015-06-08 14:04:28 -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 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 da63f0bef9 Add RuntimeValue handling for new workflow editor form 2015-05-19 00:27:59 -04:00
guerler 08d76ee0cf Fix automated section expansion for post job actions 2015-05-07 02:07:53 -04:00
guerler 32eb1ea0fc Fix flat sections 2015-05-04 14:32:10 -04:00
guerler 0a506dc561 Workflow editor adjustments 2015-05-02 16:00:38 -04:00