Commit Graph
3844 Commits
Author SHA1 Message Date
Dannon Baker d20e19e85a Include values in tags and tag selection lgoic 2017-03-06 16:30:26 -05:00
guerler ecaf1be02f Show tags in select search field 2017-03-06 15:15:35 -05:00
guerler 5055283f49 Merge branch 'tags_in_history' into dev 2017-03-06 13:27:44 -05:00
guerler 6b2f9be75a Use space instead of comma when concatenating tags 2017-03-03 14:11:01 -05:00
guerler 735f56ec95 Concat all tags to improve front-end performance 2017-03-03 14:02:04 -05:00
Dannon Baker a3ab46ef26 Swap to a 'nametags' field in the high level view instead of returning all tags. TODO: Optimize this 2017-03-03 09:34:16 -05:00
Dannon Baker 4b7fea8d3f Adjust positioning again for nametags, below the standard title but still visible above the fold. 2017-03-02 21:16:03 -05:00
Dannon Baker 9e5008984f nametags first, then hid+title 2017-03-02 20:42:48 -05:00
Dannon Baker 31d222c910 'name' tag rendering, very basic, needs styling and loading fixes 2017-03-02 18:08:34 -05:00
guerler 2135e63f8e Filter tags regardless of given select field label 2017-03-02 12:49:25 -05:00
guerler c80380dc57 Merge branch 'dev' into unify_label_name_000 2017-02-28 16:13:17 -05:00
guerler 3efe748279 Strip partially removed autocomplete feature for history names, removed in #1303 2017-02-27 15:05:10 -05:00
guerler fb17e55a1d Use former version of autocomplete module for grids 2017-02-27 12:41:00 -05:00
guerler b9ba754ce6 Fix repacked files 2017-02-24 14:01:50 -05:00
guerler 2f53b1d6d1 Merge branch 'dev' into unify_label_name_000 2017-02-24 13:23:10 -05:00
guerler 820c46cf63 Repack scripts 2017-02-24 13:21:48 -05:00
Dannon Baker 0da2ac78e6 Rebuild client -- bad merge previously. 2017-02-22 16:04:03 -05:00
guerler 198d36f77b Fix step title in composite tool form 2017-02-22 12:53:57 -05:00
guerler dde9ba83ac Merge branch 'dev' into unify_label_name_000 2017-02-22 12:20:13 -05:00
Martin Cech d1c9ffb94c Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev
Conflicts:
	client/galaxy/scripts/mvc/tool/tool-form-composite.js
preserved dev version

	static/maps/mvc/tool/tool-form-composite.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-composite.js
2017-02-22 10:56:40 -05:00
Martin Cech 387805fc13 Merge branch 'release_17.01' into dev
Conflicts:
	client/galaxy/scripts/mvc/tool/tool-form-composite.js
    preserved the dev version

	static/maps/mvc/tool/tool-form-composite.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-composite.js
2017-02-22 10:54:08 -05:00
guerler c9b765794b Fix form handler 2017-02-21 19:01:22 -05:00
guerler b03904b52c Allow input specific error handling, fix input parameter configuration 2017-02-21 17:38:15 -05:00
guerler 3a7e6b0b74 Enable labels for all modules, used shared building process 2017-02-21 17:17:22 -05:00
guerler 0f742a6d83 Move workflow related tool form to workflow directory 2017-02-21 16:59:14 -05:00
guerler 92bd559c11 Move label/annotation input parameters at top for all modules 2017-02-21 16:28:38 -05:00
guerler e13958ffcd Remove tool module related annotation input parameter 2017-02-21 16:27:40 -05:00
guerler b91680a5b2 Use shared label/annotation input parameter building process 2017-02-21 16:26:46 -05:00
Nicola Soranzo 24eba8c58e Merge branch 'release_17.01' into dev
Conflicts:
	client/galaxy/scripts/mvc/tool/tool-form-composite.js
	static/maps/mvc/tool/tool-form-composite.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-composite.js
2017-02-21 20:31:17 +00:00
John Chilton 09c08d1f61 Merge pull request #3636 from guerler/fix_annotation
[17.01] Fix annotation display for data inputs
2017-02-21 07:48:18 -05:00
Dannon Baker a3a7e1001c Strip stashed-yet-merged debug detritus from history UI fixes. 2017-02-20 17:16:27 -05:00
Dannon Baker ce264f9542 Reimplement *old* method for unhide/delete-all-hidden using a temporary web controller endpoint. 2017-02-20 13:53:40 -05:00
guerler 8557c32034 Fix sanitization 2017-02-20 13:10:20 -05:00
guerler f1f6bf6c3a Fix annotation display for data inputs 2017-02-20 12:10:11 -05:00
Dannon Baker f155a9420a temp 2017-02-17 09:07:54 -05:00
guerler 841cbfd9c7 Fix content id parsing, through error if subworkflow could not be found 2017-02-16 12:55:04 -05:00
Dannon Baker ab6ae42c7a Cancel existing delayed updates when changing pages in the history. 2017-02-15 15:45:53 -05:00
guerler 5cd0516141 Merge branch 'dev' into unify_name_label 2017-02-15 14:41:37 -05:00
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
guerler 6330f60517 Merge branch 'dev' into unify_name_label 2017-02-14 15:01:58 -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
guerler 79c24066b4 Merge branch 'dev' into unify_name_label 2017-02-14 13:14:54 -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