18748 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Airistotal	cc2cd0fb01	Merge branch 'dev' of https://github.com/Airistotal/galaxy into Reports_homepage ... Conflicts: static/scripts/reports_webapp/run_stats.js	2015-07-29 16:12:31 -05:00
Daniel	e3b1302606	Merge pull request #3 from dannon/Airistotal-Reports_homepage ... Several fixes necessary for merging.	2015-07-29 16:07:25 -05:00
Airistotal	8d5ef14d4f	Changed spacing	2015-07-29 16:06:23 -05:00
Dannon Baker	951ac2d3d8	Fix incorrect absolute paths in reports styles.	2015-07-29 16:08:21 -04:00
Dannon Baker	29d7f8be7a	trim whitespace	2015-07-29 16:04:58 -04:00
Dannon Baker	8ae3406f41	Fix inclusion of new reports charts javascript file to not use a static path.	2015-07-29 16:01:57 -04:00
Dannon Baker	09f0aaf371	Run grunt.	2015-07-29 15:53:31 -04:00
Dannon Baker	9c3be3efb4	Merge branch 'Reports_homepage' of https://github.com/Airistotal/galaxy into Airistotal-Reports_homepage	2015-07-29 15:46:06 -04:00
Dannon Baker	96836156fe	Merge pull request #516 from carlfeberhard/fix.taggable-anon ... Managers, taggable: make anon set_tags fail silently	2015-07-29 14:26:44 -04:00
Björn Grüning	c62db51873	Merge pull request #517 from blankenberg/multi-uninstall ... Allow uninstalling multiple toolshed repositories at a time …	2015-07-29 16:27:35 +02:00
carlfeberhard	2ddb97091d	Merge pull request #510 from dannon/whitelist_tools ... Whitelist for tools	2015-07-28 16:44:40 -04:00
Daniel Blankenberg	1e6c49b277	Allow uninstalling multiple toolshed repositories at a time within the Galaxy UI, using checkboxes with grid multi-actions.	2015-07-28 16:22:16 -04:00
Dannon Baker	16928704e6	Merge pull request #515 from nsoranzo/dev ... Restore line wrongly removed in fa7c5c5 and again in 9805294 .	2015-07-28 15:32:27 -04:00
Carl Eberhard	1c727a4b6b	Managers, taggable: make anon set_tags fail silently	2015-07-28 15:24:02 -04:00
Dannon Baker	48a2566305	Update commentary per @nsoranzo's suggestion, thanks	2015-07-28 15:19:30 -04:00
Nicola Soranzo	adaf150c0f	Restore line wrongly removed in fa7c5c531e and again in 9805294f97 . Reorder imports.	2015-07-28 20:17:10 +01:00
Airistotal	c1fb360437	Refactored out dead code	2015-07-28 11:58:08 -05:00
Airistotal	3d335f810c	Fix for annoying flake error #226	2015-07-28 11:25:45 -05:00
Airistotal	6849970cec	Automatic x axis creation was inconsistent, changed to manual x axis creation	2015-07-28 11:20:12 -05:00
Eric Rasche	0ff497cdb9	Merge pull request #512 from nitesh1989/dev ... Fix: rdata extension type	2015-07-28 16:01:38 +01:00
nitesh1989	484099d41f	Fix: Typo the other way. Supposed to be "RData" ... Ref: https://stat.ethz.ch/R-manual/R-devel/library/base/html/save.html	2015-07-28 10:28:42 -04:00
nitesh1989	e382378140	Fix: rdata extension type	2015-07-28 10:16:10 -04:00
Dannon Baker	0de044dc09	Force sanitization even when whitelisted for imported datasets, since we can't necessarily trust the archive contents.	2015-07-27 16:30:57 -04:00
Eric Rasche	e8b267b931	Merge pull request #509 from guerler/fix_numpad_000 ... Add numpad support to integer inputs	2015-07-27 15:10:17 -05:00
guerler	638ef77b3c	Add numpad key codes to ui-slider element	2015-07-27 15:33:53 -04:00
Dannon Baker	abe5571d43	Kick message to control queue to reload sanitize whitelist in multiprocess mode.	2015-07-27 14:39:07 -04:00
Dannon Baker	5280393708	Slight tweak to message to bold sanitize_all_html	2015-07-27 14:36:04 -04:00
Dannon Baker	15618d6d22	Add some help text, hopefully *just* scary enough.	2015-07-27 14:23:04 -04:00
Eric Rasche	c35a5f57dc	Merge pull request #500 from carlfeberhard/int_envs.seperate ... Interactive environments: allow their own static base url	2015-07-27 12:12:52 -05:00
Carl Eberhard	054b4d58c5	Interactive environments: correct app_root	2015-07-27 13:07:15 -04:00
Dannon Baker	8d47c0b273	Coerce incoming param(s) to a list (otherwise python will iterate over string and not actually add any tools to the list, obviously)	2015-07-27 12:55:50 -04:00
Dannon Baker	58766abe64	Use config-specified file instead of old hardcoded one	2015-07-27 12:49:13 -04:00
Carl Eberhard	aa8643014a	Interactive environments: move static base url from 'visualizations' to 'interactive_environments' for int env plugins	2015-07-27 12:36:20 -04:00
Dannon Baker	674fb8c48b	Forgot the template...	2015-07-27 12:14:06 -04:00
Dannon Baker	e3bbae0e2a	Update galaxy.ini.sample for the swap from list in galaxy.ini to a separate file.	2015-07-27 12:07:09 -04:00
Dannon Baker	29ce33ef34	Swap from list in universe to a separate config file, add simple UI for managing	2015-07-27 11:46:37 -04:00
John Chilton	a0fc6e3acb	Merge pull request #491 from carlfeberhard/ui.remove-select-button ... History UI: do not render selector when there are no datasets to select	2015-07-27 15:52:09 +01:00
John Chilton	1b2fbad49f	Merge pull request #496 from carlfeberhard/managers ... Managers: containers and hda permissions	2015-07-27 13:56:05 +01:00
Dannon Baker	4afc756c61	Simplest possible tool whitelist implementation	2015-07-27 08:19:39 -04:00
Dannon Baker	18b058a496	Merge branch 'release_15.07' into dev	2015-07-24 19:18:08 -04:00
Dannon Baker	349378a543	Adjust comment for flake8	2015-07-24 19:17:41 -04:00
jgoecks	80f4bd7f3f	Fix BBI data provider underflow bug when computing standard deviation	2015-07-24 19:17:30 -04:00
Dannon Baker	54a1de7758	Merge pull request #499 from jgoecks/bbi-sd-underflow-bug ... Fix BBI data provider underflow bug when computing standard deviation	2015-07-24 18:30:04 -04:00
Jeremy Goecks	59a3804f09	Merge pull request #1 from dannon/bbi-sd-underflow-bug ... Adjust comment for flake8	2015-07-24 18:21:04 -04:00
Dannon Baker	28a544c50b	Adjust comment for flake8	2015-07-24 17:23:44 -04:00
jgoecks	e36d1c2e0e	Fix BBI data provider underflow bug when computing standard deviation	2015-07-24 16:45:18 -04:00
Dannon Baker	24360176bd	Merge.	2015-07-24 15:30:22 -04:00
Dannon Baker	1c04e1498b	Merge pull request #490 from carlfeberhard/release_15.07 ... [15.07] Histories: include owner annotations of hdas in published history dis…	2015-07-24 15:28:05 -04:00
Dannon Baker	b5e7e1e615	Merge branch 'master' into dev	2015-07-24 10:39:30 -04:00
Dannon Baker	7144ed8f72	Merge branch 'release_15.05'	2015-07-24 10:37:18 -04:00