opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,154 Commits 63 Branches 243 Tags
2c6f5cb5e92b548a50249e2ee9ee04a9ee76e686
Commit Graph
8626 Commits
Author SHA1 Message Date
Martin Cech 2c6f5cb5e9 add pretty_print_time_interval to make time intervals more readable 2015-01-27 18:13:50 -05:00
Martin Cech 2a405ef0e3 Merge 2015-01-27 17:19:07 -05:00
Martin Cech fd8a7da910 adjust schema, start dynamic scoring 2015-01-27 17:15:18 -05:00
Dannon Baker 3f623e31b1 Merge from stable. 2015-01-27 15:34:24 -05:00
Carl Eberhard 43b2f4ffa1 Remove paragraph tags from history/rename feedback messages 2015-01-27 14:32:16 -05:00
Martin Cech ad9ea20787 query parser experiments, better formatted time delta 2015-01-26 19:45:33 -05:00
Daniel Blankenberg 30f1815658 Load genomes list from data tables for visualizations. Based off of Pull Request: https://bitbucket.org/galaxy/galaxy-central/pull-request/601/load-genomes-list-from-data-tables-for/diff 2015-01-26 15:11:06 -05:00
Martin Cech 05e9ea637e initial version of TS search API and Index builder script 
beware: always returns jsonp for now
 2015-01-26 13:08:16 -05:00
Dannon Baker 863d5d1720 One more path permission increase for admins under remote_user. 2015-01-26 10:43:02 -05:00
Dannon Baker 61a798a1db Allow admin users to change user information (like email addresses) when using remote_auth; otherwise should a user email address change you had to manually edit the database. 2015-01-26 08:58:29 -05:00
John Chilton 663341e4cc Toolbox: Watch even empty directories if they are explicitly tool_dir specified. 2015-01-25 19:18:53 -05:00
John Chilton b5533cfe0e Merged in BjoernGruening/galaxy-central-1/compressed_upload (pull request #630) 
Add CompressedArchive as datatype and do not uncomress it during upload.
 2015-01-23 14:13:25 -05:00
Carl Eberhard a27e2a96d2 Fix Ratable to add emtpy stubs 2015-01-23 13:15:59 -05:00
Carl Eberhard c1a0e03d55 Managers: cleanup and removal of my awesome ascii art 2015-01-23 13:09:42 -05:00
Carl Eberhard b224959469 Fix to replace get_dataset in visualization registry ResourceParser with hda_manager.get_accessible 2015-01-23 12:44:46 -05:00
John Chilton 2d227d2daf Merged in BjoernGruening/galaxy-central-1/snpeff_datatype (pull request #640) 
Add SnpEff datatypes
 2015-01-23 12:12:43 -05:00
John Chilton c64c1bac0c Merged in BjoernGruening/galaxy-central-1/toolshed_blacklist_additions (pull request #627) 
Add planemo test file to tool shed upoad blacklist.
 2015-01-23 12:11:03 -05:00
Aysam Guerler 178666baeb ToolForm: Fix optional dataset parameters, fix inconsistencies in parameter handling 2015-01-23 12:04:50 -05:00
Dannon Baker cdabbe2af8 Add missing parameter in provenance controller. 2015-01-23 08:13:45 -05:00
Dannon Baker 51043f8130 Resolve scope issues in visualization controller, add missing imports and organize. 2015-01-22 18:24:25 -05:00
Dannon Baker e6d877196a Remove a trailing semicolon in the page controller. 2015-01-22 18:19:08 -05:00
Dannon Baker 2bf6763dc6 misc cleanup, pep8 in page controller 2015-01-22 18:18:14 -05:00
Dannon Baker 91bc856cf5 Remove cruft in history controller. 2015-01-22 18:07:19 -05:00
Dannon Baker cd585d91c9 Import cleanup in history controller. 2015-01-22 18:05:11 -05:00
Dannon Baker f869d82fb4 Merge. 2015-01-22 17:57:15 -05:00
Dannon Baker b0774dafc3 Cleanup/pep8 in imp_exp. 2015-01-22 17:57:04 -05:00
Carl Eberhard 1a48c1953e Fix: remove debugging statement 2015-01-22 17:55:14 -05:00
Dannon Baker dafc96e135 Import cleanup in visualizations manager. 2015-01-22 17:46:00 -05:00
Dannon Baker a2e6b4504a Fix set_slug method in sharable manager / scope issues. 2015-01-22 17:34:40 -05:00
Carl Eberhard fe8bb01b78 Sharable managers: Generate slug on user share only if needed 2015-01-22 17:33:02 -05:00
Dannon Baker 421462bc76 pep8 lddamanager 2015-01-22 17:31:20 -05:00
Dannon Baker 950a67d7ed Remove unused imports from pages manager, minor formatting. 2015-01-22 17:28:43 -05:00
Dannon Baker e11ceb615e Fix missing required import in ldda manager. 2015-01-22 17:22:39 -05:00
Dannon Baker 396c491d96 Fix several bugs in histories manager. 2015-01-22 17:14:20 -05:00
Dannon Baker aeb22db5ba Fix import error of collections_util in histories manager. 2015-01-22 17:03:06 -05:00
Dannon Baker d688cc208f Prevent redefinition of role in datasets manager. Harmless now, but dangerous laterhg st 2015-01-22 16:57:45 -05:00
Dannon Baker 8cf4fe4314 Log was undefined here in hda manager, would have blown up. 2015-01-22 16:54:53 -05:00
Dannon Baker 00f3876619 Import cleanup, organization in collections manager. 2015-01-22 16:52:27 -05:00
Dannon Baker ad4cd862ec Prevent redefinition of model, cleanup/pep8 in annotatable manager. 2015-01-22 16:51:14 -05:00
Dannon Baker 89abb15e05 cleanup, pep8 base manager 2015-01-22 16:48:26 -05:00
Dannon Baker ed47dfc605 Pep8 api/datasets. 2015-01-22 16:34:19 -05:00
Dannon Baker c3385a26d8 Fix error in datasets API/serializer 2015-01-22 16:29:45 -05:00
Dannon Baker 03a67d52ba Fix error in managers collections_util. 2015-01-22 15:39:56 -05:00
Carl Eberhard e4e79f6b84 Merge 2015-01-22 14:51:09 -05:00
Carl Eberhard 8d844b16ec Fix to annotatable: setting/deserializing the annotation to None deletes the annotation for the current user 2015-01-22 14:47:38 -05:00
Dannon Baker 587a488724 Correctly pass flush through to the hdamanager's purge method. 2015-01-22 14:45:50 -05:00
Dannon Baker 2ec1808cc5 Add two missing orm imports for history import/export. 2015-01-22 14:44:19 -05:00
Dannon Baker 2bfeae7077 Slightly more comprehensive fix for default_order_by; there's no reason to have two methods for setting ordering here. 2015-01-22 12:23:05 -05:00
Daniel Blankenberg d50eb6a69e Fix for ModelManager._apply_order_by when using default_order_by. 2015-01-22 12:00:08 -05:00
Dannon Baker 4a7d2e7ad7 Fix workflow step tracking migration downgrade -- previously blew up because there are no TABLES 2015-01-21 18:22:58 -05:00