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
26,356 Commits 69 Branches 243 Tags
bf3a487f2017d248317e9ea70e567f57a70d9cc9
Commit Graph
3724 Commits
Author SHA1 Message Date
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
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
John Chilton e74ca27dbf Revert "Markdown datatype support." 2017-01-11 21:48:09 -05:00
John Chilton ca40f984b0 Markdown datatype support. 
With test tools demonstrating HTML and Markdown outputs from tools.

Implements #3396 as part of the Qiime hackathon.
 2017-01-10 15:51:08 -05:00
Bjoern Gruening 5bfffac069 repack 2017-01-08 15:12:55 +01:00
Bjoern Gruening a24ce4c61f Merge branch 'workflow_inputs_display' of https://github.com/jmchilton/galaxy into jmchilton-workflow_inputs_display 2017-01-08 15:11:09 +01:00
guerler d84221ea47 Add label hiding option without need to overwrite actual label 2016-12-27 10:51:38 -05:00
guerler 71b64472c6 Repack scripts 2016-12-27 10:29:13 -05:00
guerler ccdf09b099 Remove unused local variable 2016-12-27 08:43:30 -05:00
guerler c8ef41f1f1 Undo changes label handling adjustments to form-input and form-section modules 2016-12-26 22:50:36 -05:00
John Chilton cd0387f7ba Repack client scripts. 2016-12-26 13:58:46 -05:00
anuprulez ef82eec610 Merging with dev 2016-12-21 15:04:19 +01:00
anuprulez 132e284d37 Bug fix for masthead webhook if Galaxy.page is undefined for workflow, data libraries etc pages 2016-12-21 12:46:14 +01:00
Dannon Baker 415ddbb3bf Merge branch 'release_16.10' into dev 2016-12-19 12:03:13 -05:00
guerler 5c3a0e1df0 Identify workflow parameters through regex from original value 2016-12-17 15:22:20 -05:00
guerler 3f07c7b52e Preserve template value if no workflow parameter value has been specified 2016-12-17 15:03:28 -05:00
guerler 733a53adcf Replace workflow parameter values in template value string 2016-12-17 15:00:57 -05:00
guerler b6e9ba402d Allow multiple workflow parameters in a single line 2016-12-16 15:14:54 -05:00
Nicola Soranzo ed4e87ecad Merge branch 'release_16.10' into dev 
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/bundled/login.bundled.js.map
	static/style/blue/base.css
 2016-12-15 11:27:28 +00:00
Bjoern Gruening d2ab7e701c build the client 2016-12-14 22:46:36 +01:00
Dannon Baker 3ab4e1d742 The jobs API, which this functionality is based on, requires a logged in user, so prevent anonymous access here. Also shifts to using Galaxy.root correctly, instead of assuming / 2016-12-14 15:59:18 -05:00
Nicola Soranzo 06de9d0ae0 Merge branch 'release_16.10' into dev 
Conflicts:
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
 2016-12-09 17:13:07 +00:00
Nicola Soranzo d6d2a12ec0 Merge branch 'release_16.07' into release_16.10 
Conflicts:
	client/galaxy/scripts/mvc/upload/composite/composite-row.js
	client/galaxy/scripts/mvc/upload/default/default-row.js
	static/maps/mvc/upload/composite/composite-row.js.map
	static/maps/mvc/upload/default/default-row.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/bundled/login.bundled.js.map
	static/scripts/mvc/upload/composite/composite-row.js
	static/scripts/mvc/upload/default/default-row.js
 2016-12-09 17:09:28 +00:00
Dannon Baker c315f1d74b Upload file escaping backport. 2016-12-08 15:31:59 -05:00
Dannon Baker 9c435685cd Don't rely on complex, absolute selector, use local element.find() 2016-12-07 16:31:02 -05:00
Nicola Soranzo cbd527b9a4 Merge branch 'release_16.10' into dev 
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
 2016-12-07 20:35:40 +00:00
Dannon Baker 13ab07030c Use consistent spacing. 2016-12-07 07:53:34 -05:00
Dannon Baker 8766e12509 Escape filename in upload dialog, default and composite. Pointed out by David Wyde. 2016-12-07 07:48:34 -05:00
Martin Cech bf8cffa2b3 repack client 2016-11-30 12:10:23 -05:00
Martin Cech 710c2639f9 Merge branch 'dev' into adjust-menu-tooltips 
Conflicts:
	static/maps/layout/menu.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/layout/menu.js
 2016-11-30 12:08:46 -05:00
Nicola Soranzo 2d510fae98 Merge branch 'release_16.10' into dev 
Conflicts:
	static/maps/mvc/form/form-section.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/bundled/login.bundled.js.map
	static/scripts/mvc/form/form-section.js
 2016-11-30 15:31:26 +00:00
guerler e6c1e8e4e8 Rename label for history permissions 2016-11-29 21:13:32 -05:00
guerler e0a4171113 Attempt to rephrase user preference description for history permissions 2016-11-29 21:07:02 -05:00
guerler e4222b9ae6 Drop default tooltip 2016-11-29 19:21:42 -05:00
Dannon Baker be6a2f8132 Merge remote-tracking branch 'upstream/release_16.10' into fix_help_history 2016-11-29 17:00:20 -05:00
Martin Cech 72960de216 adjust menu tooltips to be oneliners 2016-11-29 15:51:45 -05:00
Dannon Baker 83e1392cf8 Standard styles inclusion in .less, more styling to match rounded edges and spacing. 2016-11-29 10:02:27 -05:00
Dannon Baker 29cf718723 Minor styling tweaks -- todo: swap from inline to class-based. 2016-11-28 14:59:41 -05:00
Dannon Baker ce320b66ea A bit of refactoring, handling of unavailable tools or tools with no help. Slight style changes. 2016-11-28 13:32:00 -05:00
guerler 6e1b26115e Hide communication server form if disabled 2016-11-23 14:36:24 -05:00
guerler 416b94f195 Avoid using navigate, reload page until routing has been established 2016-11-23 14:24:38 -05:00
guerler 16a60538d9 Fix history back, and forward 2016-11-23 13:55:03 -05:00
guerler 20d45ee62c Temporary routing, not best practice 2016-11-23 13:47:08 -05:00