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,076 Commits 63 Branches 243 Tags
91bc856cf5d8fe5a2d9be854bdebddf55d87a0a4
Commit Graph
8598 Commits
Author SHA1 Message Date
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
Dannon Baker 46faa14448 Merged in carlfeberhard/galaxy-central-api-v2 (pull request #637) 
Expand on Base, History, and HDA managers
 2015-01-21 16:32:27 -05:00
Daniel Blankenberg 4eb7869721 Fix for nice_size formatting of negative values. 2015-01-21 15:16:53 -05:00
Carl Eberhard a9a562d784 (Manually) merge central 2015-01-21 12:45:37 -05:00
Dannon Baker 4e03dc1629 Make error messages slightly more descriptive for ownership/accessibility failures. 2015-01-21 12:14:13 -05:00
Dannon Baker e604cf9e65 Merge from stable. 2015-01-21 12:06:15 -05:00
Dannon Baker df6a7d8b81 Merged in carlfeberhard/carlfeberhard-galaxy-central-stable/stable (pull request #642) 
[STABLE] Fix to allow anon users to view pages with histories
 2015-01-21 11:46:38 -05:00
Carl Eberhard c446be0d6d Fix to allow anon users to view pages with histories 2015-01-21 11:33:40 -05:00
Aysam Guerler b709d7c061 Update to_html function for text tool, generalize text fields, remove trailing tabs 2015-01-21 11:20:02 -05:00
Aysam Guerler 9ba84f4cc3 Generalize is_dynamic property, fix error validation for workflow tool form 2015-01-20 22:02:21 -05:00
Aysam Guerler 805b7cb5d0 Fix space_to_tab option and LibraryDatasetToolParameter 2015-01-18 16:20:04 -05:00
Dannon Baker e1dd5b515d Merged in guerler/guerler-galaxy-central/stable (pull request #639) 
Fix for LibraryDatasetToolParameter
 2015-01-18 07:39:43 -06:00
Martin Cech 2eb096ada4 Include a message where in API actually create jobs. 2015-01-16 22:33:41 +00:00
Aysam Guerler f5f4049dea Fix for LibraryDatasetToolParameter 2015-01-15 16:09:24 -05:00
Carl Eberhard b38d84d535 Push default_order_by down from class level var to instance method (class level relies on mapping being loaded before managers) 2015-01-15 14:01:28 -05:00
Carl Eberhard a9c2cb27e9 Merged galaxy/galaxy-central into default 2015-01-15 13:58:55 -05:00
John Chilton 3f1d9b0286 Skip extra wrapping around template-style macros. 
Cheetah wants these to be strings.
 2015-01-15 13:20:34 -05:00
John Chilton b1e9e7b971 Skip extra wrapping around template-style macros. 
Cheetah wants these to be strings.
 2015-01-15 13:20:34 -05:00
Carl Eberhard 4dbf06b63e Minor fixes and documentation 2015-01-15 13:19:48 -05:00
Carl Eberhard c98f989cd2 (Manually) merge central 2015-01-15 10:16:33 -05:00
John Chilton e832d74db2 Hide tools producing collections in workflow editor. 
Output collections will require significant overhaul to workflow editor logic.
 2015-01-15 09:30:00 -05:00
John Chilton facc29e8a9 Update workflow extraction backend for output collections. 2015-01-15 09:30:00 -05:00
John Chilton 08ab0c6376 A simpler way to configure output pairs (exploiting static structure). 
See example and comments in test/functional/tools/collection_creates_pair_from_type.xml.
 2015-01-15 09:30:00 -05:00