Merge branch 'QA_5_1'

Signed-off-by: William Desportes <williamdes@wdes.fr>

.travis.yml

@@ -11,10 +11,9 @@ install:
 
 script:
   - ./scripts/generate-mo --quiet
-  - composer run phpunit -- --exclude-group selenium
+  - ./vendor/bin/phpunit --exclude-group selenium
 
 cache:
-  pip: true
   yarn: true
   directories:
     - $HOME/.composer/cache/
@@ -24,6 +23,7 @@ jobs:
   allow_failures:
     - php: nightly
     - os: osx
+    - os: windows
     # https://github.com/phpmyadmin/phpmyadmin/issues/16479
     - name: "Run selenium tests on Google Chrome"
 
@@ -55,6 +55,7 @@ jobs:
       os: windows
       language: node_js
       node_js: 10
+      cache: false
       install:
         - composer install --no-interaction --ignore-platform-reqs
       before_install:

README.rst

@@ -16,6 +16,10 @@ Code status
     :alt: Build status
     :target: https://travis-ci.org/phpmyadmin/phpmyadmin
 
+.. image:: https://readthedocs.org/projects/phpmyadmin/badge/?version=latest
+    :target: https://docs.phpmyadmin.net/en/latest/
+    :alt: Documentation build status
+
 .. image:: https://hosted.weblate.org/widgets/phpmyadmin/-/master/svg-badge.svg
     :alt: Translation status
     :target: https://hosted.weblate.org/engage/phpmyadmin/?utm_source=widget

js/src/navigation.js

@@ -135,6 +135,7 @@ Navigation.loadChildNodes = function (isNode, $expandElem, callback) {
         var pos2Name = $expandElem.find('span.pos2_nav');
         var pathsNav = $expandElem.find('span.paths_nav');
         params = {
+            'server': CommonParams.get('server'),
             'aPath': pathsNav.attr('data-apath'),
             'vPath': pathsNav.attr('data-vpath'),
             'pos': pathsNav.attr('data-pos'),
@@ -150,6 +151,7 @@ Navigation.loadChildNodes = function (isNode, $expandElem, callback) {
     } else {
         $destination = $('#pma_navigation_tree_content');
         params = {
+            'server': CommonParams.get('server'),
             'aPath': $expandElem.attr('data-apath'),
             'vPath': $expandElem.attr('data-vpath'),
             'pos': $expandElem.attr('data-pos'),