Commit Graph
2915 Commits
Author SHA1 Message Date
Aysam Guerler 3ece75b4fa Parameters: Fix initial value for drill downs, Workflow/ToolForm: Move module building to api 2015-02-08 23:49:24 -05:00
Carl Eberhard 242f2634cf API, configuration: expand exposed settings to include those needed by the masthead in galaxy.masthead.mako, add serializers for config 2015-02-06 13:38:53 -05:00
Aysam Guerler a251de996a ToolForm: Update version selection, use underscores for internal parameters 2015-02-05 13:34:51 -05:00
Daniel Blankenberg 0ed4ee779b Allow reloading External Display applications without restarting Galaxy. 2015-02-04 16:12:03 -05:00
Aysam Guerler 889dc5a68f ToolForm: Add optional tool state format 2015-02-03 23:40:36 -05:00
Carl Eberhard bfb03c7be1 UI, history multi-view: fix column height response in firefox 2015-01-29 17:51:57 -05:00
Aysam Guerler d38ca6c5eb Workflow: Add tool form switch to config, fix late validation check 2015-01-29 00:38:02 -05:00
Aysam Guerler a97c07c87f ToolForm: Activate by default 2015-01-28 23:59:43 -05:00
Nate Coraor 23f3e479be Remove memdump, which probably has not worked for many years. 2015-01-28 16:20:30 -05:00
Dave Bouvier 126c98031f Remove the alert popups from the repository and tool dependency installation status pages. 2015-01-28 11:49:48 -05:00
Aysam Guerler b05ffd2d52 ToolForm: Fix configuration flag 2015-01-27 18:31:20 -05:00
Daniel Blankenberg 4243282427 Fix for re-displaying user registration form when registering as an email of an admin_user that is already declared in galaxy.ini (cntrller r dmb). NB: Automatic refresh of masthead after success did not seem to be occuring. 2015-01-27 14:52:55 -05:00
Dannon Baker 551dfc453e Allow cancelling of upload jobs. This won't cancel the actual upload, but it'll kill (or prevent) the processing job if it exists. This also allows one to clean up 'zombie' upload jobs that never leave 'upload' state via the admin panel. 2015-01-26 16:25:19 -05:00
Aysam Guerler 178666baeb ToolForm: Fix optional dataset parameters, fix inconsistencies in parameter handling 2015-01-23 12:04:50 -05:00
Carl Eberhard 0ff2c2139d Fix bootstrapped user data to use proper escaping (crap...) and allow history/hda tag to autocomplete again 2015-01-22 18:55:37 -05:00
Carl Eberhard a9a562d784 (Manually) merge central 2015-01-21 12:45:37 -05:00
Aysam Guerler b507bd2a16 Generalize tool form options required for workflow editor 2015-01-21 12:02:19 -05:00
Aysam Guerler 9ba84f4cc3 Generalize is_dynamic property, fix error validation for workflow tool form 2015-01-20 22:02:21 -05:00
Carl Eberhard ac6f5b8378 Merged galaxy/galaxy-central into default 2015-01-14 17:18:35 -05:00
Dannon Baker de15ce61ad Admins should have to re-authenticate to change password via this mechanism as well. 2015-01-14 09:44:33 -05:00
Carl Eberhard e3f57827f1 Merged galaxy/galaxy-central into default 2015-01-14 08:59:34 -05:00
Dannon Baker d83866c0c8 Make password reset via link feature work for the toolshed too. 2015-01-13 16:27:35 -05:00
Carl Eberhard cf9641ec64 Merged galaxy/galaxy-central into default 2015-01-13 16:17:43 -05:00
Dannon Baker 88e594d732 Change password does not need 'cntrller'. 2015-01-13 15:08:55 -05:00
Dannon Baker a3efbc6fa3 Style tweaks in user_info.mako 2015-01-13 14:24:15 -05:00
Dannon Baker dc06d32ec9 Initial password reset token feature. 2015-01-13 14:17:33 -05:00
Carl Eberhard 735719b263 Merged galaxy/galaxy-central into default 2015-01-13 08:44:42 -05:00
Aysam Guerler adc2d60bed ToolForm/Workflow: Add post job action forms, enable custom tool form sections 2015-01-13 01:09:03 -05:00
Carl Eberhard dde6a73ed6 Merged galaxy/galaxy-central into default 2015-01-12 16:11:32 -05:00
Carl Eberhard d26c79c88c Fix to UI modularization & trackster: add mod_icon_btn to the proper closure; Fix to TagManager refactoring: remove trans from tagging_common.mako method calls 2015-01-12 16:06:43 -05:00
Carl Eberhard f1dfc4c58a Merged galaxy/galaxy-central into default 2015-01-12 10:18:56 -05:00
Dannon Baker 520f0f227e Merge. 2015-01-12 08:59:51 -05:00
Aysam Guerler 0681eeeabc Upload: Show upload button only in analysis view 2015-01-11 12:59:43 -05:00
Aysam Guerler ebfc74011d ToolForm/Workflow: Generalize/revise tool model building process, insert form into workflow editor 2015-01-11 12:02:11 -05:00
Carl Eberhard fac23b2a1a History Mgr: eliminate the UsesHistoryMixin; HDA Mgr: move serveral methods into mgr from UsesHDAMixin; User Mgr: improve api generation/checking 2015-01-09 13:22:06 -05:00
Dannon Baker 77638ab961 Strip whitespace. 2015-01-07 14:51:24 -05:00
Dannon Baker 9ab24f95fd Slightly bump the width of the Message field for bug reports. 2015-01-07 14:51:11 -05:00
John Chilton aa86181e7c Move ToolSection and ToolSectionLabel out of galaxy.tools directly.
Would like to move the whole ToolBox out of galaxy.tools and into galaxy.tools.toolbox but need to separate all dependencies on galaxy.tools first.
2014-12-31 18:21:10 -05:00
John Chilton 8edced2685 Bugfix: Apply tool panel filtering in workflow editor.
Bug originally reported by Eric here - http://dev.list.galaxyproject.org/Bug-Toolbox-filters-not-applied-in-workflows-td4662879.html (though this only fixes the superficial bug of them showing up in the workflow editor - and does not yet implement "strong" toolbox filters as requested).

This is actually a broader change that centralizes logic for listing out tool panel contents when displaying components to the user and the added filtering comes about from that. It also eliminates the last places Galaxy was accessing toolbox.tool_panel directly (in those mako templates).
2014-12-29 11:48:38 -05:00
Daniel Blankenberg 190409af3a Do not |h escape tool dependency error message, as it is escaped and formated by tool_shed.util.basic_util.to_html_string 2014-12-15 17:01:07 -05:00
Dave Bouvier a0ccbc5bfa Merge next-stable changes to default. 2014-12-11 14:20:21 -05:00
Dave Bouvier c9c4926961 Merge stable changes to next-stable. 2014-12-11 14:19:44 -05:00
Martin Cech 245418f342 Merged in martenson/galaxy-central-marten/stable (pull request #599)
[STABLE] encode dataset, ldda, folder and library IDs properly in some more places
2014-12-11 13:01:22 -05:00
Dannon Baker b0827d8b20 Merged in davebgx/galaxy-central/stable (pull request #603)
[STABLE] Escape anything that could be user input in my assigned mako templates, add markupsafe.escape to username and email in users API controller.
2014-12-11 09:50:35 -05:00
John Chilton c8e7f46c38 Merged in dannon/galaxy-central/stable (pull request #602)
[STABLE] Force sanitization of form.title and form.name.  Header needs more digging; we actually use html content in the field.
2014-12-10 12:20:55 -05:00
Dave Bouvier 69ff4677bc Escape anything that could be user input in mako templates, add markupsafe.escape to username and email in users API controller. 2014-12-10 11:31:21 -05:00
Aysam Guerler 0edd57433c ToolForm: Activate tool form 2014-12-10 11:02:50 -05:00
Dannon Baker 277c47f54f Additionally sanitize form input fields (label, name, etc.) 2014-12-09 15:44:08 -05:00
Dannon Baker 59ef82eec0 Force sanitization of form.title and form.name. Header needs more digging; we actually use html content in the field. 2014-12-09 14:46:03 -05:00
Carl Eberhard 90b0fb587a Client build: remove references to ui.js in client and templates; mv scripts/jq-plugins/ui to more generic/catch-all scripts/ui/ 2014-12-09 13:52:24 -05:00