John Chilton
177f73fcdb
Fix lower timeout caught by @nsoranzo.
2015-11-11 14:43:51 +00:00
John Chilton
e4c9f06d3b
Attempt to fix timing out tests.
...
Continuation of work started by @nsoranzo here 92a152d89c
2015-11-11 11:37:21 +00:00
Dannon Baker
6953bdf704
Merge pull request #1059 from guerler/fix_message_000
...
[15.10] Fix parsing of message configuration
2015-11-11 10:03:24 -05:00
Dannon Baker
4f72178a95
Merge pull request #1038 from guerler/fix_imported_rerun_000
...
[15.10] Fix job rerun for imported histories
2015-11-11 09:52:58 -05:00
Martin Cech
c85b0d9b0b
Merge pull request #1060 from guerler/fix_assert_000
...
[15.10] Fix warning statement
2015-11-11 09:35:03 -05:00
guerler
6580701395
Fix parsing of message configuration
...
Fix default value
Add root to Galaxy object
2015-11-10 23:51:29 -05:00
guerler
b2723e7467
Disable invalid test case. Add validation criteria.
...
Fix comments
Fix comment
2015-11-10 15:36:55 -05:00
John Chilton
5603a96aec
Merge pull request #1054 from martenson/fix-datalib-hist-import
...
[15.10] Fix datalib hist import
2015-11-10 14:34:11 -05:00
guerler
b88864586c
Fix warning statement
2015-11-10 13:45:20 -05:00
Marius van den Beek
ad016460dc
Fix import of history datasets into library.
2015-11-10 12:25:51 -05:00
Marius van den Beek
36797b3195
Add changed static files.
2015-11-10 12:25:01 -05:00
guerler
a8147327af
Derive permission from job outputs
...
Remove history manager
Use dataset manager
2015-11-09 23:58:08 -05:00
John Chilton
7e6df4f46f
Merge pull request #1043 from jmchilton/release_15.10-forward-port
...
[15.10] Forward port 15.07 fix to 15.10.
2015-11-09 15:15:28 -05:00
John Chilton
57d6c9872c
Merge remote-tracking branch 'jmchilton/release_15.07' into release_15.10
2015-11-09 15:13:12 +00:00
guerler
fef1e548bb
Fix job permission handling
...
Catch unavailable history
Fix test
2015-11-06 23:10:08 -05:00
Nate Coraor
3b8edf6aeb
Merge pull request #1003 from dannon/remote_user_apache_fix
...
[15.10] Fix Remote User failures due to apache null headers.
2015-11-03 09:03:51 -05:00
Dannon Baker
d20677bb64
Fix Remote User failures due to apache null headers.
2015-10-29 12:09:45 -04:00
Nate Coraor
3b133d0d92
Merge pull request #917 from carlfeberhard/release_15.10
...
[15.10] UI, list of pairs collection creator: create regexp from filters for …
2015-10-28 13:26:19 -04:00
Martin Cech
7bcbf14093
Merge pull request #978 from dannon/graft_to_stable
...
[15.10] Fix grid bulk operations
2015-10-27 22:16:59 -04:00
Dannon Baker
dc9c2e4b75
Fix grid batch operations. This should correctly display and request confirmation for batch operations (such as delete a set of <GalaxyObjects> which is scary without a confirmation). It also fixes it to where grid bulk operations actually work in IE.
2015-10-22 16:06:30 -04:00
Dannon Baker
dab1ce3f03
Merge pull request #973 from natefoo/composite-history-import-export
...
[15.10] Fix for missing included files on history export and import
2015-10-22 12:57:43 -04:00
Vimalkumar Velayudhan
dfb59002ba
Use object store for imported history datasets and included files
...
(cherry picked from commit ea89dd8f14
2015-10-22 12:51:48 -04:00
Vimalkumar Velayudhan
57d0620292
Fix for missing included files on history export and import.
...
Notes:
If a history was exported previously, galaxy would just serve the cached version.
In that case, it is better to make some changes to the history for example, by re-running
the last job and then exporting it.
Export of histories that haven't been exported previously should work without problems.
(cherry picked from commit 9ea0fee48a
2015-10-22 12:51:42 -04:00
John Chilton
3fe148dd19
Merge pull request #970 from guerler/fix_history_extract_001
...
[15.10] Fix workflow extraction from history
2015-10-22 15:50:23 +01:00
Dannon Baker
82e96140a1
Merge pull request #967 from martenson/remove-reports-autorefresh
...
[15.10] remove the autorefresh on Reports app homepage
2015-10-22 08:11:55 -04:00
Dannon Baker
ab7ec7b3ab
Merge pull request #963 from blankenberg/gs_release_15.10
...
[15.10] Set <options sanitize="False"> for genomespace_importer.xml
2015-10-21 18:14:53 -04:00
guerler
8a0a445ec3
Fix workflow extraction from history
2015-10-21 17:36:44 -04:00
guerler
9d3893ed63
Undo commit, wrong branch
2015-10-21 17:26:33 -04:00
guerler
ee327702d7
Fix workflow extraction from history
...
Fix history extraction by returning value dictionary
Remove previous fix
2015-10-21 17:20:42 -04:00
Martin Cech
f3bfa2f56b
remove the autorefresh on Reports app
...
because of how long each page takes on Main the request for a subpage
would timeout because new autorefresh request would be automatically
issued
2015-10-21 14:22:41 -04:00
Eric Rasche
92666cdf66
Merge pull request #965 from dannon/login_req
...
[15.10] Fix endless redirect cycle when login is required
2015-10-21 12:02:50 -05:00
Dannon Baker
6f5aafe627
For require_login=True, redirect directly to login without showing empty (and broken) looking panels, and potentially hitting an endless reload cycle.
2015-10-21 12:19:00 -04:00
Daniel Blankenberg
a02e0f19c8
Set <options sanitize="False"> for genomespace_importer.xml
2015-10-21 11:33:45 -04:00
Dannon Baker
d53e13a4a9
Merge pull request #958 from martenson/fix-google-analytics
...
[15.10] Fix google analytics on the analysis page
2015-10-20 15:51:53 -04:00
Martin Cech
732b4f5b1f
fix missing analytics on the analysis page
...
we abandoned base_panels for this page so the script was missing
2015-10-20 15:11:22 -04:00
Dannon Baker
0f9067d244
Merge pull request #957 from guerler/fix_trackster_001
...
[15.10] Fixed missing trackster navigation pane (issue #946 )
2015-10-20 15:11:17 -04:00
guerler
dd2d6960db
Fixed missing trackster navigation pane (issue #946 )
...
Please enter the commit message for your changes. Lines starting
2015-10-20 14:53:33 -04:00
Daniel Blankenberg
b7dfeb4174
Merge pull request #934 from martenson/fix-showing-deleted-libs
...
[15.10] fix the filter on search results to not show the public deleted libs
2015-10-19 09:55:50 -04:00
Martin Cech
47ce939322
remove log
2015-10-16 13:14:44 -04:00
Martin Cech
15a8c594bd
fix the filter on deleted libraries to not show the public deleted libs
...
by default
2015-10-16 13:12:53 -04:00
Nate Coraor
11d17b3e7b
Merge pull request #920 from dannon/release_15.10
...
[15.10] IE11 history-stuck fix
2015-10-15 00:02:21 -04:00
Dannon Baker
a742198a36
Fixes for switching history (standard as well as multiview) when using IE11. Intentionally minimal fix for 15.10, more comprehensive refactoring+solution forthcoming for dev.
2015-10-14 21:57:23 -04:00
carlfeberhard
0911287df7
UI, list of pairs collection creator: create regexp from filters for name creation
2015-10-14 13:20:19 -04:00
John Chilton
cf59e8bd3c
Merge pull request #913 from blankenberg/cut_15.10
...
[15.10] Fix command quoting and remove size from text input for Cut tool.
2015-10-14 15:45:36 +01:00
Daniel Blankenberg
120ec61264
Fix command quoting and remove size from text input for Cut tool.
2015-10-14 10:11:21 -04:00
John Chilton
50c27ace2c
Merge pull request #885 from ericenns/fix_gsummary_in_release_15.07
...
[15.07] Fix gsummary in release 15.07
2015-10-14 14:57:36 +01:00
John Chilton
ee42fd0531
Merge pull request #910 from carlfeberhard/release_15.10
...
[15.10] Some minor fixes to the history UI
2015-10-14 14:47:01 +01:00
Eric Enns
0ec1b17794
Update list comprehension to go through headings instead of summary so that we output in the order we want.
2015-10-14 08:28:30 -05:00
carlfeberhard
03c7aae512
UI, histories: disable user-select on dataset selectors to prevent text select/highlight when using shift to select a range
2015-10-13 17:25:50 -04:00
carlfeberhard
41069e8ba6
UI, histories: fix/reverse order for drag and drop dataset copy
2015-10-13 17:15:56 -04:00
John Chilton