Aysam Guerler
8b5397201b
ToolForm: Remove unused variable
2015-02-10 16:36:35 -05:00
Aysam Guerler
b8276046a0
ToolForm: Add select/unselect fields, update styles
2015-02-10 16:32:59 -05:00
Carl Eberhard
056aa25590
Fix to 109da69: remove debugging from index.mako
2015-02-10 15:12:46 -05:00
Dannon Baker
8accba13c7
Add reminder for why imports are done this way in s3objectstore for the next time I forget.
2015-02-10 15:06:12 -05:00
Dannon Baker
fb8d280528
Merge.
2015-02-10 14:42:26 -05:00
Dannon Baker
bdeded4f1f
Correctly use log.exception where appropriate in s3objectstore
2015-02-10 14:42:02 -05:00
Dannon Baker
a483d76f8c
Correct old reference to the wrong get_filename in s3objectstore.
2015-02-10 14:38:58 -05:00
Dannon Baker
1880f94c26
Style standardization in s3objectstore, a couple fixes.
2015-02-10 14:38:01 -05:00
Dannon Baker
863704d850
Followup to PR https://bitbucket.org/galaxy/galaxy-central/pull-request/658/ , only continue restarting in the case of a 1 return code from stop_daemon
2015-02-10 14:07:01 -05:00
Dannon Baker
d2c7f3fa47
Merged in jmchilton/galaxy-central-fork-1 (pull request #665 )
...
Add major version to Galaxy, expose via API.
2015-02-10 13:46:38 -05:00
Carl Eberhard
3ec57d0833
UI, utils: modularize (AMD) naturalSort and move to utils
2015-02-10 13:42:59 -05:00
Carl Eberhard
b3f39b8d5a
UI, paired collection creator: move to underscore fn binding, allow name param in createList, add qunit test and data
2015-02-10 13:38:30 -05:00
Dannon Baker
663ada2d0b
Merged in nsoranzo/galaxy-central (pull request #658 )
...
Don't abort restart if stop_daemon() failed.
2015-02-10 13:14:21 -05:00
John Chilton
5850683634
Change version format to YY.MM.
2015-02-10 10:04:19 -05:00
Dannon Baker
59d73090fe
Add more accurate sample for specifying a swift object store in object_store_conf.sample
2015-02-10 09:55:03 -05:00
Dannon Baker
61b64b6f26
Merge.
2015-02-10 09:51:33 -05:00
John Chilton
944905898b
Add major version to Galaxy, expose via API.
...
I suspect there are better ways to do this - but I thought I would put something out there we can argue about and hopefully get something in before the next release.
2015-02-10 09:50:13 -05:00
Dannon Baker
ec0c3be798
Merged in charles_hsu/galaxy-central/fix-multipart-upload-in-swift-backend (pull request #648 )
...
Fixed multipart-upload issue while use swift as object storage backend
2015-02-10 09:49:01 -05:00
Dannon Baker
51f32c8fc9
Actually use reduced redundancy only when specified.
2015-02-10 09:48:46 -05:00
Carl Eberhard
456a14d9df
UI, Paired collection creator: use scoped version of $.index instead of clumsy calculation
2015-02-09 18:09:27 -05:00
Carl Eberhard
ed32b63e50
UI, Paired collection creator: fix template function for 'Choose Filters'
2015-02-09 17:54:17 -05:00
Carl Eberhard
89d76ae929
UI: remove unused LazyDataLoader module
2015-02-09 17:47:30 -05:00
Carl Eberhard
f3aadb7e03
Fix to 389f0dcc1589: remove debugging code in index.mako
2015-02-09 17:42:13 -05:00
Carl Eberhard
eed33430d7
UI, Paired collection creator: when dragging within the paired section autoscroll the list when the mouse is within 'autoscrollDist' pixels of the top or bottom
2015-02-09 17:40:53 -05:00
Dannon Baker
61360355dd
Update objectstore sample to supply better defaults (and not host/port, which are unnecessary for s3).
2015-02-09 17:37:16 -05:00
Dannon Baker
27022833db
Merge.
2015-02-09 16:51:55 -05:00
Dannon Baker
18981016c6
Enable session timeout for tool_shed application (off by default, as with Galaxy).
2015-02-09 16:51:43 -05:00
Carl Eberhard
a49384046a
Merge
2015-02-09 16:41:04 -05:00
Carl Eberhard
13134f6269
UI, Paired collection creator: add rendered,rendered:inital events, add initial autopairing event
2015-02-09 16:40:18 -05:00
Martin Cech
b78858e0f9
load param as bool
2015-02-09 16:39:11 -05:00
Martin Cech
e7f754c2d5
minor adjustments to toolshed search
2015-02-09 16:29:31 -05:00
Dannon Baker
0f12fbdba5
Fix toolshed config/session timeout bug.
2015-02-09 16:17:47 -05:00
Dannon Baker
a101ee90ad
Merge.
2015-02-09 16:15:24 -05:00
Dannon Baker
1319fe5f58
More adjustments to queue kickoff to force webapps to initialize the connection prior to models; this (at least seems to, so far) fixes the concurrent mapper initialization race condition sqlalchemy issue.
2015-02-09 16:14:55 -05:00
Carl Eberhard
c6984b57d9
UI, History panel: show better feedback when 'Build List of Dataset Pairs' is clicked and no datasets are selected.
2015-02-09 15:53:26 -05:00
Carl Eberhard
5045c9c736
UI, Paired collection creator: create collection when enter is pressed in name field, remove debugging
2015-02-09 15:44:23 -05:00
Carl Eberhard
0f03877740
UI, Paired collection creator: fix pair template rendering bug
2015-02-09 15:30:16 -05:00
Dannon Baker
8215f03082
Merge.
2015-02-09 14:50:00 -05:00
Dannon Baker
b901d64866
Prevent last_action column from being populated with time.now() in the entire database and function correctly with null values here. Related bugfixes.
2015-02-09 14:49:35 -05:00
John Chilton
c26c8a86cb
When copying individual collections via the GUI - copy HDAs by default also.
...
We may want to be able to turn this off someday in certain scenarios - but usually this will result in less confusion for the user.
Doing this for whole histories also needs to be done - but it is a bit trickier (don't want the HDA copied twice). Might be better on the other side of eliminating the nessecity that these things have HIDs.
2015-02-09 13:29:45 -05:00
John Chilton
a6ed01ced8
Do not import argparse unconditionally in lib/galaxy/tools/deps/brew_exts.py.
2015-02-09 12:22:22 -05:00
Dannon Baker
fd2f5dce47
Merge.
2015-02-09 12:16:01 -05:00
Carl Eberhard
0e37a931ce
API, configuration: doc and clean up
2015-02-09 11:49:49 -05:00
Nate Coraor
19ce7033d3
Fix warning causing tool failure:
...
FutureWarning: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.
2015-02-09 11:43:26 -05:00
Dannon Baker
022143ecfb
Merge.
2015-02-09 11:36:45 -05:00
Carl Eberhard
7abdea1eaa
Managers, users: add tags_used and requests to user serializer to match info bootstrapped in galaxy.masthead.mako and galaxy_client_app.mako
2015-02-09 11:34:47 -05:00
Carl Eberhard
cb0428e94a
UI: better defesive prog in metrics logger
2015-02-09 11:18:11 -05:00
Carl Eberhard
2b8fca4a03
Visualizations, scatterplot: update handlebars since server runtime was updated
2015-02-09 11:02:31 -05:00
Nate Coraor
2e9a80b5e2
Remove escaping of quotes in the slurm cli status checks, I don't think they should be there (the format args should in fact be quoted).
2015-02-09 09:59:36 -06:00
Carl Eberhard
b1ecf26c5a
Dataproviders, column: allow filtering data by parsed column values (numeric, list, and string)
2015-02-09 10:36:43 -05:00
Aysam Guerler