opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-16 07:19:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,748 Commits 63 Branches 243 Tags
cc2cd0fb01ff1da8f0abc61641a1bbbdac022ea0
Commit Graph
9943 Commits
Author SHA1 Message Date
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
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 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
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
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
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 15618d6d22 Add some help text, hopefully *just* scary enough. 2015-07-27 14:23:04 -04: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 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 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 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 486ba9f23a Merge branch 'release_15.07' into dev 2015-07-24 10:23:52 -04:00
Dannon Baker 784e07c61f Merge branch 'release_15.05' into release_15.07 2015-07-24 10:23:26 -04:00
Dannon Baker 5788066a6d SCRIPT_NAME can be empty or not in the environment at all. This resolves http://dev.list.galaxyproject.org/NGINX-uWSGI-with-require-login-needs-uwsgi-param-SCRIPT-NAME-td4666901.html. Thanks to @dctrud and @ericenns for the help tracking it down. 2015-07-24 10:04:47 -04:00
Airistotal 31bed7f83e Changed zoom on graphs 
Changed graph title
Fixed flake errors
 2015-07-24 07:56:12 -05:00
Carl Eberhard 10638bad6a Merge remote-tracking branch 'upstream/dev' into managers 2015-07-23 15:05:35 -04:00
Carl Eberhard 504b9a263b Fix to 5a0aa61: use file_name and not permissions in testing additional keys via the serializer 2015-07-23 14:40:04 -04:00
Carl Eberhard 137b21283b Clean up on 5a0aa61 2015-07-23 14:01:48 -04:00
Carl Eberhard b8dac9f22f HDA API: return role ids associated with each hda permission if the user asking has manage permissions 2015-07-23 13:51:37 -04:00
Dannon Baker 0c29dd44a4 Tweak a few indentations to avoid kicking toplevel parameters into secondary indentation (so they don't get lost), taking logical (as in block) indentation into consideration over line length 2015-07-23 13:18:21 -04:00
Airistotal 3ccc76555a Fixed x axis moving around *hopefully* 2015-07-23 11:41:03 -05:00
Dannon Baker ef520569d5 Slight bracket adjustment 2015-07-23 11:30:35 -04:00
Dannon Baker b22e1d1329 Merge branch 'pephate' of https://github.com/carlfeberhard/galaxy into carlfeberhard-pephate 2015-07-23 11:29:13 -04:00
Carl Eberhard df952cb541 Fix to 19b2b7d for flubbed text attribute name 2015-07-23 11:02:07 -04:00
Carl Eberhard 19b2b7d7cc Clean up the formatting on mapping.py 2015-07-22 20:19:59 -04:00
Carl Eberhard 5a0aa6165a Merge branch 'managers.containers' into managers 2015-07-22 16:23:57 -04:00
Carl Eberhard 15b325673c History manager: incorporate container interface; add tests 2015-07-22 16:18:47 -04:00
Carl Eberhard 33181f5607 Histories: include owner annotations of hdas in published history display (HistoryManager._get_history_data) 2015-07-22 14:23:49 -04:00
Dannon Baker c77bff0b3c Merge 15.07 into dev 2015-07-22 13:47:07 -04:00
Dannon Baker 2f8580b931 Merge branch 'release_15.05' into release_15.07 2015-07-22 13:44:56 -04:00
Dannon Baker 558a590e18 Merge pull request #475 from blankenberg/custom_builds_objectstore_15.05 
[15.05] Fix for users creating Custom DBKeys when objectstore is being used.
 2015-07-22 13:41:04 -04:00
Dannon Baker a2c50db1fb Merge pull request #482 from carlfeberhard/copy-tags-annos 
API, HDAs: use manager copy when copying hdas between histories, pres…
 2015-07-22 13:06:03 -04:00
Dannon Baker ba7963da5e Merge release_15.07 into dev 2015-07-22 12:41:21 -04:00
Dannon Baker 488d42deb5 Merge branch 'release_15.05' into release_15.07 2015-07-22 12:37:26 -04:00
Dannon Baker 14f966ec44 Improve shortcut logic (in boolean ANDs, lookup first, calculate second...), cleanup flake8'ing that made this significantly LESS readable. 2015-07-22 11:49:51 -04:00
Airistotal 6cf4b1b136 Polished the appearance of the graphs 
Added functionality to ETA graphs
 2015-07-21 15:06:29 -05:00