Merge remote-tracking branch 'origin/2.3' into 2.4

commons/tests/validators_test.py

@@ -7,7 +7,7 @@
 class TestUrl():
 
     @pytest.mark.parametrize("valid_url", [
-        'https://geomapfish.org',
+        'http://geomapfish.org',
         'https://geomapfish.org/functionalities',
         'geomapfish.org/functionalities',
         'static://img/cadastre.jpeg',

doc/integrator/raster.rst

@@ -32,6 +32,9 @@ One may use GDAL/OGR to convert data to such a format.
 We recommend to use a `vrt <https://www.gdal.org/gdal_vrttut.html>`_ file built with
 `gdalbuildvrt <https://www.gdal.org/gdalbuildvrt.html>`_.
 
+``nodata`` specifies the nodata value.
+By default the nodata value is directly read from the source.
+
 ``round`` specifies how the result values should be rounded.
 For instance '1': round to the unit, '0.01': round to the hundredth, etc.
 

docker/build/bin/eval-templates

@@ -13,7 +13,7 @@ do
     fi
 done
 
-find /app/*_geoportal/static-ngeo/build/ -name '*.js' -print | while read file
+find /app/*_geoportal/static-ngeo/build/ \( -name '*.js' -or -name '*.css' -or -name '*.html' \) -print | while read file
 do
     echo "Evaluate: ${file}"
     sed --in-place --expression="s#__ENTRY_POINT__#${VISIBLE_ENTRY_POINT}#g" "${file}"

geoportal/c2cgeoportal_geoportal/views/entry.py

@@ -561,6 +561,7 @@ def _layer_included(tree_item):
 
     def _get_ogc_servers(self, group, depth):
         """ Recurse on all children to get unique identifier for each child. """
+
         ogc_servers = set()
 
         # escape loop