From 38c062f8ff98057da002dc5798aa93cc71bf0181 Mon Sep 17 00:00:00 2001 From: afabiani Date: Fri, 14 Feb 2020 09:40:09 +0100 Subject: [PATCH] - Bump to version 2.10.2 --- CHANGELOG.md | 112 ++++++++++++++++++ Dockerfile | 2 +- README.md | 12 +- docker-compose.async.yml | 4 +- docker-compose.yml | 2 +- docs/basic/theme/index.rst | 2 +- docs/install/project/index.rst | 4 +- geonode/__init__.py | 2 +- geonode/geoserver/helpers.py | 2 +- geonode/locale/ar/LC_MESSAGES/django.po | 4 +- geonode/locale/de/LC_MESSAGES/django.po | 4 +- geonode/locale/el/LC_MESSAGES/django.po | 4 +- geonode/locale/en/LC_MESSAGES/django.po | 4 +- geonode/locale/fr/LC_MESSAGES/django.po | 4 +- geonode/locale/it/LC_MESSAGES/django.po | 4 +- geonode/templates/index.html | 2 +- geonode/tests/integration.py | 2 +- .../spcgeonode/docker-compose.override.yml | 12 +- scripts/spcgeonode/docker-compose.yml | 14 +-- 19 files changed, 154 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cff0529397e..a172e32377b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,117 @@ # Change Log +## [2.10.2](https://github.com/GeoNode/geonode/tree/2.10.2) (2020-02-14) + + - **[Implemented Features](https://github.com/GeoNode/geonode/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+milestone%3A2.10.2+label%3Afeature)** + + - **[Dependencies Updates](https://github.com/GeoNode/geonode/pulls?q=is%3Apr+is%3Aclosed+label%3Adependencies+milestone%3A2.10.2)** + + - **[Updated Doccumentations](https://github.com/GeoNode/geonode/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+milestone%3A2.10.2+label%3Adocs)** + + - **[Updated Doccumentations Pull Requests](https://github.com/GeoNode/geonode/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+label%3Adocs+milestone%3A2.10.2)** + + - **[Fixed Security Issues](https://github.com/GeoNode/geonode/issues?q=is%3Aissue+is%3Aclosed+milestone%3A2.10.2+label%3Asecurity)** + + - **[Fixed Security Pull Requests](https://github.com/GeoNode/geonode/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+label%3Asecurity+milestone%3A2.10.2+)** + + - **[Resolved Regressions](https://github.com/GeoNode/geonode/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+milestone%3A2.10.2+label%3Aregression)** + + - **[Fixed Critical Issues](https://github.com/GeoNode/geonode/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+milestone%3A2.10.2+label%3Ablocker)** + + - **[Fixed Major Issues](https://github.com/GeoNode/geonode/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+milestone%3A2.10.2+label%3Amajor)** + + - **[Fixed Minor Issues](https://github.com/GeoNode/geonode/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+milestone%3A2.10.2+label%3Aminor)** + + - **[Updated Translations](https://github.com/GeoNode/geonode/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+milestone%3A2.10.2+label%3Atranslations)** + + - **[All Closed Issues](https://github.com/GeoNode/geonode/issues?q=is%3Aissue+is%3Aclosed+milestone%3A2.10.2)** + +## [Full Changelog](https://github.com/GeoNode/geonode/compare/2.10.1...2.10.2) + +
  • 2020-02-13: Dana Lambert [Fixes #5566] Making ContactRole resource a required field
    • +
  • 2020-02-13: dependabot-preview[bot] Bump invoke from 1.3.0 to 1.4.1
    • +
  • 2020-02-13: afabiani - Fix tests
    • +
  • 2020-02-13: dependabot-preview[bot] Bump psutil from 5.6.5 to 5.6.7
    • +
  • 2020-02-13: dependabot-preview[bot] Update django-jsonfield requirement from <1.3.2 to <1.4.1
    • +
  • 2020-02-13: afabiani [Fixes #5682] Thumbnails broken for RemoteServices using a invalid WMS GetCapabilities request
    • +
  • 2020-02-13: afabiani [Fixes #5682] Thumbnails broken for RemoteServices using a invalid WMS GetCapabilities request
    • +
  • 2020-02-13: afabiani - [Hardening] some minor last minute fixes
    • +
  • 2020-02-12: dependabot-preview[bot] Bump pytest from 4.6.6 to 4.6.9
    • +
  • 2020-02-12: dependabot-preview[bot] Bump shapely from 1.6.4.post2 to 1.7.0
    • +
  • 2020-02-12: dependabot-preview[bot] Bump docker from 4.1.0 to 4.2.0
    • +
  • 2020-02-12: dependabot-preview[bot] Bump urllib3 from 1.25.7 to 1.25.8
    • +
  • 2020-02-12: dependabot-preview[bot] Update django-invitations requirement from <=1.9.2 to <1.9.4
    • +
  • 2020-02-12: dependabot-preview[bot] Bump pillow from 6.2.1 to 6.2.2
    • +
  • 2020-02-12: dependabot-preview[bot] Update httplib2 requirement from <0.14.1 to <0.17.1
    • +
  • 2020-02-12: dependabot-preview[bot] Bump pycsw from 2.4.0 to 2.4.2
    • +
  • 2020-02-12: dependabot-preview[bot] Update django-multi-email-field requirement from <=0.5.1 to <0.6.2
    • +
  • 2020-02-12: dependabot-preview[bot] Bump coverage from 4.5.4 to 5.0.3
    • +
  • 2020-02-04: Travis Brundage Add import path for pip 20.0+, retain backup hack pip session in case of future changes
    • +
  • 2020-02-11: sjohn-atenekom [FIXES #5639] Group membership is ignored for layer permissions
    • +
  • 2020-02-11: afabiani - [Hardening] do not fail in case the profile avatar field has no file associated
    • +
  • 2020-02-11: afabiani - Fix test cases
    • +
  • 2020-02-11: dependabot-preview[bot] Bump beautifulsoup4 from 4.8.1 to 4.8.2
    • +
  • 2020-02-11: afabiani - flake8 issues
    • +
  • 2020-02-10: afabiani [Fixes #5648] '^rest/workspaces/(?P\w+)/styles' URL is redundant and wrong
    • +
  • 2020-02-10: Francesco Frassinelli [Fixes #5646] Set skip_authorization for older setups
    • +
  • 2020-02-10: afabiani [Fixes #5593] Users Avatar and Groups Logo appear as broken img
    • +
  • 2020-02-04: dependabot[bot] Bump bootstrap from 3.4.0 to 3.4.1 in /geonode/static
    • +
  • 2020-02-06: Francesco Frassinelli [Fixes #5615] Upgrade to Django 1.11.28
    • +
  • 2020-02-04: afabiani - Expose "EPSG_CODE_MATCHES" as variable in "settings.py"
    • +
  • 2020-02-04: afabiani - Expose "collect_metrics" as shared task in "settings.py"
    • +
  • 2020-02-04: sjohn-atenekom [Fixes #5437] API endpoints reveal too much information - flake8 fixes
    • +
  • 2020-02-04: sjohn-atenekom [Fixes #5437] API endpoints reveal too much information
    • +
  • 2020-02-01: Toni [Fixes #5584] Added dutch sorted languages
    • +
  • 2020-02-01: Toni [Fixes #5587] Set permissions for current user when DEFAULT_ANONYMOUS_VIEW_PERMISSION is False
    • +
  • 2020-01-24: afabiani Workaround for pip 20.0.2+ issue #7645: 20.0.2 Regression: module missing pip._internal.download
    • +
  • 2020-01-22: afabiani - Updating SPCGeoNode README and doc references
    • +
  • 2020-01-22: afabiani - Bump to officla spcgeonode images @ https://hub.docker.com/r/geonode/spcgeonode/tags
    • +
  • 2020-01-22: afabiani - Fixed selenium branch to 2.10.x
    • +
  • 2020-01-21: Florian Hoedt Update index.rst
    • +
  • 2020-01-21: M. Ahmed Adding documentation for Develop section
    • +
  • 2020-01-20: Ezequiel Gonzalez Rial Fix mixed content when logged in
    • +
  • 2020-01-16: Matthew Northcott Update JETTY_RUNNER_URL to secure HTTPS equivalent
    • +
  • 2020-01-17: afabiani [Hardening] resilient to "re" errors
    • +
  • 2020-01-14: afabiani - Bump to GeoServer 2.15.4
    • +
  • 2020-01-14: afabiani [Fixes #5504] Map Thumbnails Broken
    • +
  • 2020-01-13: afabiani - Typo
    • +
  • 2020-01-13: afabiani - typo
    • +
  • 2020-01-09: afabiani [Fixes #5486] "resolve_object" get confused when present a remote layer with alternate similar to the local one
    • +
  • 2020-01-08: Rizky Maulana Nugraha Fix environment variable references (#5475)
    • +
  • 2020-01-08: afabiani .msgapi #mapstore-print-panel.modal-dialog
    • +
  • 2020-01-07: afabiani [Hardening] Removing problematic CSS comment
    • +
  • 2019-12-19: afabiani Bump django-mapstore-adapter from 1.0.13 to 1.0.15
    • +
  • 2019-12-18: dependabot-preview[bot] Bump django from 1.11.26 to 1.11.27
    • +
  • 2019-12-13: afabiani - Disabling "Selenium Integration Tests SPCGeonode"
    • +
  • 2019-12-11: afabiani [Hardening] Adding MAPBOX_BASEMAPS to local_settings.py.geoserver.sample
    • +
  • 2019-12-11: afabiani [Hardening] Get rid of deprecated middelware
    • +
  • 2019-12-11: afabiani - Fix tests Segmentation Fault
    • +
  • 2019-12-11: afabiani - Fix tests
    • +
  • 2019-12-10: afabiani [Hardening] Minor fixes and checks
    • +
  • 2019-12-10: afabiani - Integration Tests fix
    • +
  • 2019-12-10: afabiani - Integration Tests fix
    • +
  • 2019-12-10: afabiani - Smoke Test Seg Fault fix
    • +
  • 2019-12-10: afabiani - Smoke Test Seg Fault fix
    • +
  • 2019-12-10: afabiani - Smoke Test Seg Fault fix
    • +
  • 2019-12-10: afabiani - Cleanup print messages
    • +
  • 2019-12-10: afabiani - Smoke Test Seg Fault fix
    • +
  • 2019-12-09: afabiani - Smoke Test Seg Fault fix
    • +
  • 2019-11-29: afabiani [Hardeninig] prioritize meta urls
    • +
  • 2019-11-20: afabiani [Fixes #5028] Maps migrated from GeoExplorer don't display the correct initial extent in MapStore
    • +
  • 2019-11-20: Toni Added kikislater to contributors
    • +
  • 2019-11-18: afabiani [Fixes #5283] UnicodeEncodeError when trying to delete a Layer on a GeoNode instance with action streams containing exotic characters.
    • +
  • 2019-11-18: dependabot-preview[bot] Bump pyopenssl from 19.0.0 to 19.1.0
    • +
  • 2019-11-18: dependabot-preview[bot] Bump simplejson from 3.16.0 to 3.17.0
    • +
  • 2019-11-17: Toni Schönbuchner Fix #5260 Failed to get the certificates
    • +
  • 2019-11-15: afabiani [Hardening] fixup Legend links
    • +
  • 2019-11-15: afabiani [Hardening] fixup Legend links
    • +
  • 2019-11-15: afabiani [Fixes #5272] Line layer uploaded to GeoNode is rendered as point layer
    • +
  • 2019-11-14: dependabot-preview[bot] Update django-modeltranslation requirement
    • +
  • 2019-11-14: afabiani [Fixes #4635] Encoding issues when uploading layers using a shapefile
    • +
  • 2019-11-14: afabiani [Fixes #5264] Use GeoServer 2.15.3
    • +
  • 2019-11-13: Florian Hoedt [Fixes #5258] Duplicate Headline in /about
    • +
  • 2019-11-13: dependabot-preview[bot] Bump readthedocs-sphinx-ext from 1.0.0 to 1.0.1
    • + ## [2.10.1](https://github.com/GeoNode/geonode/tree/2.10.1) (2019-11-12) - **[Implemented Features](https://github.com/GeoNode/geonode/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+milestone%3A2.10.1+label%3Afeature)** diff --git a/Dockerfile b/Dockerfile index 73747af1406..66640a09954 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM geonode/geonode:2.10.x +FROM geonode/geonode:2.10.2 MAINTAINER GeoNode development team COPY requirements.txt /usr/src/app/ diff --git a/README.md b/README.md index ec0f66ac80b..e77164794a8 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ http://master.demo.geonode.org. After your registration you will be able to test all basic functionalities like uploading layers, creation of maps, editing metadata, styles and much more. To get an overview what GeoNode can do we recommend to have a look at the [Users -Workshop](http://docs.geonode.org/en/2.10.x/usage/index.html). +Workshop](http://docs.geonode.org/en/2.10.2/usage/index.html). Install ------- @@ -55,17 +55,17 @@ GeoNode can be setup in different ways, flavors and plattforms. If you´re planning to do development or install for production please visit the offical GeoNode installation documentation: -- [Docker](http://docs.geonode.org/en/2.10.x/install/core/index.html#docker) -- [Ubuntu 18.04](http://docs.geonode.org/en/2.10.x/install/core/index.html#ubuntu-18-04) +- [Docker](http://docs.geonode.org/en/2.10.2/install/core/index.html#docker) +- [Ubuntu 18.04](http://docs.geonode.org/en/2.10.2/install/core/index.html#ubuntu-18-04) Learn GeoNode ------------- After you´ve finished the setup process make yourself familiar with the general usage and settings of your GeoNodes instance. - the [User -Training](http://docs.geonode.org/en/2.10.x/usage/index.html) +Training](http://docs.geonode.org/en/2.10.2/usage/index.html) is going in depth into what we can do. - the [Administrators -Workshop](http://docs.geonode.org/en/2.10.x/admin/index.html) +Workshop](http://docs.geonode.org/en/2.10.2/admin/index.html) will guide you to the most important parts regarding management commands and configuration settings. @@ -84,7 +84,7 @@ lightweight components to speed up things. To get you started have a look at the [Install instructions](#install) which cover all what is needed to run GeoNode for development. Further visit the the [Developer -workshop](http://docs.geonode.org/en/2.10.x/devel/index.html) +workshop](http://docs.geonode.org/en/2.10.2/devel/index.html) for a basic overview. If you're planning of customizing your GeoNode instance, or to extend diff --git a/docker-compose.async.yml b/docker-compose.async.yml index ff194c4c35c..e8cf1510315 100644 --- a/docker-compose.async.yml +++ b/docker-compose.async.yml @@ -40,7 +40,7 @@ services: celery: restart: unless-stopped - image: geonode/geonode:2.10.x + image: geonode/geonode:2.10.2 container_name: celery4${COMPOSE_PROJECT_NAME} stdin_open: true # tty: true @@ -79,7 +79,7 @@ services: django: restart: unless-stopped - image: geonode/geonode:2.10.x + image: geonode/geonode:2.10.2 container_name: django4${COMPOSE_PROJECT_NAME} stdin_open: true # tty: true diff --git a/docker-compose.yml b/docker-compose.yml index 321fcc3183a..081a50587e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,7 @@ services: django: restart: unless-stopped - image: geonode/geonode:2.10.x + image: geonode/geonode:2.10.2 container_name: django4${COMPOSE_PROJECT_NAME} stdin_open: true # tty: true diff --git a/docs/basic/theme/index.rst b/docs/basic/theme/index.rst index 0f5e8969ef4..a2f01ad8f15 100644 --- a/docs/basic/theme/index.rst +++ b/docs/basic/theme/index.rst @@ -247,7 +247,7 @@ You can see on `line 189 of the GeoNode base.html template + href="{{custom_theme.jumbotron_cta_link|default:_('http://docs.geonode.org/en/2.10.2/usage/index.html')}}"> {{custom_theme.jumbotron_cta_text|default:_("Get Started »")}}

    diff --git a/docs/install/project/index.rst b/docs/install/project/index.rst index 431b6ed8125..f1b4bbac8bd 100644 --- a/docs/install/project/index.rst +++ b/docs/install/project/index.rst @@ -202,7 +202,7 @@ Docker 'django4my_geonode' instead of 'django4geonode' and so on... -Deploy an instance of a geonode-project Django template 2.10.x with Docker on localhost +Deploy an instance of a geonode-project Django template 2.10.2 with Docker on localhost ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prepare the environment @@ -245,7 +245,7 @@ Finally, run the containers docker-compose -f docker-compose.yml up -d -Deploy an instance of a geonode-project Django template 2.10.x with Docker on a domain +Deploy an instance of a geonode-project Django template 2.10.2 with Docker on a domain ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. note:: We will use ``www.example.org`` as an example. You can change the name at your convenience. diff --git a/geonode/__init__.py b/geonode/__init__.py index 08bc00b9cb3..41aad9b0626 100644 --- a/geonode/__init__.py +++ b/geonode/__init__.py @@ -20,7 +20,7 @@ import os -__version__ = (2, 10, 2, 'unstable', 0) +__version__ = (2, 10, 2, 'final', 0) default_app_config = "geonode.apps.AppConfig" diff --git a/geonode/geoserver/helpers.py b/geonode/geoserver/helpers.py index 78ad1de0503..00cbbd6fa62 100755 --- a/geonode/geoserver/helpers.py +++ b/geonode/geoserver/helpers.py @@ -75,7 +75,7 @@ msg = ( 'Please configure OGC_SERVER when enabling geonode.geoserver.' ' More info can be found at ' - 'http://docs.geonode.org/en/2.10.x/basic/settings/index.html#ogc-server') + 'http://docs.geonode.org/en/2.10.2/basic/settings/index.html#ogc-server') raise ImproperlyConfigured(msg) diff --git a/geonode/locale/ar/LC_MESSAGES/django.po b/geonode/locale/ar/LC_MESSAGES/django.po index 6a5614f14aa..18d9f62b772 100644 --- a/geonode/locale/ar/LC_MESSAGES/django.po +++ b/geonode/locale/ar/LC_MESSAGES/django.po @@ -6266,8 +6266,8 @@ msgid "GeoNode is an open source platform for sharing geospatial data and maps." msgstr "GeoNode هو منصة مفتوحة المصدر لتبادل البيانات الجغرافية والخرائط." #: geonode/templates/index.html:23 -msgid "http://docs.geonode.org/en/2.10.x/usage/index.html" -msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html" +msgid "http://docs.geonode.org/en/2.10.2/usage/index.html" +msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html" #: geonode/templates/index.html:23 msgid "Get Started »" diff --git a/geonode/locale/de/LC_MESSAGES/django.po b/geonode/locale/de/LC_MESSAGES/django.po index 07c2d012af6..3e331d94a2d 100644 --- a/geonode/locale/de/LC_MESSAGES/django.po +++ b/geonode/locale/de/LC_MESSAGES/django.po @@ -1084,8 +1084,8 @@ msgstr "GeoNode ist eine Open-Source-Plattform zur Veröffentlichung von Geodate #: geonode/contrib/geosites/site_template/templates/site_index.html:14 #: geonode/contrib/geosites/templates/master_index.html:15 geonode/templates/index.html:23 -msgid "http://docs.geonode.org/en/2.10.x/usage/index.html" -msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html" +msgid "http://docs.geonode.org/en/2.10.2/usage/index.html" +msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html" #: geonode/contrib/geosites/site_template/templates/site_index.html:15 #: geonode/contrib/geosites/templates/master_index.html:16 geonode/templates/index.html:23 diff --git a/geonode/locale/el/LC_MESSAGES/django.po b/geonode/locale/el/LC_MESSAGES/django.po index 14b3aa569d3..a0afbdb5c8b 100644 --- a/geonode/locale/el/LC_MESSAGES/django.po +++ b/geonode/locale/el/LC_MESSAGES/django.po @@ -1182,8 +1182,8 @@ msgstr "" #: geonode/contrib/geosites/site_template/templates/site_index.html:14 #: geonode/contrib/geosites/templates/master_index.html:15 #: geonode/templates/index.html:23 -msgid "http://docs.geonode.org/en/2.10.x/usage/index.html" -msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html" +msgid "http://docs.geonode.org/en/2.10.2/usage/index.html" +msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html" #: geonode/contrib/geosites/site_template/templates/site_index.html:15 #: geonode/contrib/geosites/templates/master_index.html:16 diff --git a/geonode/locale/en/LC_MESSAGES/django.po b/geonode/locale/en/LC_MESSAGES/django.po index 4521cae0f74..8dfb0f83a92 100644 --- a/geonode/locale/en/LC_MESSAGES/django.po +++ b/geonode/locale/en/LC_MESSAGES/django.po @@ -6666,8 +6666,8 @@ msgstr "" "GeoNode is an open source platform for sharing geospatial data and maps." #: geonode/templates/index.html:24 -msgid "http://docs.geonode.org/en/2.10.x/usage/index.html" -msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html" +msgid "http://docs.geonode.org/en/2.10.2/usage/index.html" +msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html" #: geonode/templates/index.html:25 msgid "Get Started »" diff --git a/geonode/locale/fr/LC_MESSAGES/django.po b/geonode/locale/fr/LC_MESSAGES/django.po index 356514b6da9..9dadb689699 100644 --- a/geonode/locale/fr/LC_MESSAGES/django.po +++ b/geonode/locale/fr/LC_MESSAGES/django.po @@ -6692,8 +6692,8 @@ msgid "home" msgstr "Si vous avez des questions concernant le logiciel ou des services s'y rapportant, joignez-nous sur notre mailing list" #: geonode/templates/index.html:23 -msgid "http://docs.geonode.org/en/2.10.x/usage/index.html" -msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html" +msgid "http://docs.geonode.org/en/2.10.2/usage/index.html" +msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html" #: geonode/templates/index.html:23 msgid "Get Started »" diff --git a/geonode/locale/it/LC_MESSAGES/django.po b/geonode/locale/it/LC_MESSAGES/django.po index d602291776d..83e2da70f82 100644 --- a/geonode/locale/it/LC_MESSAGES/django.po +++ b/geonode/locale/it/LC_MESSAGES/django.po @@ -6627,8 +6627,8 @@ msgstr "" "geospaziali e mappe." #: geonode/templates/index.html:24 -msgid "http://docs.geonode.org/en/2.10.x/usage/index.html" -msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html" +msgid "http://docs.geonode.org/en/2.10.2/usage/index.html" +msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html" #: geonode/templates/index.html:25 msgid "Get Started »" diff --git a/geonode/templates/index.html b/geonode/templates/index.html index 92697e82159..85b205f261f 100644 --- a/geonode/templates/index.html +++ b/geonode/templates/index.html @@ -21,7 +21,7 @@

    {{custom_theme.jumbotron_welcome_title|default:_("Welcome")}}

    {{custom_theme.jumbotron_welcome_content|default:_("GeoNode is an open source platform for sharing geospatial data and maps.")}}

    {% if not custom_theme.jumbotron_cta_hide %}

    {{custom_theme.jumbotron_cta_text|default:_("Get Started »")}}

    {% endif %} diff --git a/geonode/tests/integration.py b/geonode/tests/integration.py index eaaabdd3f27..1cdd2a1ac41 100644 --- a/geonode/tests/integration.py +++ b/geonode/tests/integration.py @@ -86,7 +86,7 @@ def zip_dir(basedir, archivename): -------------------- 1) - (http://docs.geonode.org/en/2.10.x/install/core/index.html?highlight=paver#run-geonode-for-the-first-time-in-debug-mode) + (http://docs.geonode.org/en/2.10.2/install/core/index.html?highlight=paver#run-geonode-for-the-first-time-in-debug-mode) $ paver setup diff --git a/scripts/spcgeonode/docker-compose.override.yml b/scripts/spcgeonode/docker-compose.override.yml index d77b61b8232..0e98e7f19aa 100644 --- a/scripts/spcgeonode/docker-compose.override.yml +++ b/scripts/spcgeonode/docker-compose.override.yml @@ -4,7 +4,7 @@ version: '3.4' # Common Django template for Geonode, Celery and Celerycam services below x-common-django: &default-common-django - image: geonode/spcgeonode:django-2.10.x + image: geonode/spcgeonode:django-2.10.2 environment: - DEBUG=True volumes: @@ -27,29 +27,29 @@ services: command: 'celery events --app=geonode.celery_app:app --pidfile="/celeryev.pid" --camera=django_celery_monitor.camera.Camera --frequency=2.0 -l debug' nginx: - image: geonode/spcgeonode:nginx-2.10.x + image: geonode/spcgeonode:nginx-2.10.2 volumes: - ./_volume_static:/spcgeonode-static/ - ./_volume_media:/spcgeonode-media/ - ./_volume_certificates:/spcgeonode-certificates/ geoserver: - image: geonode/spcgeonode:geoserver-2.10.x + image: geonode/spcgeonode:geoserver-2.10.2 volumes: - ./_volume_geodatadir:/spcgeonode-geodatadir/ letsencrypt: - image: geonode/spcgeonode:letsencrypt-2.10.x + image: geonode/spcgeonode:letsencrypt-2.10.2 volumes: - ./_volume_certificates:/spcgeonode-certificates/ pgdumper: - image: geonode/spcgeonode:pgdumper-2.10.x + image: geonode/spcgeonode:pgdumper-2.10.2 volumes: - ./_volume_pgdumps:/spcgeonode-pgdumps/ rclone: - image: geonode/spcgeonode:rclone-2.10.x + image: geonode/spcgeonode:rclone-2.10.2 volumes: - ./_volume_pgdumps:/spcgeonode-pgdumps/ - ./_volume_media:/spcgeonode-media/ diff --git a/scripts/spcgeonode/docker-compose.yml b/scripts/spcgeonode/docker-compose.yml index 09af63ebb11..40840941639 100644 --- a/scripts/spcgeonode/docker-compose.yml +++ b/scripts/spcgeonode/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.4' # Common Django template for Geonode, Celery and Celerycam services below x-common-django: &default-common-django - image: geonode/spcgeonode:django-2.10.x + image: geonode/spcgeonode:django-2.10.2 build: context: ../../ dockerfile: scripts/spcgeonode/django/Dockerfile @@ -89,7 +89,7 @@ services: # Nginx is serving django static and media files and proxies to django and geonode nginx: - image: geonode/spcgeonode:nginx-2.10.x + image: geonode/spcgeonode:nginx-2.10.2 build: ./nginx/ environment: - HTTPS_HOST=${HTTPS_HOST} @@ -107,7 +107,7 @@ services: # Geoserver backend geoserver: - image: geonode/spcgeonode:geoserver-2.10.x + image: geonode/spcgeonode:geoserver-2.10.2 build: ./geoserver/ healthcheck: test: "curl --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://127.0.0.1:8080/geoserver/rest/workspaces/geonode.html" @@ -130,7 +130,7 @@ services: # Gets and installs letsencrypt certificates letsencrypt: - image: geonode/spcgeonode:letsencrypt-2.10.x + image: geonode/spcgeonode:letsencrypt-2.10.2 build: ./letsencrypt/ environment: - HTTPS_HOST=${HTTPS_HOST} @@ -144,7 +144,7 @@ services: # dumps the non geodata db pgdumper_nogeo: container_name: dumper_${GEONODE_DATABASE}_${COMPOSE_PROJECT_NAME} - image: geonode/spcgeonode:pgdumper-2.10.x + image: geonode/spcgeonode:pgdumper-2.10.2 build: ./pgdumper/ volumes: - pgdumps:/spcgeonode-pgdumps/ @@ -156,7 +156,7 @@ services: # dumps the geodata db pgdumper_geo: container_name: dumper_${GEONODE_GEODATABASE}_${COMPOSE_PROJECT_NAME} - image: geonode/spcgeonode:pgdumper-2.10.x + image: geonode/spcgeonode:pgdumper-2.10.2 build: ./pgdumper/ volumes: - pgdumps:/spcgeonode-pgdumps/ @@ -167,7 +167,7 @@ services: - DATABASE_URL=postgres://${GEONODE_GEODATABASE_USER}:${GEONODE_GEODATABASE_PASSWORD}@postgres:5432/${GEONODE_GEODATABASE} rclone: - image: geonode/spcgeonode:rclone-2.10.x + image: geonode/spcgeonode:rclone-2.10.2 build: ./rclone/ environment: - S3_ACCESS_KEY=${S3_ACCESS_KEY}