Dannon Baker
928ad29493
Localize displayed titles.
2017-09-09 14:52:58 -04:00
Dannon Baker
f83188e7f3
Normal grid title propagation.
2017-09-08 16:20:50 -04:00
Dannon Baker
935f25aa32
Titles for abstract grids w/ plural set.
2017-09-08 15:49:22 -04:00
Dannon Baker
91eb849500
Use 'Galaxy / Brand' consistent styling instead of 'Galaxy | Brand'
2017-09-08 14:22:12 -04:00
Dannon Baker
9a0506c5c0
Include Galaxy brand in titles.
2017-09-08 14:20:17 -04:00
Dannon Baker
2cb8a28f7b
Rebuild.
2017-09-08 12:31:54 -04:00
Dannon Baker
6b2277e37d
Automatically append 'Galaxy | ' to title instead of requiring it for all view titles.
2017-09-08 12:29:09 -04:00
Dannon Baker
84de84294c
History List, Tours, and User Preferences titles
2017-09-08 12:24:46 -04:00
Dannon Baker
9a66adb4fe
Standard (for now) paren spacing.
2017-09-08 11:11:15 -04:00
Dannon Baker
82267855ed
Support for applying window title on display() of views.
2017-09-08 11:08:53 -04:00
Martin Cech
f623613a39
Merge pull request #4577 from jmchilton/selenium_fixes_22
...
Fix logic error in new published histories sort by owner test.
2017-09-07 16:58:34 -04:00
John Chilton
5e179df2a8
Fix logic error in new published histories sort by owner test.
...
I switched to randomly generated usernames without actually ensure the random usernames would be generated in the same lexiographic order - that wasn't super bright of me. That sort by owner test should pass as frequently as the other tests in that test case class now.
2017-09-07 16:35:44 -04:00
Dannon Baker
a8df8729b8
Merge pull request #4519 from shiltemann/biom2_datatype
...
add biom2 datatype
2017-09-07 15:42:54 -04:00
Marius van den Beek
b3f0f36c89
Merge pull request #4574 from dannon/history_options_fixes
...
Fix delete option in history menu
2017-09-07 21:29:28 +02:00
Dannon Baker
31043698d0
Fix purge option in history menu. Now delete&purge use modern models/handling.
2017-09-07 13:30:53 -04:00
Dannon Baker
65b2fe8a4a
Fix delete option in history menu.
2017-09-07 13:23:21 -04:00
shiltemann
2615094597
Revert "remove unused variable"
...
This reverts commit 4119caf9b7
2017-09-07 18:22:58 +02:00
shiltemann
d4cf4bff4f
PEP8 fix
2017-09-07 18:11:00 +02:00
Saskia Hiltemann
8f3c65c59e
use version 2.7.1 of h5py
2017-09-07 17:39:01 +02:00
John Chilton
2aeb4590d1
Merge pull request #4289 from erasche/local-network
...
Local network access restrictions
2017-09-07 10:36:39 -04:00
E Rasche
4e2cd5fea6
rebuild client
2017-09-07 16:34:36 +02:00
E Rasche
618d89b972
lint-import-order
2017-09-07 16:31:32 +02:00
E Rasche
e8ea1104a7
add a test expecting failure
2017-09-07 16:31:32 +02:00
E Rasche
cb41639078
flake8
2017-09-07 16:31:32 +02:00
E Rasche
b620536dc2
rebuild client
2017-09-07 16:31:32 +02:00
E Rasche
36758478d5
non-URL things get passed to this function
2017-09-07 16:31:21 +02:00
E Rasche
d1892fc444
the library prefers unicode stuff
2017-09-07 16:31:21 +02:00
E Rasche
569bd6bedf
Show a more useful error when one is available
2017-09-07 16:31:21 +02:00
E Rasche
e50e7239b5
Implement IP address whitelisting
2017-09-07 16:31:20 +02:00
Nate Coraor
74f7181eaf
Merge pull request #4503 from mvdbeek/paramiko_long_running
...
Allow paramiko cli to recover from ssh timeout
2017-09-07 10:19:04 -04:00
John Chilton
57ff68edd0
Merge pull request #4539 from mvdbeek/purge_source
...
Prevent in-place editing of uploaded files if files are imported from the FTP folder
2017-09-07 10:11:04 -04:00
Dannon Baker
696a1eda3c
Merge integration branch of 'header_join' into dev
2017-09-06 20:40:55 -04:00
Dannon Baker
d887cb17f0
Merge join_header into dev.
2017-09-06 20:35:33 -04:00
Dannon Baker
20b9356396
Merge pull request #4568 from martenson/fix-collection-import
...
Fix datalib collection import
2017-09-06 19:26:50 -04:00
Dannon Baker
8f7d2374ca
Merge pull request #4564 from jmchilton/selenium_fixes_20
...
Increase the robustness of Selenium workflow management tests.
2017-09-06 16:50:30 -04:00
Martin Cech
cf09a25fdc
fix import of collections to datalibs
...
I swear I fixed this before
2017-09-06 16:06:07 -04:00
Martin Cech
30b97f1f1e
refactor callback hell to use promises
2017-09-06 16:05:58 -04:00
Dannon Baker
e8ee2741f9
Merge pull request #4567 from martenson/index-refresh-logging
...
add logging to ts index building
2017-09-06 15:27:25 -04:00
Martin Cech
095c1045b6
add logging to ts index building
2017-09-06 14:05:05 -04:00
Nicola Soranzo
eb799267ee
Merge branch 'release_17.05' into dev
2017-09-06 18:27:56 +01:00
Nicola Soranzo
41fe55129a
Merge branch 'release_17.01' into release_17.05
...
Conflicts:
lib/galaxy/datatypes/data.py
2017-09-06 18:26:49 +01:00
Dannon Baker
a95566b36c
Merge pull request #4562 from jmchilton/selenium_fixes_19
...
Potential fix for transiently failing Selenium published histories test.
2017-09-06 13:20:39 -04:00
Nicola Soranzo
759780b72c
Merge branch 'release_16.10' into release_17.01
2017-09-06 18:19:50 +01:00
Nicola Soranzo
140c570517
Merge branch 'release_16.07' into release_16.10
2017-09-06 18:18:51 +01:00
Nicola Soranzo
4345d8e7d7
Merge branch 'release_16.04' into release_16.07
...
Conflicts:
lib/galaxy/config.py
2017-09-06 18:12:53 +01:00
Nicola Soranzo
dad5563cac
Merge branch 'release_16.01' into release_16.04
2017-09-06 18:06:07 +01:00
Dannon Baker
2207e7f8aa
Merge pull request #4565 from jmchilton/backport_uwsgi_fix
...
[16.01] Backport uwsgi fix from #2836 .
2017-09-06 12:35:30 -04:00
John Chilton
02c7792985
[16.01] Backport uwsgi fix from #2836 .
...
Now that newer releases require a library that the mere presence of breaks an older version of Galaxy, I think this will be encountered more during development. It is breaking Planemo's ability to switch between different versions of Galaxy.
https://github.com/galaxyproject/galaxy/pull/2836
2017-09-06 09:34:11 -04:00
Nicola Soranzo
37802abee2
Merge pull request #4560 from martenson/improving-datalibraries
...
improve docs and access checks in datalibs manager/api
2017-09-06 09:11:15 +01:00
John Chilton
49eadb682a
Increase the robustness of Selenium workflow management tests.
...
Next Selenium build encountered a few different problems with importing workflows from URL:
- https://jenkins.galaxyproject.org/job/selenium/213/artifact/213-test-errors/test_rename2017090515241504639495/stacktrace.txt
- https://jenkins.galaxyproject.org/job/selenium/213/artifact/213-test-errors/test_view2017090515251504639548/
- https://jenkins.galaxyproject.org/job/selenium/213/artifact/213-test-errors/test_build_workflow2017090515191504639167/stacktrace.txt
On full test retry, only one of these actually caused a test error but we shouldn't have to depend on the test re-running stuff.
2017-09-05 22:49:01 -04:00
Dannon Baker