Commit Graph
9240 Commits
Author SHA1 Message Date
Dave Bouvier 6085b5f36e Pull in changes from stable branch. 2013-04-02 13:34:53 -04:00
Dave Bouvier 28487f8366 Enable scrolling for the left panel in the tool shed. Fix for determining if a repository dependency can be added to a container. 2013-04-02 13:34:25 -04:00
Dave Bouvier 9769304769 Fix for adding new entries to a tool data table that is already present in app.tool_data_tables. 2013-04-02 11:47:38 -04:00
Carl Eberhard fa89edf316 fix simple-galaxy.js util in browser test section 2013-04-02 10:50:56 -04:00
Dave Clements 2935ca8e42 New RST files describing Sphinx doc for tool shed changes. 2013-04-01 14:49:17 -07:00
Nate Coraor f04ac3a73f merge. 2013-04-01 14:32:24 -04:00
James Taylor 9fbdb560cf biostar: bugfix for display name of anonymous users 2013-04-01 14:01:56 -04:00
Nate Coraor 9633d87c78 Merge changes from stable branch. 2013-04-01 13:17:24 -04:00
Nate Coraor 3008447c20 Added tag release_2013.04.01 for changeset 75f09617abaa 2013-04-01 13:16:32 -04:00
Nate Coraor f4d7bd7419 Merge next-stable to stable for release. v13.04 2013-04-01 13:16:02 -04:00
Nate Coraor 599e009f47 Close the next-stable branch. 2013-04-01 12:35:49 -04:00
Carl Eberhard 1d56e06e3f api: history_contents.show, datasets.show add both types of display app links for consistency 2013-04-01 12:28:44 -04:00
Carl Eberhard 422281a252 pack scripts 2013-04-01 11:20:18 -04:00
Carl Eberhard 7549fea5d2 history panel: load display applications via ajax, update on force_history_refresh instead of reloading frame 2013-04-01 11:10:08 -04:00
Greg Von Kuster 8b4b76e3ac Merged next-stable 2013-03-29 13:03:58 -04:00
Greg Von Kuster cfcb8a9cb0 Fix missing import in tool shed's hg middleware controller. 2013-03-29 13:02:18 -04:00
Greg Von Kuster 73b83b1de1 Minor fixes to the questionable install_repository_revisions method in Galaxy's tool_shed_repositories API controller. 2013-03-29 11:22:10 -04:00
Greg Von Kuster 10878a7f54 Merged next-stable 2013-03-29 09:46:52 -04:00
Greg Von Kuster c4989eff48 Be less restrictive when loacting tool image help files for tools contained in repositories. 2013-03-29 09:46:19 -04:00
Dave Bouvier 592801097d Merged in next-stable. 2013-03-29 09:31:59 -04:00
Dave Bouvier eb89ce8365 Fix for server error when logging out of the tool shed. 2013-03-29 09:30:36 -04:00
Dave Bouvier 92aba536ab Merged in next-stable. 2013-03-29 08:58:14 -04:00
Jeremy Goecks d9a6548384 More import cleanup. 2013-03-28 18:58:30 -04:00
Jeremy Goecks 8e86b7ae61 Automated merge. 2013-03-28 18:45:12 -04:00
Jeremy Goecks 1b43c9895e Fix import *s in genome data providers. 2013-03-28 18:44:41 -04:00
Dannon Baker 25df1b355c Add default controller for browse_library --> now 'library'. 2013-03-28 18:44:10 -04:00
Greg Von Kuster 586e56c016 merging from next-stable 2013-03-28 16:32:59 -04:00
Greg Von Kuster 011e72a45b Fix for displaying tool shep images in for tools contained in repositories either in the tool shed or in Galaxy. 2013-03-28 16:32:32 -04:00
Carl Eberhard 02190d67cc merge stable 2013-03-28 16:24:16 -04:00
Carl Eberhard 81b5ff4e86 history: remove job subquery 2013-03-28 16:23:51 -04:00
James Taylor fb6a186b33 biostar: do not fill in question title 2013-03-28 12:40:44 -04:00
James Taylor 65950caabd biostar: open tool question link in new window/tab 2013-03-28 12:38:35 -04:00
Carl Eberhard b4827cef25 merge next-stable 2013-03-28 11:21:56 -04:00
Carl Eberhard 1f13e1017f UsesHDA: fix new-style display apps; documentation 2013-03-28 11:21:23 -04:00
James Taylor 44eb87b8c5 biostar: send encoded unique ID for user as username 2013-03-27 15:36:07 -04:00
Carl Eberhard fe9b34027f merge next-stable 2013-03-27 15:32:19 -04:00
Carl Eberhard 2c70f8c2bf history panel: only fetch force_history_refresh for running/queued HDAs 2013-03-27 15:31:41 -04:00
Dannon Baker 1c2ffbd58c Strip whitespace in jobs/__init__.py 2013-03-27 14:27:14 -04:00
Dannon Baker fd46d149ac Jobs: Fix job finish() to only set state after reconciling all outputs. This will allow us to eliminate force_history_refresh in the new history panel. Slight import cleanup. 2013-03-27 14:26:38 -04:00
Dannon Baker 8a747d1e65 Merged in galaxyp/galaxy-central-parallelism-refactorings (pull request #136)
select2 fixes for workflow running.
2013-03-27 11:53:18 -04:00
Dave Bouvier a1e6b1e8b2 Change install and test script to never set do_not_test = True. 2013-03-27 11:20:39 -04:00
Dave Bouvier cd6ab96243 Merged correctly this time. 2013-03-27 10:10:26 -04:00
Dave Bouvier 2ede098423 Merge next-stable. 2013-03-27 09:53:55 -04:00
Dave Bouvier f8e83f9aca Apply changes from pull request 146 by Roy Storey. Manually committed to exclude .hgflow mercurial extension configuration file. 2013-03-27 09:52:55 -04:00
Dave Bouvier 3d4db30d35 Apply changes from pull request 145 by Roy Storey. Manually committed to exclude .hgflow mercurial extension configuration file. 2013-03-27 09:50:32 -04:00
Nate Coraor cf11722fe9 merge next-stable. 2013-03-26 15:40:59 -04:00
Nate Coraor 4a132fb52c Fix setting of external metadata broken by refactoring job preparation. 2013-03-26 15:40:36 -04:00
Carl Eberhard 64f2bcc0b1 merge next-stable 2013-03-26 15:11:34 -04:00
Carl Eberhard 1f7504620a fix for exception handling in root.history 2013-03-26 15:10:42 -04:00
James Taylor 620263d96c biostar: pass slugified version of tool name as tag when sending to question form 2013-03-26 13:04:36 -04:00