Bjoern Gruening
0dc2c95bd0
Merge branch 'feature/plugin-system' of https://github.com/bgruening/galaxy into feature/plugin-system
2016-10-13 23:28:18 +02:00
Bjoern Gruening
3aadd84b80
add case where no user is logged in
2016-10-13 23:28:02 +02:00
Björn Grüning
8694356ab7
Adopt help to the latest changes
2016-10-13 23:20:51 +02:00
Bjoern Gruening
f4dc38a54d
activate all plugins in the demo folder
2016-10-13 22:31:41 +02:00
Bjoern Gruening
b0b5157f36
merge
2016-10-13 22:29:52 +02:00
Bjoern Gruening
e220ed0970
use config_directories_from_setting
2016-10-13 22:28:40 +02:00
Evgeny Anatskiy
fb516d9387
remove blank line
2016-10-13 20:58:30 +02:00
Evgeny Anatskiy
3f8d45b388
PEP8
2016-10-13 20:56:54 +02:00
Evgeny Anatskiy
6894df3dcb
Merge branch 'feature/plugin-system' of github.com:bgruening/galaxy into feature/plugin-system
2016-10-13 20:52:43 +02:00
Bjoern Gruening
a676d6e823
allow multiple webhook dirs
2016-10-13 20:15:06 +02:00
Bjoern Gruening
773d85453f
move all plugins into a demo folder
2016-10-13 19:28:18 +02:00
Björn Grüning
8f5b54141d
code optimization, thanks Sam
2016-10-13 19:24:38 +02:00
Bjoern Gruening
6a62dbc91a
Merge branch 'dev' into feature/plugin-system
2016-10-13 19:18:13 +02:00
Björn Grüning
a231e240ed
remove obsolete code
2016-10-13 19:09:38 +02:00
Björn Grüning
290c48b16c
Change according to Aysam's review
2016-10-13 18:59:31 +02:00
Björn Grüning
b52d5be75b
Change according to Aysam's review
2016-10-13 18:54:21 +02:00
Björn Grüning
2d915a42f6
tense changes
2016-10-13 12:04:43 +02:00
Björn Grüning
4f89528c94
make activation procedure more clear
2016-10-12 23:04:59 +02:00
Evgeny Anatskiy
95d6990cf3
Update webhooks.rst
2016-10-12 22:30:12 +02:00
Evgeny Anatskiy
bc51dc3ec7
Update webhooks.rst
...
escape missing dependencies
2016-10-12 22:29:20 +02:00
Evgeny Anatskiy
0a15289d31
added missing dependencies check
2016-10-12 22:22:59 +02:00
Björn Grüning
d5dc39ab0f
Merge pull request #21 from joachimwolff/feature/plugin-system
...
Feature/plugin system
2016-10-12 22:14:11 +02:00
Joachim Wolff
af8a3f1104
Fixing errors
2016-10-12 17:20:01 +02:00
Joachim Wolff
fafeedc286
Fixing errors
2016-10-12 17:18:16 +02:00
Joachim Wolff
6684fd4e26
Fixing errors
2016-10-12 17:15:54 +02:00
Joachim Wolff
acd99f76fc
Fixing errors
2016-10-12 17:14:39 +02:00
Joachim Wolff
8030d2025d
Fixing errors
2016-10-12 17:08:35 +02:00
Joachim Wolff
76b9e004d2
Fixing errors
2016-10-12 17:06:27 +02:00
Joachim Wolff
d1737110bf
Fixing errors
2016-10-12 17:01:54 +02:00
Joachim Wolff
eb32ad229f
Fixed formatting errors
2016-10-12 16:55:37 +02:00
Joachim Wolff
95c1f18693
Fixed formatting errors
2016-10-12 16:52:35 +02:00
Joachim Wolff
f29b003a8c
Added images directory for webhooks documentation
2016-10-12 16:03:25 +02:00
Joachim Wolff
0ad7c99ea2
Extended the documentation of webhooks and added an images directory.
2016-10-12 16:02:40 +02:00
Björn Grüning
cd92be8802
Include a section about plugin dependencies.
2016-10-12 13:45:06 +02:00
Evgeny Anatskiy
5f9154a617
tiny fixes
2016-10-12 13:00:24 +02:00
Evgeny Anatskiy
812aca5b34
bug fix
2016-10-12 12:49:19 +02:00
Evgeny Anatskiy
cc36793cd0
- remove separate functions for adding masthead/history-menu plugins
...
- choose a random tool/workflow plugin only among active ones
2016-10-12 10:49:41 +02:00
Martin Cech
58d608b906
Merge pull request #3036 from blankenberg/fix-dep-shell-order
...
Fix dependency ordering broken in #2917 .
2016-10-11 14:28:59 -04:00
Daniel Blankenberg
2b9281a378
Fix dependency ordering broken in #2917 .
...
We will store dependencies in an OrderedDict, matching the order of `<requirements>`.
Fixes an issue where an R library was being sourced before R itself during shell command generation, the sourcing of R afterwards overwrote the `R_LIBS` env setting.
2016-10-11 13:10:50 -04:00
Nicola Soranzo
1156006733
Merge branch 'release_16.07' into dev
...
Conflicts:
lib/galaxy/tools/deps/__init__.py
2016-10-11 16:50:37 +01:00
Nicola Soranzo
3300a73c9d
Merge branch 'release_16.04' into release_16.07
2016-10-11 16:48:09 +01:00
Martin Cech
2adb98e58c
Merge pull request #3034 from mvdbeek/skip_python_install_travis
...
[16.04] Remove travis-ci python installation, since python2.7 is preinstalled…
2016-10-11 11:37:47 -04:00
Marius van den Beek
39fb030f13
Remove travis-ci python installation, since python2.7 is preinstalled on OSX images now
2016-10-11 17:07:23 +02:00
Daniel Blankenberg
6639a181df
Merge pull request #3025 from mvdbeek/cache_fix
...
Cache fix
2016-10-11 10:18:23 -04:00
John Chilton
191bae9a2b
Merge pull request #3028 from carlfeberhard/fix.tiff
...
Datatypes: include base classes in search by name
2016-10-10 22:25:58 -04:00
John Chilton
75d1f8496a
Merge pull request #3031 from nsoranzo/flake8-import-order
...
Fix import order and Python3 compatibility for most of test/
2016-10-10 21:21:21 -04:00
John Chilton
7d642c063f
Merge pull request #3032 from martenson/link-mulled-docs
...
add muled docs to admin index
2016-10-10 21:20:51 -04:00
Martin Cech
1a2d75fade
add muled docs to admin index
2016-10-10 20:54:26 -04:00
Martin Cech
7db241faa6
Merge pull request #2986 from jmchilton/mulled
...
Implement beta support for discovering mulled containers for dependencies.
2016-10-10 20:36:00 -04:00
Martin Cech
bcabbd8707
minor changes to mulled admin docs
2016-10-10 19:26:36 -04:00
Bjoern Gruening