guerler
403cd3ffca
Remove line wrap
2017-09-18 15:36:29 -04:00
guerler
8b517e7a03
Restore previous behavior
2017-09-18 15:31:16 -04:00
guerler
6af7661fb1
Drop manual string replacements, rely on split without parameters
2017-09-18 13:24:46 -04:00
guerler
2bcd46c723
Split by space instead of newline
2017-09-18 13:19:20 -04:00
guerler
0df4db5175
Replace spaces with newlines in multi url upload requests
2017-09-18 13:01:25 -04:00
Marius van den Beek
d9a8055368
Merge pull request #4636 from bgruening/find_file
...
remove .git and .hg from recursive file search
2017-09-18 14:21:40 +02:00
Nicola Soranzo
ef602e1d1a
Merge branch 'release_17.05' into dev
...
Conflicts:
lib/galaxy/datatypes/registry.py
lib/galaxy/jobs/__init__.py
lib/galaxy/jobs/command_factory.py
lib/galaxy/tools/actions/metadata.py
lib/galaxy/tools/evaluation.py
2017-09-18 11:09:00 +01:00
Eric Rasche
cfb0d06575
Exclude venv
2017-09-18 11:51:30 +02:00
Björn Grüning
5f635bda10
remove .git and .hg from recursive file search
2017-09-17 00:54:33 +02:00
Björn Grüning
8f337f692f
Merge pull request #4634 from anatskiy/custom_builds_fix
...
Fix data order in Custom Builds
2017-09-17 00:29:13 +02:00
Evgeny Anatskiy
f3c593fc59
fix column order in Custom Builds
2017-09-16 21:22:12 +02:00
Martin Cech
03d9a9c6fb
Merge pull request #4633 from mvdbeek/backport_registry_to_working_dir
...
[17.05] Backport #4600 : Write datatypes registry xml to working directory
2017-09-16 10:10:35 -04:00
John Chilton
13881bd264
Merge pull request #4625 from dannon/sanitize_whitelist_post
...
Swap sanitize whitelist form to use a post.
2017-09-16 07:12:35 -04:00
John Chilton
4c9cc67a8f
Merge pull request #4630 from VJalili/patch-4
...
Refactored a dataset variable to hda
2017-09-16 07:12:14 -04:00
John Chilton
6dbd47e661
Merge pull request #4632 from mvdbeek/fix_unintended_change
...
[BUG] Restore tool provided metadata path in setup_external_metdata
2017-09-16 07:10:33 -04:00
John Chilton
22b0542d0b
Merge pull request #4631 from martenson/disable-macos-travis
...
disable MacOS CI on travis
2017-09-16 07:08:48 -04:00
mvdbeek
e03ee53f3c
Remove references to integrated_datatypes_config
2017-09-16 11:38:42 +02:00
mvdbeek
432d7f4405
Restore correct metadata path in setup_external_metdata
...
This is a change I shouldn't have touched in
https://github.com/galaxyproject/galaxy/pull/4600
2017-09-16 09:02:33 +02:00
Martin Cech
0624a043a7
remove macos testing
2017-09-15 19:29:48 -04:00
Eric Rasche
153dfaa680
Merge pull request #4621 from martenson/library-sharing-roles
...
replace separators in library sharing role names
2017-09-16 01:29:22 +02:00
Nicola Soranzo
ea7b274437
Merge pull request #4629 from VJalili/patch-3
...
Updated function description and fix some typos
2017-09-15 23:17:05 +01:00
Vahid
2897992ab5
Refactored a dataset variable to hda
2017-09-15 14:47:32 -07:00
Vahid
604fdde424
typo
2017-09-15 14:38:09 -07:00
Vahid
3cca06a153
updated a comment.
2017-09-15 14:24:27 -07:00
Vahid
e3e26ae202
Updated a comment
2017-09-15 13:40:54 -07:00
Vahid
860f0ab6ba
Some function description updates
2017-09-15 13:20:25 -07:00
mvdbeek
2c77d386de
Write out registry once per job
2017-09-15 21:57:09 +02:00
Dannon Baker
fe88dab79b
Merge pull request #4628 from VJalili/patch-3
...
Typo fix
2017-09-15 15:25:36 -04:00
Vahid
69af37f653
Typo fix
2017-09-15 12:24:09 -07:00
Martin Cech
3b4bd3bb6f
make client
2017-09-15 11:54:49 -04:00
Martin Cech
7d2cd22722
replace colon and comma in role names since they are also separators
2017-09-15 11:49:25 -04:00
Martin Cech
540322e388
Merge pull request #4626 from dannon/loose_use
...
Misc. spelling/grammatical error fixes.
2017-09-15 11:48:20 -04:00
Nicola Soranzo
64af1bd9e9
Merge branch 'release_17.05' into dev
2017-09-15 16:02:15 +01:00
Dannon Baker
0ea6272f5d
More spelling.
2017-09-15 10:34:48 -04:00
Dannon Baker
7831b98898
Occurred, spelling.
2017-09-15 10:32:06 -04:00
Dannon Baker
d5aba7da15
Three more looses.
2017-09-15 10:28:58 -04:00
Dannon Baker
1c1ca9bd91
Fix loose->lose in help text for library dataset view.
2017-09-15 10:26:07 -04:00
Dannon Baker
97e8e36185
Merge pull request #4624 from nsoranzo/release_17.05_fix_scripts
...
[17.05] Backport of #4616
2017-09-15 10:20:49 -04:00
Dannon Baker
ac08449597
Swap sanitize whitelist form to use a post.
2017-09-15 10:18:10 -04:00
Nicola Soranzo
fc90aec7fe
Fix virtualenv activation for some scripts
...
In particular add virtualenv activation to extract_dataset_parts.sh
to fix the following error when running tools which use
`<parallelism>`:
```
Fatal error:
/tmp/tmpOoQ01k/job_working_directory/000/12/task_0:
Traceback (most recent call last):
File "./scripts/extract_dataset_part.py", line 17, in <module>
import galaxy.model.mapping # need to load this before we unpickle, in order to setup properties assigned by the mappers
File "/opt/galaxyproject_galaxy_release_17.05/lib/galaxy/model/__init__.py", line 20, in <module>
from six import string_types
ModuleNotFoundError: No module named 'six'
```
2017-09-15 14:07:37 +01:00
Eric Rasche
c5ff555ec4
Merge pull request #4611 from martenson/respect-email-exposure
...
respect expose_user_email configuration in datalibraries permissions list
2017-09-15 14:17:39 +02:00
Eric Rasche
c677621481
Merge pull request #4619 from guerler/fix_group_label
...
Fix group creation label in admin panel and checkbox name
2017-09-15 10:56:52 +02:00
Marius van den Beek
90eed104f0
Merge pull request #4616 from nsoranzo/fix_scripts
...
Fix virtualenv activation for some scripts
2017-09-15 08:58:25 +02:00
guerler
d247d698a2
Fix auto create checkbox name
2017-09-14 17:20:53 -04:00
guerler
d6ae9127eb
Fix group creation label in admin panel
2017-09-14 17:14:22 -04:00
Dannon Baker
8b9e91310f
Merge branch 'release_17.05' into dev
2017-09-14 15:17:10 -04:00
Dannon Baker
83b363d520
Merge branch 'release_17.01' into release_17.05
2017-09-14 15:10:07 -04:00
Nicola Soranzo
e1be66312b
Fix virtualenv activation for some scripts
...
In particular add virtualenv activation to extract_dataset_parts.sh
to fix the following error when running tools which use
`<parallelism>`:
```
Fatal error:
/tmp/tmpOoQ01k/job_working_directory/000/12/task_0:
Traceback (most recent call last):
File "./scripts/extract_dataset_part.py", line 17, in <module>
import galaxy.model.mapping # need to load this before we unpickle, in order to setup properties assigned by the mappers
File "/opt/galaxyproject_galaxy_release_17.05/lib/galaxy/model/__init__.py", line 20, in <module>
from six import string_types
ModuleNotFoundError: No module named 'six'
```
2017-09-14 19:58:06 +01:00
Dannon Baker
a9facdc756
Merge branch 'release_16.10' into release_17.01
2017-09-14 14:54:27 -04:00
John Chilton
14ceb6d91b
Merge pull request #4615 from dannon/release_16.10_backport2
...
[16.10] Allow fetchMore to actually specify a 0 offset when intentional, fixes multiview
2017-09-14 14:10:15 -04:00
guerler