Commit Graph
42073 Commits
Author SHA1 Message Date
guerler 1ece93fe38 Use const for visualizations variable in dataset edit view element 2019-08-14 16:51:31 -04:00
Peter Selten ebb4572bd8 Update to set the extension by default 2019-08-14 20:54:17 +02:00
John Chilton 47d46c626e Merge pull request #8452 from erasche/faster-quota
Replace in-python quota calc with a SQL query
2019-08-14 14:40:12 -04:00
John Chilton 404bf6bbc0 Merge pull request #8458 from bgruening/pgp
add pgp and osw filetype as used in OpenSWATH experiments
2019-08-14 14:38:52 -04:00
Nicola Soranzo 561f3cd377 Add pointer to client/README.md (#8457)
Add pointer to client/README.md
2019-08-14 17:08:52 +01:00
Helena Rasche 16c13ad62e refresh session 2019-08-14 16:41:10 +02:00
Daniel Blankenberg 8444da7bc7 Merge pull request #8 from bgruening/it
migrating a few more interactive environments to interactive tools
2019-08-14 10:32:24 -04:00
Helena Rasche 887aae2ab3 Refactor into model 2019-08-14 16:15:49 +02:00
Björn Grüning 851ef559b3 add osw datatype 2019-08-14 16:11:02 +02:00
Daniel Blankenberg 6953bfae06 update migration script version 2019-08-14 10:09:23 -04:00
Daniel Blankenberg 764e28f812 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-08-14 10:08:44 -04:00
Daniel Blankenberg 0ba4ca5175 cleanup comments 2019-08-14 10:08:40 -04:00
Helena Rasche 58f4f65a4a new method 2019-08-14 16:08:04 +02:00
Helena Rasche c501c092a5 replace both with pgcalc 2019-08-14 16:07:24 +02:00
Björn Grüning d3a578b71a add pgp filetype as used in OpenSWATH experiments 2019-08-14 16:01:57 +02:00
Dannon Baker 877bd322d6 Add pointer to client/README.md to address 'https://github.com/galaxyproject/galaxy/commit/8bb2b6bfbcac89910ec6b5cc58e23243571ab879#commitcomment-34259049' 2019-08-14 09:59:55 -04:00
Helena Rasche 52bd23cacf revert changes to original, move to pgcalc 2019-08-14 15:55:51 +02:00
Marius van den Beek a86ed8a064 Merge pull request #8414 from jmchilton/record_job_tool_version
Record Galaxy version job was created with.
2019-08-14 08:11:38 -04:00
Marius van den Beek 0c3e21fdd7 Merge pull request #8455 from selten/gitlab-error-reporting-update
Implement #8183 for further GitLab integration.
2019-08-14 07:30:53 -04:00
Björn Grüning c34fce8a5e add some more comments 2019-08-14 09:36:27 +02:00
Björn Grüning 2fd4c13aba enhance documentation for developers 2019-08-14 09:32:05 +02:00
Bjoern Gruening 24c7c76379 remove complexity from ipython wrapper, not needed for this version 2019-08-14 09:15:09 +02:00
selten f14be51cfb Change for linting 2019-08-14 00:13:42 +02:00
Peter Selten 5a5fac6374 Add file extensions when downloading from data libraries. Both in the compressed and uncompressed datasets. 2019-08-13 23:57:53 +02:00
Peter Selten 72678dfb18 Implement #8183 for further GitLab integration. Allow toggling of the proxy functionality, add automatic assignment to the last person that commited to the repository. 2019-08-13 22:17:40 +02:00
Daniel Blankenberg 5ed5ff6d49 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-08-13 14:47:53 -04:00
Daniel Blankenberg 0e5892c5ca Update galaxy.yml.realtime example with outputs_to_working_directory: true 2019-08-13 14:45:39 -04:00
guerler 454cca05b8 Disable visualizations button for history datasets if visualizations are disabled in configuration 2019-08-13 11:21:59 -04:00
Helena Rasche 7830c54a60 rewrite query again 2019-08-13 16:20:02 +02:00
Björn Grüning 01c23ce705 Merge pull request #75 from abretaud/it_askoko
Fixes for askomics IT
2019-08-13 15:53:40 +02:00
Anthony Bretaudeau 22edfcc11e fixes for askomics IT 2019-08-13 15:07:11 +02:00
Helena Rasche 686e912097 fix linting errors 2019-08-13 14:40:49 +02:00
Helena Rasche 4976e77957 Replace in-python quota calc with a SQL query 2019-08-13 14:10:47 +02:00
Marius van den Beek 5ebfb6a4da Merge pull request #8451 from bernt-matthias/topic/fix-drmaa-memstatement
fix memory statement for drmaa (SGE/UNIVA)
2019-08-13 07:51:43 -04:00
M Bernt d303bf72dc fix memory statement for drmaa (SGE/UNIVA)
The environment variable `SGE_HGR_h_vmem` turns out to be the
total memory for all slots (cores).

In the original implementation I was unfortunatelly tricked by the
fact that the ressouce request parameter `-l h_vmem` needs to be
specified per core.
2019-08-13 11:00:35 +02:00
Björn Grüning 986b0baa71 Merge pull request #73 from blankenberg/patch-1
Fix websockets in interactive_tool_bam_iobio.xml
2019-08-13 08:48:48 +02:00
Daniel Blankenberg 5655ace083 Fix websockets in interactive_tool_bam_iobio.xml 2019-08-12 15:41:23 -04:00
guerler 626fbdd5b3 Fix comment in config schema for visualization visibility option 2019-08-12 15:22:47 -04:00
guerler 21e347f911 Hide saved visualizations grid if visualizations visibile config is set to false 2019-08-12 15:16:43 -04:00
guerler 40ea2f695f Add configuration option to hide visualizations from masthead 2019-08-12 15:12:19 -04:00
Björn Grüning 717d94997c Merge pull request #72 from blankenberg/patch-1
Add API_KEY, GALAXY_URL, and fix HISTORY_ID envars
2019-08-12 19:04:28 +02:00
Daniel Blankenberg 29e1173f6c Add API_KEY, GALAXY_URL, and fix HISTORY_ID envars
in interactive_tool_juypter_notebook.xml
2019-08-12 12:23:38 -04:00
Martin Cech 1ba763aea7 add Matthias Bernt to committers group 2019-08-12 08:32:14 -04:00
Bjoern Gruening 3689d857df some small changes 2019-08-11 21:28:04 +02:00
Bjoern Gruening 04b1e8f79c add a bunch of ITs 2019-08-11 16:42:49 +02:00
Bjoern Gruening b7c6b1896c fix lint 2019-08-09 22:18:19 +02:00
Bjoern Gruening bc61761dc1 Add assert for n_lines. This can be used in tool and workflow testing. 2019-08-09 22:00:17 +02:00
John Chilton 04f196439d Merge pull request #8431 from natefoo/fix-manage-db
Fix config file finding for the manage_db script
2019-08-09 14:56:53 -04:00
John Chilton 19134aeece Merge remote-tracking branch 'galaxyproject/dev' into installable-config 2019-08-09 13:52:29 -04:00
John Chilton 95b2256664 Lint fix. 2019-08-09 13:52:13 -04:00