Commit Graph
3799 Commits
Author SHA1 Message Date
Dannon Baker 8ce1291359 Merge branch 'release_17.01' into dev 2017-02-14 15:58:31 -05:00
Dannon Baker 944feb2411 Minor tooltip tweaks. 2017-02-14 15:49:59 -05:00
Dannon Baker 43d80a0b60 Tooltips to suggest relog for quota correction. 2017-02-14 14:43:48 -05:00
Dannon Baker 3f07555173 Merge branch 'dev' into recalc-on-logout 2017-02-14 14:22:02 -05:00
Dannon Baker 255aa0470f Fix workflow save-as url not using galaxy's prefix. 2017-02-14 07:32:13 -05:00
Dannon Baker 4fc0b84910 Merge remote-tracking branch 'guerler/fix_tool_reload_003' into dev 2017-02-13 15:44:41 -05:00
Nicola Soranzo e06f56a615 Merge branch 'release_17.01' into dev
Conflicts:
	static/maps/mvc/tool/tool-form-base.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/tool/tool-form-base.js
2017-02-13 18:13:40 +00:00
Dannon Baker fcbb7c3de1 Tooltips to suggest relog for quota correction. 2017-02-12 15:50:08 -05:00
guerler 73b8fc45aa Check once for admin operations when building dropdown list in tool form 2017-02-10 23:52:39 -05:00
guerler 9590d45514 Improve success message upon tool xml reloading 2017-02-10 23:48:05 -05:00
guerler 10943712b8 Revise dropdown item label 2017-02-10 23:46:49 -05:00
guerler 8e59ec1e2b Remove unused tooltips for submenu options, fix response 2017-02-10 23:39:00 -05:00
guerler 727bfbd258 Fix error message style, raise message exception if tool has not been found 2017-02-10 23:20:38 -05:00
guerler cd52f20961 Align code style to existing code in tool form base 2017-02-10 23:05:35 -05:00
guerler 1aa459f19d Use shared modal viewer 2017-02-10 23:01:25 -05:00
guerler b466ff6cd8 Fix root location for tool reloader 2017-02-10 23:00:56 -05:00
guerler 69552ba63b Fix root location for tool reloader 2017-02-10 21:36:44 -05:00
John Chilton d302400b99 Merge pull request #3407 from guerler/fix_workflow_ui
Workflow editor UI touch up
2017-02-07 14:55:01 -05:00
guerler 5b36664201 Fix qunit tests 2017-02-06 14:13:59 -05:00
guerler f264e91cab Use update endpoint to store workflows 2017-02-06 11:00:58 -05:00
Nicola Soranzo 0b074f3fa5 Merge branch 'release_17.01' into dev
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
2017-02-03 11:44:02 +00:00
Dannon Baker 58241e8dcb Rebuild client for 17.01 with latest node. 2017-02-01 14:51:07 -05:00
guerler 5bf7c46eca Repack scripts 2017-01-31 12:40:49 -05:00
guerler 3911cb039d Merge branch 'dev' into fix_workflow_ui 2017-01-24 13:15:00 -05:00
guerler 0b0419533a Merge branch 'dev' into fix_workflow_issues 2017-01-24 09:12:18 -05:00
John Chilton 1b589f252e Merge remote-tracking branch 'jmchilton/dev' into escape_vis
Conflicts:
	static/scripts/bundled/libs.bundled.js.map
2017-01-23 11:27:26 -05:00
guerler 0482416c7a Merge branch 'dev' into fix_workflow_issues 2017-01-17 13:09:14 -05:00
Nicola Soranzo 8cb6162681 Merge branch 'release_16.10' into dev
Conflicts:
	static/maps/mvc/ui/ui-misc.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/ui/ui-misc.js
2017-01-16 11:57:16 +00:00
yhoogstrate ce0780abef Custom dbkey builds: additional variable escaping 2017-01-16 10:35:52 +01:00
guerler 9c9c4d2d08 Fix error display 2017-01-15 01:48:53 -05:00
guerler 84d9e171bc Merge branch 'fix_workflow_issues' of https://github.com/guerler/galaxy into fix_workflow_issues 2017-01-14 18:07:32 -05:00
guerler 6c4a4ce3e4 Revise tool model building to always provide a properly ordered array, augment model handling on front-end 2017-01-14 16:39:37 -05:00
Dannon Baker 08454cfa2a Name function appropriately for Javascript instead of being stuck in Python. 2017-01-13 14:50:48 -05:00
Dannon Baker b2cf773bef Merge remote-tracking branch 'upstream/release_16.10' into dev 2017-01-13 14:20:47 -05:00
Dannon Baker b798895af0 Swap form-view to use the new UnescapedMessage 2017-01-12 16:38:41 -05:00
Dannon Baker 890107334d Reversion of ui-misc messagebox changes. 2017-01-12 16:02:03 -05:00
Dannon Baker 45a9d586b6 Formatting cleanup. 2017-01-12 15:51:18 -05:00
Dannon Baker 3060da4ee5 Export UnescapedMessage from ui-misc. 2017-01-12 15:49:30 -05:00
Dannon Baker e1083132b8 Add UnescapedMessage, for when we actually need to display a message with html contents. Any users of this must escape contents on their own. 2017-01-12 15:42:05 -05:00
Dannon Baker a5c445966e Swap the client's ui-misc.Message to escape by default. 2017-01-12 12:10:38 -05:00
guerler 6c3b402020 Properly attach event handler when user clicks on autocomplete selection 2017-01-11 21:56:47 -05:00
John Chilton e74ca27dbf Revert "Markdown datatype support." 2017-01-11 21:48:09 -05:00
guerler e571fce478 Revise label handling and duplicate check, move save controller to api for proper error response 2017-01-11 16:18:09 -05:00
guerler 20c2707536 Attach onchange handler once, avoid overwrite 2017-01-11 12:14:25 -05:00
guerler dc5326ce03 Use workflow form handler options to parse tool id and version 2017-01-11 11:23:06 -05:00
guerler b3e161a4af Check datalist length before attaching autocomplete feature 2017-01-11 11:14:36 -05:00
guerler e22b4bcbfc Do not attach autocomplete handler if datalist is empty 2017-01-11 11:01:18 -05:00
guerler a55038067b Display unfiltered datalist options 2017-01-11 10:58:42 -05:00
guerler 49e784306b Repack scripts 2017-01-11 10:47:29 -05:00
guerler bc51f6f69f Rename custom autocomplete module to avoid interference with original jquery autocomplete, use original version to display datalists 2017-01-11 10:44:45 -05:00