Jelle Scholtalbers
74e551d34c
one less variable..
2018-01-18 15:47:40 +01:00
Jelle Scholtalbers
5071b69871
Add option to auto create user_library_import_dir directories upon user login.
2018-01-18 15:47:40 +01:00
Dannon Baker
a2f8ff21fd
Merge pull request #5299 from mvdbeek/improve_downgrade_message
...
Improve the migration message when having to downgrade the database
2018-01-11 12:34:11 -05:00
mvdbeek
58cda0ddd1
Slight wording tweak to migration message
2018-01-11 17:24:45 +01:00
Dannon Baker
79651a1080
Merge branch 'release_17.09' into dev
2018-01-11 09:56:24 -05:00
Nicola Soranzo
a81f3e4e8c
Merge branch 'release_17.05' into release_17.09
...
Conflicts:
lib/galaxy/workflow/modules.py
2018-01-11 15:42:37 +01:00
Dannon Baker
201c6ca881
Merge pull request #5298 from nsoranzo/release_17.09_backport_5233
...
[17.09] Backport #5233
2018-01-11 09:35:11 -05:00
mvdbeek
cf15574466
Improve the migration message when having to downgrade the database
2018-01-11 15:10:47 +01:00
NCEichner
27c9fff8b9
#5187
...
In order to get rid of the conda error described in #5187 I raised the version number beginning from which conda is allowed to use the '--offline' parameter again to "4.4"
2018-01-11 13:56:29 +01:00
Nicola Soranzo
db8721e6b8
Merge pull request #5297 from mvdbeek/db_shell_doc_update
...
Mention how to specify the config file location
2018-01-11 13:22:55 +01:00
Marius van den Beek
c7581f867d
Merge pull request #4977 from mmiladi/cm-datatype
...
add infernal-cm datatype
2018-01-11 12:02:53 +01:00
mvdbeek
5c4c25b63d
Mention how to specify the config file location
...
and how to do that when using ipython.
2018-01-11 10:42:44 +01:00
Martin Cech
812f5f5630
Merge pull request #5293 from dannon/prettier_1.10
...
Prettier 1.10 upgrade, supports Vue components now.
2018-01-10 13:31:41 -05:00
Martin Cech
40f9c6bb85
Merge pull request #5289 from dannon/dataset_edit_fix
...
[17.09] Fix dataset edit link
2018-01-10 13:01:06 -05:00
Dannon Baker
aa81ccf8ac
Merge pull request #5295 from selten/dev
...
#5291 fix link to HTTP getgalaxy.org
2018-01-10 12:18:30 -05:00
selten
f1f6a19a0f
#5291 Changed text, removed Admin/GetGalaxy
2018-01-10 18:15:17 +01:00
selten
15bc610cf0
#5291 fix link to HTTP getgalaxy.org
2018-01-10 18:12:32 +01:00
Dannon Baker
d79d2fa464
Client build.
2018-01-10 11:31:51 -05:00
Dannon Baker
9cddf804fa
Run client-format
2018-01-10 11:31:02 -05:00
Dannon Baker
e88706c282
Prettier now supports Vue SFCs
2018-01-10 11:30:41 -05:00
Dannon Baker
823d07d41a
Prettier upgrade to 1.10
2018-01-10 11:30:16 -05:00
Dannon Baker
242bf89891
Client build.
2018-01-10 10:54:09 -05:00
Dannon Baker
e2a662eb95
Client format
2018-01-10 10:52:14 -05:00
Dannon Baker
9c743f2b08
Merge remote-tracking branch 'istevenshen/dev' into dev
2018-01-10 10:51:20 -05:00
Dannon Baker
9aabaa6859
Build client
2018-01-10 08:43:05 -05:00
Dannon Baker
a19596e3ea
Fix dataset-model's edit url
2018-01-10 08:39:30 -05:00
steven
6e84fef4e0
Update locale.js
...
Add tool-panel and history-panel title translation.
2018-01-10 16:26:16 +08:00
Martin Cech
11f434af39
Merge pull request #5279 from dannon/dataset-error-cleanup
...
Dataset Error Interface Cleanup
2018-01-09 14:01:51 -05:00
Dannon Baker
14cb52ea9b
Merge pull request #5286 from mvdbeek/disable_cached_job_rerun_test
...
Mark rerun_with_use_cached_job as flakey
2018-01-09 13:20:08 -05:00
mvdbeek
da3e48faa5
Mark rerun_with_use_cached_job as flakey
...
Sometimes it does not pick up the equivalent job that should exist. Will need
to dig into this, but in the meantime we can allow the test to fail.
2018-01-09 15:53:22 +01:00
Martin Cech
00d7ec0b42
Merge pull request #5278 from dannon/dev-sourcemap-ff-compat
...
Fix dev sourcemap firefox compatibility
2018-01-08 18:55:46 -05:00
Dannon Baker
24cfb6b522
Client build.
2018-01-08 17:12:29 -05:00
Dannon Baker
5f3e11c02c
A few minor tweaks to page rendering on dataset error interface
2018-01-08 17:11:08 -05:00
Dannon Baker
38e725ff66
Template formatting.
2018-01-08 17:01:38 -05:00
Dannon Baker
489f0a84df
Cleanup in dataset-error.js, extra escaping.
2018-01-08 16:56:29 -05:00
Nicola Soranzo
ce4b1c9bd9
Merge pull request #5276 from martenson/biostar-config
...
add biostar configs to the sample
2018-01-08 21:59:20 +01:00
Dannon Baker
e694aee7a9
Formatting in webpack config.
2018-01-08 15:21:20 -05:00
Dannon Baker
c71ab1df2d
Fix firefox (worked in Chrome only) sourcemaps in dev mode.
2018-01-08 15:20:20 -05:00
Martin Cech
1cd217dd14
add biostar configs to the sample
2018-01-08 12:44:11 -05:00
Dannon Baker
d1ac0d9a56
Merge pull request #5274 from dannon/dev
...
Merge 17.09 -> dev.
2018-01-08 11:32:01 -05:00
Dannon Baker
1cabbb1e99
Merge 17.09 -> dev.
2018-01-08 09:29:27 -05:00
Dannon Baker
11f5dabeb9
Make client.
2018-01-08 09:28:05 -05:00
Dannon Baker
ac11236a0a
Client format.
2018-01-08 09:27:23 -05:00
Dannon Baker
6cecafa6f3
Merge remote-tracking branch 'upstream/release_17.09' into dev
2018-01-08 09:21:16 -05:00
John Chilton
60e0b3af62
Merge pull request #5273 from mvdbeek/sort_collection_from_file
...
Allow sorting collection elements based on file
2018-01-08 09:03:30 -05:00
mvdbeek
264b8680f3
Allow sorting collection elements based on file
...
Given a collection with element_identifiers:
```yml
element_1
element_2
```
we can arbitrarily re-order collection elements using a dataset
that specifies the new order, e.g
```
element_2
element_1
```
I think this nicely complements numeric and alphanumeric sorts that are
already possible with this tool.
2018-01-08 08:49:26 +01:00
Dannon Baker
087537a7ad
Merge pull request #5271 from guerler/fix_workflow_leak
...
[17.09] Only collect required attributes of linked steps
2018-01-05 17:47:56 -05:00
Milad Miladi
e73be6fe12
fix typo
2018-01-05 22:16:37 +01:00
Milad Miladi
a0750864a6
minor changes
2018-01-05 21:48:26 +01:00
Milad Miladi
8e4fbe7cf3
smaller cm test file
2018-01-05 21:40:39 +01:00
Jelle Scholtalbers