Merge pull request #372 from lucernae/update-upstream

Cumulative updates from upstreams
kartoza · Oct 30, 2017 · ddc0aba · ddc0aba
2 parents 8ae1950 + bb53174
commit ddc0aba
Show file tree

Hide file tree

Showing 1,502 changed files with 88,646 additions and 8,148 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ dist
 geonode/development.db
 /geoserver/
 downloaded
+package-lock.json
 
 docs/i18n/pot/
 
@@ -118,3 +119,9 @@ geonode/man/
 geonode/pip-selfcheck.json
 geonode/shapely/
 geonode/share/
+
+# Contrib monitoring module
+geonode/contrib/monitoring/frontend/node_modules
+geonode/contrib/monitoring/frontend/static
+# celery files
+celerybeat-schedule.*
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,5 @@
 sudo: required
 
-group: deprecated-2017Q2
-
 language: python
 
 python:
@@ -12,16 +10,14 @@ virtualenv:
 
 services:
   - docker
-  # GeoServer used Rabbitmq for notifier services
-  - rabbitmq
 
 env:
   - BACKEND: 'geonode.geoserver'
   - BACKEND: 'geonode.qgis_server'
     DOCKER_COMPOSE_VERSION: 1.11.2
     # This is qgis server address
     QGIS_SERVER_URL: http://localhost:9000/
-    # This is the IP of docker network bridge
+    # This is the location of docker network bridge
     # So QGIS server can access this address
     SITEURL: http://localhost:8000/
     GEONODE_PROJECT_PATH: /home/travis/build/kartoza/geonode/
@@ -40,17 +36,16 @@ before_install:
 
 install:
   - sudo apt-get -qq -y update
-  - sudo apt-get install -y libgdal1h python-gdal
+  - sudo apt-get install -y libgdal1h python-gdal gdal-bin spatialite-bin
   - sudo apt-get install -y python-virtualenv python-imaging python-lxml python-pyproj python-shapely python-nose python-httplib2 python-httplib2 gettext
+  - sudo apt-get install -y python-dev libxml2 libxml2-dev libxslt1-dev zlib1g-dev libjpeg-dev libpq-dev libgdal-dev git default-jdk
   - sudo add-apt-repository -y ppa:webupd8team/java
   - sudo apt-get update
-  - sudo apt-get install -y --force-yes oracle-java8-installer ant maven2 libjai-core-java --no-install-recommends
-  # install libjai-imageio-core-java in trusty
-  - wget https://launchpad.net/ubuntu/+archive/primary/+files/libjai-imageio-core-java_1.2-3_amd64.deb
-  - sudo dpkg -i libjai-imageio-core-java_1.2-3_amd64.deb
+  - sudo apt-get install -y --force-yes oracle-java8-installer ant maven2 --no-install-recommends
   - sudo update-java-alternatives --set java-8-oracle
   - pip install -r requirements.txt
-  - pip install -e . --no-deps
+  - pip install -e .
+  - pip install pygdal==`gdal-config --version`
   - pip install codecov
 
 before_script:

diff --git a/dev_config.yml b/dev_config.yml
@@ -1,7 +1,7 @@
 ---
-GEOSERVER_URL: "http://build.geonode.org/geoserver/latest/geoserver-2.10.x.war"
-DATA_DIR_URL: "http://build.geonode.org/geoserver/latest/data-2.10.x.zip"
-JETTY_RUNNER_URL: "http://repo2.maven.org/maven2/org/mortbay/jetty/jetty-runner/8.1.8.v20121106/jetty-runner-8.1.8.v20121106.jar"
+GEOSERVER_URL: "http://build.geonode.org/geoserver/latest/geoserver-2.12.x.war"
+DATA_DIR_URL: "http://build.geonode.org/geoserver/latest/data-2.12.x.zip"
+JETTY_RUNNER_URL: "http://repo2.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.7.v20170914/jetty-runner-9.4.7.v20170914.jar"
 WINDOWS:
   py2exe: "http://downloads.sourceforge.net/project/py2exe/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe"
   nose: "https://s3.amazonaws.com/geonodedeps/nose-1.3.3.win32-py2.7.exe"

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -20,3 +20,15 @@ services:
       - '.:/usr/src/app'
     environment:
       - DEBUG=True
+
+
+  consumers:
+    build: .
+    # Loading the app is defined here to allow for
+    # autoreload on changes it is mounted on top of the
+    # old copy that docker added when creating the image
+    volumes:
+      - '.:/usr/src/app'
+    environment:
+      - DEBUG=True 
+
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,6 +30,16 @@ services:
     env_file:
       - ./scripts/docker/env/production/django.env
 
+  consumers:
+    image: geonode/django
+    links:
+      - rabbitmq
+      - postgres
+      - elasticsearch
+    command: python manage.py runmessaging
+    env_file:
+      - ./scripts/docker/env/production/django.env
+
   geoserver:
     image: geonode/geoserver:alias
     links:

diff --git a/docs/conf.py b/docs/conf.py
@@ -44,16 +44,16 @@
 
 # General information about the project.
 project = u'GeoNode'
-copyright = u'2016, Open Source Geospatial Foundation, CC-SA'
+copyright = u'2017, Open Source Geospatial Foundation, CC-SA'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.4'
+version = '2.6'
 # The full version, including alpha/beta/rc tags.
-release = '2.4'
+release = '2.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -232,7 +232,7 @@
 epub_title = u'GeoNode'
 epub_author = u'GeoNode Development Team'
 epub_publisher = u'GeoNode Development Team'
-epub_copyright = u'2016, Open Source Geospatial Foundation, CC-SA'
+epub_copyright = u'2017, Open Source Geospatial Foundation, CC-SA'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.

diff --git a/docs/img/demo-site.png b/docs/img/demo-site.png
diff --git a/docs/img/logo.png b/docs/img/logo.png
diff --git a/docs/img/monitoring/admin-monitoring-add-host.png b/docs/img/monitoring/admin-monitoring-add-host.png
diff --git a/docs/img/monitoring/admin-monitoring-add-service.png b/docs/img/monitoring/admin-monitoring-add-service.png
diff --git a/docs/img/monitoring/admin-monitoring-host.png b/docs/img/monitoring/admin-monitoring-host.png
diff --git a/docs/img/monitoring/admin-monitoring-hosts-services-underline.png b/docs/img/monitoring/admin-monitoring-hosts-services-underline.png
diff --git a/docs/img/monitoring/admin-monitoring-section-standalone.png b/docs/img/monitoring/admin-monitoring-section-standalone.png
diff --git a/docs/img/monitoring/admin-monitoring-section.png b/docs/img/monitoring/admin-monitoring-section.png
diff --git a/docs/img/monitoring/admin-monitoring-service-local-geonode.png b/docs/img/monitoring/admin-monitoring-service-local-geonode.png
diff --git a/docs/img/monitoring/admin-monitoring-service-local-geoserver.png b/docs/img/monitoring/admin-monitoring-service-local-geoserver.png
diff --git a/docs/img/monitoring/admin-monitoring-service-local-system-geonode.png b/docs/img/monitoring/admin-monitoring-service-local-system-geonode.png
diff --git a/docs/img/monitoring/dashboard-error-details-request.png b/docs/img/monitoring/dashboard-error-details-request.png
diff --git a/docs/img/monitoring/dashboard-error-details.png b/docs/img/monitoring/dashboard-error-details.png
diff --git a/docs/img/monitoring/dashboard-errors-list.png b/docs/img/monitoring/dashboard-errors-list.png
diff --git a/docs/img/monitoring/dashboard-hw-performance-charts-button.png b/docs/img/monitoring/dashboard-hw-performance-charts-button.png
diff --git a/docs/img/monitoring/dashboard-hw-performance-charts.png b/docs/img/monitoring/dashboard-hw-performance-charts.png
diff --git a/docs/img/monitoring/dashboard-hw-performance.png b/docs/img/monitoring/dashboard-hw-performance.png
diff --git a/docs/img/monitoring/dashboard-indicators-errors.png b/docs/img/monitoring/dashboard-indicators-errors.png
diff --git a/docs/img/monitoring/dashboard-indicators-ok.png b/docs/img/monitoring/dashboard-indicators-ok.png
diff --git a/docs/img/monitoring/dashboard-notifications-config.png b/docs/img/monitoring/dashboard-notifications-config.png
diff --git a/docs/img/monitoring/dashboard-notifications-list.png b/docs/img/monitoring/dashboard-notifications-list.png
diff --git a/docs/img/monitoring/dashboard-sw-performance-chart-layers.png b/docs/img/monitoring/dashboard-sw-performance-chart-layers.png
diff --git a/docs/img/monitoring/dashboard-sw-performance-chart.png b/docs/img/monitoring/dashboard-sw-performance-chart.png
diff --git a/docs/img/monitoring/dashboard-sw-performance-charts-button.png b/docs/img/monitoring/dashboard-sw-performance-charts-button.png
diff --git a/docs/img/monitoring/dashboard-sw-performance.png b/docs/img/monitoring/dashboard-sw-performance.png
diff --git a/docs/img/monitoring/dashboard-top-bar.png b/docs/img/monitoring/dashboard-top-bar.png
diff --git a/docs/img/monitoring/homepage-admin-link.png b/docs/img/monitoring/homepage-admin-link.png
diff --git a/docs/img/monitoring/homepage-monitoring-link.png b/docs/img/monitoring/homepage-monitoring-link.png
diff --git a/docs/img/monitoring/monitoring-alerts-notification-link.png b/docs/img/monitoring/monitoring-alerts-notification-link.png
diff --git a/docs/img/monitoring/monitoring-alerts-unfolded.png b/docs/img/monitoring/monitoring-alerts-unfolded.png
diff --git a/docs/img/monitoring/monitoring-alerts.png b/docs/img/monitoring/monitoring-alerts.png
diff --git a/docs/img/monitoring/monitoring-dashboard.png b/docs/img/monitoring/monitoring-dashboard.png
diff --git a/docs/organizational/contribute/img/branching.png b/docs/organizational/contribute/img/branching.png
diff --git a/docs/organizational/contribute/img/checkout.png b/docs/organizational/contribute/img/checkout.png
diff --git a/docs/organizational/contribute/img/code-review-flow.png b/docs/organizational/contribute/img/code-review-flow.png
diff --git a/docs/organizational/contribute/img/commit_logo.png b/docs/organizational/contribute/img/commit_logo.png
diff --git a/docs/organizational/contribute/img/correct_branch.png b/docs/organizational/contribute/img/correct_branch.png
diff --git a/docs/organizational/contribute/img/create-pr.png b/docs/organizational/contribute/img/create-pr.png
diff --git a/docs/organizational/contribute/img/create_branch.png b/docs/organizational/contribute/img/create_branch.png
diff --git a/docs/organizational/contribute/img/create_branch_example.png b/docs/organizational/contribute/img/create_branch_example.png
diff --git a/docs/organizational/contribute/img/create_branch_example_2.png b/docs/organizational/contribute/img/create_branch_example_2.png
diff --git a/docs/organizational/contribute/img/create_file.png b/docs/organizational/contribute/img/create_file.png
diff --git a/docs/organizational/contribute/img/create_file_test.png b/docs/organizational/contribute/img/create_file_test.png
diff --git a/docs/organizational/contribute/img/create_new_file.png b/docs/organizational/contribute/img/create_new_file.png
diff --git a/docs/organizational/contribute/img/d3-wiki.png b/docs/organizational/contribute/img/d3-wiki.png
diff --git a/docs/organizational/contribute/img/dobule-check-commits.png b/docs/organizational/contribute/img/dobule-check-commits.png
diff --git a/docs/organizational/contribute/img/docs-folder.png b/docs/organizational/contribute/img/docs-folder.png
diff --git a/docs/organizational/contribute/img/docu_edit.png b/docs/organizational/contribute/img/docu_edit.png
diff --git a/docs/organizational/contribute/img/docu_editing.png b/docs/organizational/contribute/img/docu_editing.png
diff --git a/docs/organizational/contribute/img/download_translation.png b/docs/organizational/contribute/img/download_translation.png
diff --git a/docs/organizational/contribute/img/edit_index.png b/docs/organizational/contribute/img/edit_index.png
diff --git a/docs/organizational/contribute/img/example-issue.png b/docs/organizational/contribute/img/example-issue.png
diff --git a/docs/organizational/contribute/img/fork_repo.png b/docs/organizational/contribute/img/fork_repo.png
diff --git a/docs/organizational/contribute/img/geonode_architecture.png b/docs/organizational/contribute/img/geonode_architecture.png
diff --git a/docs/organizational/contribute/img/gh_pr_compare.png b/docs/organizational/contribute/img/gh_pr_compare.png
diff --git a/docs/organizational/contribute/img/gh_pr_select_branch.png b/docs/organizational/contribute/img/gh_pr_select_branch.png
diff --git a/docs/organizational/contribute/img/index_edit.png b/docs/organizational/contribute/img/index_edit.png
diff --git a/docs/organizational/contribute/img/index_txt.png b/docs/organizational/contribute/img/index_txt.png
diff --git a/docs/organizational/contribute/img/issue.png b/docs/organizational/contribute/img/issue.png
diff --git a/docs/organizational/contribute/img/language_choice.png b/docs/organizational/contribute/img/language_choice.png
diff --git a/docs/organizational/contribute/img/listing-screen.png b/docs/organizational/contribute/img/listing-screen.png
diff --git a/docs/organizational/contribute/img/logo.png b/docs/organizational/contribute/img/logo.png
diff --git a/docs/organizational/contribute/img/make-pull-request.png b/docs/organizational/contribute/img/make-pull-request.png
diff --git a/docs/organizational/contribute/img/make-sure-you-are-on-right-branch.png b/docs/organizational/contribute/img/make-sure-you-are-on-right-branch.png
diff --git a/docs/organizational/contribute/img/merge-button.png b/docs/organizational/contribute/img/merge-button.png
diff --git a/docs/organizational/contribute/img/navigation-highlight.png b/docs/organizational/contribute/img/navigation-highlight.png
diff --git a/docs/organizational/contribute/img/new-issue.png b/docs/organizational/contribute/img/new-issue.png
diff --git a/docs/organizational/contribute/img/new-pull-request.png b/docs/organizational/contribute/img/new-pull-request.png
diff --git a/docs/organizational/contribute/img/pr-form.png b/docs/organizational/contribute/img/pr-form.png
diff --git a/docs/organizational/contribute/img/pull_request.png b/docs/organizational/contribute/img/pull_request.png
diff --git a/docs/organizational/contribute/img/push_branch.png b/docs/organizational/contribute/img/push_branch.png
diff --git a/docs/organizational/contribute/img/push_logo.png b/docs/organizational/contribute/img/push_logo.png
diff --git a/docs/organizational/contribute/img/repository_geonode.png b/docs/organizational/contribute/img/repository_geonode.png
diff --git a/docs/organizational/contribute/img/transifex_add_translation.png b/docs/organizational/contribute/img/transifex_add_translation.png
diff --git a/docs/organizational/contribute/img/transifex_homepage.png b/docs/organizational/contribute/img/transifex_homepage.png
diff --git a/docs/organizational/contribute/img/transifex_interface.png b/docs/organizational/contribute/img/transifex_interface.png
diff --git a/docs/organizational/contribute/img/transifex_join_project.png b/docs/organizational/contribute/img/transifex_join_project.png
diff --git a/docs/organizational/contribute/img/transifex_join_team.png b/docs/organizational/contribute/img/transifex_join_team.png
diff --git a/docs/organizational/contribute/img/transifex_request_language.png b/docs/organizational/contribute/img/transifex_request_language.png
diff --git a/docs/organizational/img/code-review-flow.png b/docs/organizational/img/code-review-flow.png
diff --git a/docs/organizational/img/create_branch.png b/docs/organizational/img/create_branch.png
diff --git a/docs/organizational/img/create_branch_example.png b/docs/organizational/img/create_branch_example.png
diff --git a/docs/organizational/img/create_branch_example_2.png b/docs/organizational/img/create_branch_example_2.png
diff --git a/docs/organizational/img/create_file.png b/docs/organizational/img/create_file.png
diff --git a/docs/organizational/img/create_file_test.png b/docs/organizational/img/create_file_test.png
diff --git a/docs/organizational/img/create_new_file.png b/docs/organizational/img/create_new_file.png
diff --git a/docs/organizational/img/dobule-check-commits.png b/docs/organizational/img/dobule-check-commits.png
diff --git a/docs/organizational/img/docu_edit.png b/docs/organizational/img/docu_edit.png
diff --git a/docs/organizational/img/docu_editing.png b/docs/organizational/img/docu_editing.png
diff --git a/docs/organizational/img/edit_index.png b/docs/organizational/img/edit_index.png
diff --git a/docs/organizational/img/fork_repo.png b/docs/organizational/img/fork_repo.png
diff --git a/docs/organizational/img/geonode_architecture.png b/docs/organizational/img/geonode_architecture.png
diff --git a/docs/organizational/img/index_edit.png b/docs/organizational/img/index_edit.png
diff --git a/docs/organizational/img/index_txt.png b/docs/organizational/img/index_txt.png
diff --git a/docs/organizational/img/language_choice.png b/docs/organizational/img/language_choice.png
diff --git a/docs/organizational/img/make-pull-request.png b/docs/organizational/img/make-pull-request.png
diff --git a/docs/organizational/img/make-sure-you-are-on-right-branch.png b/docs/organizational/img/make-sure-you-are-on-right-branch.png
diff --git a/docs/organizational/img/new-issue.png b/docs/organizational/img/new-issue.png
diff --git a/docs/organizational/img/new-pull-request.png b/docs/organizational/img/new-pull-request.png
diff --git a/docs/organizational/img/pull_request.png b/docs/organizational/img/pull_request.png
diff --git a/docs/organizational/img/repository_geonode.png b/docs/organizational/img/repository_geonode.png
diff --git a/docs/organizational/img/transifex_add_translation.png b/docs/organizational/img/transifex_add_translation.png
diff --git a/docs/organizational/img/transifex_homepage.png b/docs/organizational/img/transifex_homepage.png
diff --git a/docs/organizational/img/transifex_interface.png b/docs/organizational/img/transifex_interface.png
diff --git a/docs/organizational/img/transifex_join_project.png b/docs/organizational/img/transifex_join_project.png
diff --git a/docs/organizational/img/transifex_join_team.png b/docs/organizational/img/transifex_join_team.png
diff --git a/docs/organizational/img/transifex_request_language.png b/docs/organizational/img/transifex_request_language.png
diff --git a/docs/reference/developers/django-apps.txt b/docs/reference/developers/django-apps.txt
@@ -391,3 +391,12 @@ GeoNode customizes some of Django's default error templates.
 --------
 
 If no custom handler for 500 errors is set up in urls.py, Django will call django.views.defaults.server_error which expects a 500.html file in the root of the templates directory. In GeoNode, we have put a template that does not inherit from anything as 500.html and because most of Django's machinery is down when an INTERNAL ERROR (500 code) is encountered the use of template tags should be avoided.
+
+
+3rd party apps
+==============
+
+`pinax.notifications`
+---------------------
+
+This application enables users to receive notifications from specific events within GeoNode. For user-specific configuration, see :ref:`notifications`. For settings, see :ref:`pinax-notifications`.
diff --git a/docs/reference/developers/settings.txt b/docs/reference/developers/settings.txt
@@ -533,6 +533,39 @@ Default: ``'[email protected]'``
 
 This email address is added to the bottom of the password reset page in case users have trouble unlocking-locking their account.
 
+
+.. _pinax-notifications:
+
+User notifications settings
+===========================
+
+.. note:: `PINAX_*` settings are relevant if you have `pinax.notifications` app added to `INSTALLED_APPS`.
+
+.. note:: user configuration is described :ref:`notifications`.
+
+.. note:: Full list of Pinax-notifications app settings is `available in Pinax notifications docs <https://pinax-notifications.readthedocs.io/en/latest/settings/>`_.
+
+PINAX_NOTIFICATIONS_QUEUE_ALL
+-----------------------------
+
+Default: `False`
+
+A boolean that specifies if user notifications should be queued and send outside main web application process. If set to `True`, additional sending script, `python manage.py emit_notices` should be called periodically. 
+
+PINAX_NOTIFICATIONS_BACKENDS
+----------------------------
+
+Default: 
+
+.. code::
+
+    [
+    ("email", "pinax.notifications.backends.email.EmailBackend"),
+    ]
+
+List of backends (channels) that delivers messages to receipients.
+
+
 Download settings
 =================
 

diff --git a/docs/reference/img/geonode_component_architecture.png b/docs/reference/img/geonode_component_architecture.png
diff --git a/docs/reference/img/ie_message.png b/docs/reference/img/ie_message.png
diff --git a/docs/reference/img/modern_ie.png b/docs/reference/img/modern_ie.png
diff --git a/docs/reference/img/permissions.png b/docs/reference/img/permissions.png
diff --git a/docs/reference/img/permissions2.png b/docs/reference/img/permissions2.png
diff --git a/docs/reference/img/unpublish_content.png b/docs/reference/img/unpublish_content.png
diff --git a/docs/reference/img/virtualbox.png b/docs/reference/img/virtualbox.png
diff --git a/docs/tutorials/admin/admin_mgmt_commands/index.txt b/docs/tutorials/admin/admin_mgmt_commands/index.txt
@@ -118,6 +118,57 @@ Additional options::
       -h, --help            show this help message and exit
 
 
+createvectorlayer
+=================
+
+Create an empty PostGIS vector layer in GeoNode.
+
+Usage::
+
+    python manage.py createvectorlayer name [options]
+
+Additional options::
+
+    manage.py createvectorlayer [-h] [--version] [-v {0,1,2,3}]
+                                   [--settings SETTINGS]
+                                   [--pythonpath PYTHONPATH] [--traceback]
+                                   [--no-color] [--user USER]
+                                   [--geometry GEOMETRY]
+                                   [--attributes ATTRIBUTES] [--title TITLE]
+                                   name
+
+    Create an empty PostGIS vector layer in GeoNode.
+
+    positional arguments:
+      name
+
+    optional arguments:
+      -h, --help            show this help message and exit
+      --version             show program's version number and exit
+      -v {0,1,2,3}, --verbosity {0,1,2,3}
+                            Verbosity level; 0=minimal output, 1=normal output,
+                            2=verbose output, 3=very verbose output
+      --settings SETTINGS   The Python path to a settings module, e.g.
+                            "myproject.settings.main". If this isn't provided, the
+                            DJANGO_SETTINGS_MODULE environment variable will be
+                            used.
+      --pythonpath PYTHONPATH
+                            A directory to add to the Python path, e.g.
+                            "/home/djangoprojects/myproject".
+      --traceback           Raise on CommandError exceptions
+      --no-color            Don't colorize the command output.
+      --user USER           Name of the user account which should own the created
+                            layer
+      --geometry GEOMETRY   Geometry type of the layer to be created. Can be
+                            Point, LineString or Polygon. Default is Point
+      --attributes ATTRIBUTES
+                            A json representation of the attributes to create.
+                            Example: { "field_str": "string", "field_int":
+                            "integer", "field_date": "date", "field_float":
+                            "float"}
+      --title TITLE         Title for the layer to be created.
+
+
 fixsitename
 ===========
 
@@ -180,3 +231,17 @@ Usage::
 
   # fix base layers for a given map
   python manage.py fix_baselayers map_id
+
+
+sync_geofence
+=============
+
+Synchronize GeoNode permissions in GeoFence. This can be useful when upgrading GeoNode.
+
+Usage::
+
+  # synchronize all layers
+  python manage.py sync_geofence
+
+  # synchronize all layers which contain a given search string in their name
+  python manage.py sync_geofence --layername cambridge
diff --git a/docs/tutorials/admin/admin_panel/documents.txt b/docs/tutorials/admin/admin_panel/documents.txt
@@ -9,4 +9,5 @@ As for the layers, most of the information related to the documents can and shou
 .. figure:: img/admin-documents.png
 
 Through the document detail page is possible to edit the metadata information.
-The fields related to the bounding box or the file attached should not be edited directly.
+The fields related to the bounding box or the file attached should not be edited directly.
+Metadata information can be changed for multiple documents at once with "Metadata batch edit" action, just like for layers.
diff --git a/docs/tutorials/admin/admin_panel/img/admin-auth.png b/docs/tutorials/admin/admin_panel/img/admin-auth.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-base-region-list.png b/docs/tutorials/admin/admin_panel/img/admin-base-region-list.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-base-restriction-list.png b/docs/tutorials/admin/admin_panel/img/admin-base-restriction-list.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-base-spatialrepresentation-list.png b/docs/tutorials/admin/admin_panel/img/admin-base-spatialrepresentation-list.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-base-topiccategories-list.png b/docs/tutorials/admin/admin_panel/img/admin-base-topiccategories-list.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-base.png b/docs/tutorials/admin/admin_panel/img/admin-base.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-documents.png b/docs/tutorials/admin/admin_panel/img/admin-documents.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-layers-batch.png b/docs/tutorials/admin/admin_panel/img/admin-layers-batch.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-layers.png b/docs/tutorials/admin/admin_panel/img/admin-layers.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-login.png b/docs/tutorials/admin/admin_panel/img/admin-login.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-maps.png b/docs/tutorials/admin/admin_panel/img/admin-maps.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-people.png b/docs/tutorials/admin/admin_panel/img/admin-people.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-profiles-contactroles.png b/docs/tutorials/admin/admin_panel/img/admin-profiles-contactroles.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-roles-add.png b/docs/tutorials/admin/admin_panel/img/admin-roles-add.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-users-list.png b/docs/tutorials/admin/admin_panel/img/admin-users-list.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-users-new-2.png b/docs/tutorials/admin/admin_panel/img/admin-users-new-2.png
diff --git a/docs/tutorials/admin/admin_panel/img/admin-users-new.png b/docs/tutorials/admin/admin_panel/img/admin-users-new.png
diff --git a/docs/tutorials/admin/admin_panel/layers.txt b/docs/tutorials/admin/admin_panel/layers.txt
@@ -10,5 +10,7 @@ Some of the layers information can be edited directly through the admin interfac
 
 Is not recommended to modify the Attributes neither the Styles.
 
-Clicking on the Layers link will present a list of layers. By selecting one of them is possible to modify some information like the metadata, the keywords etc.
-It's strongly recommended to limit the edits to the metadata and similar information. 
+Clicking on the Layers link will present a list of layers. Metadata information can be changed for multiple layers at once with "Metadata batch edit" action.
+By clicking one of the layers presents you with the page for modifing some of the information like metadata, keywords etc. It's strongly recommended to limit the edits to the metadata and similar information.
+
+.. figure:: img/admin-layers-batch.png
diff --git a/docs/tutorials/admin/admin_panel/maps.txt b/docs/tutorials/admin/admin_panel/maps.txt
@@ -11,4 +11,5 @@ Currently the maps admin panel allows more metadata options that the GeoNode map
 The "Map Layers" section should not be used.
 
 By clicking on a map in the maps list the metadata web form will be presented.
-Is possible to add or modify the information here. As for the layers, the more specific entries like the layers stack or the map coordinates should not be modified.
+Is possible to add or modify the information here. As for the layers, the more specific entries like the layers stack or the map coordinates should not be modified.
+Just like for layers, you can edit metadata for multiple maps at once with "Metadata batch edit" action.
diff --git a/docs/tutorials/admin/admin_panel/profiles.txt b/docs/tutorials/admin/admin_panel/profiles.txt
@@ -9,7 +9,7 @@ So far GeoNode implements two distinct roles, that can be assigned to resources
 * party who authored the resource
 * party who can be contacted for acquiring knowledge about or acquisition of the resource
 
-This two profiles can be set in the GeoNode interface by accessing the metadata page and setting the "Point of Contact" and "Metadata Author" fields respectively.
+These two profiles can be set in the GeoNode interface by accessing the metadata page and setting the "Point of Contact" and "Metadata Author" fields respectively.
 
 Is possible for an administrator to add new roles if needed, by clicking on the "Add Role" button in the "Base" -> "Contact Roles" section:
 

diff --git a/docs/tutorials/admin/async_signals/index.txt b/docs/tutorials/admin/async_signals/index.txt
@@ -0,0 +1,88 @@
+.. _async_signals:
+
+=============================
+Asynchronous signals handling
+=============================
+
+Asynchronous signals handling is a part of GeoNode scalabilty architecture. It allows to offload post-processing tasks from main web application process, also to integrate closely with GeoServer.
+
+In this setup GeoNode produces events (small messages with serialized configuration) that are queued by external broker (AMQP broker, prefferably RabbitMQ), and later, are consumed (processed) by separate worker process. Additionally, GeoServer can be attached and used as producer as well, so two-way data synchronization between GeoNode and GeoServer can be established.
+
+.. note:: Default configuration (in-memory queue) doesn't require AMQP broker, and will process signals synchronously. Also, default configuration won't allow two-way synchronization with GeoServer, even if GS is configured to work with external broker.
+
+Async signals handling components
+=================================
+
+GeoNode
+-------
+
+GeoNode can be switched to asynchronous signals processing by specifying `ASYNC_SIGNALS_BROKER_URL` setting in settings. See :ref:`GeoNode settings <settings_entries>`. This setting is consumed by `kombu library <http://kombu.readthedocs.io/>`_. You can set type of transport with connection details (credentials, host), for example: ``amqp://localhost/`` will connect to AMQP broker (RabbitMQ) running locally, without any authentication.
+
+.. note:: while this is easiest to use asynchronous signals handling, it is not recommended setup due to security issues.
+
+
+GeoServer (optional)
+--------------------
+
+See `GeoServer documentation for Notification module <http://docs.geoserver.org/stable/en/user/community/notification/index.html>`_.
+
+RabbitMQ (AMQP broker)
+----------------------
+
+Asynchronous signals infrastructure can be used with different protocols (supported by `Kombu` library), but AMQP with RabbitMQ broker is recommended. 
+
+Install and run RabbitMQ instance:
+
+.. code::
+
+    sudo apt-get install rabbitmq-server
+    sudo service rabbitmq-server start
+
+
+Additional information about RabbitMQ configuration is available in `Documentation <https://www.rabbitmq.com/configure.html>`_.
+
+
+Consumer process
+----------------
+
+To handle events produced by GeoNode and GeoServer, a receiver, consumer process is needed. GeoNode provides `runmessaging` django command. This will start long-running process, which will handle incoming messages. For production deployments, it should be configured with process managers like supervisord or runit.
+
+
+Following is sample configuration for supervisord:
+
+.. note: this is just a sample configuration, you should adjust paths accordingly to your deployment
+
+.. code::
+
+    [program:geonode-runmessaging]
+    command=/bin/bash -c "(source /path/to/virtualenv/bin/activate && django-admin.py runmessaging --autoscale 2,1 --loglevel DEBUG)"
+    directory = # /path/to/rundir
+    environment=DJANGO_SETTINGS_MODULE="geonode.local_settings"
+    user=geonode
+    numproc=1
+    stdout_logfile=/path/to/log/output.log
+    stderr_logfile=/path/to/log/output.log
+    autostart = true
+    autorestart = true
+    startsecs = 10
+    stopwaitsecs = 600
+    priority = 998
+
+
+This file is also available in `scripts/misc/runmessaging.supervisord.conf` file in GeoNode repository.
+
+To use it, you should have `supervisord` installed and configured:
+
+.. code::
+
+    sudo apt-get install supervisor
+    sudo supervisor start
+    vi /etc/supervisor/conf.d/runmessaging.supervisord.conf # adjust paths and variables.
+    sudo supervisorctl reload
+
+
+Notes
+-----
+
+Technical details and motivation is described in `GNIP <https://github.com/GeoNode/geonode/issues/2889>`_.
+
diff --git a/docs/tutorials/admin/backup_restore/img/backup001.png b/docs/tutorials/admin/backup_restore/img/backup001.png
diff --git a/docs/tutorials/admin/backup_restore/img/backup002.png b/docs/tutorials/admin/backup_restore/img/backup002.png
diff --git a/docs/tutorials/admin/backup_restore/img/backup003.png b/docs/tutorials/admin/backup_restore/img/backup003.png
diff --git a/docs/tutorials/admin/backup_restore/img/backup004.png b/docs/tutorials/admin/backup_restore/img/backup004.png
diff --git a/docs/tutorials/admin/backup_restore/img/backup005.png b/docs/tutorials/admin/backup_restore/img/backup005.png
diff --git a/docs/tutorials/admin/backup_restore/img/backup006.png b/docs/tutorials/admin/backup_restore/img/backup006.png
diff --git a/docs/tutorials/admin/backup_restore/img/backup007.png b/docs/tutorials/admin/backup_restore/img/backup007.png
diff --git a/docs/tutorials/admin/backup_restore/img/backup008.png b/docs/tutorials/admin/backup_restore/img/backup008.png
diff --git a/docs/tutorials/admin/backup_restore/img/backup009.png b/docs/tutorials/admin/backup_restore/img/backup009.png
diff --git a/docs/tutorials/admin/backup_restore/img/backup010.png b/docs/tutorials/admin/backup_restore/img/backup010.png
diff --git a/docs/tutorials/admin/backup_restore/img/backup011.png b/docs/tutorials/admin/backup_restore/img/backup011.png
diff --git a/docs/tutorials/admin/backup_restore/img/backup012.png b/docs/tutorials/admin/backup_restore/img/backup012.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/add_new_poll.png b/docs/tutorials/admin/customize_lookfeel/img/add_new_poll.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/add_poll.png b/docs/tutorials/admin/customize_lookfeel/img/add_poll.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/admin_polls.png b/docs/tutorials/admin/customize_lookfeel/img/admin_polls.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/admin_top.png b/docs/tutorials/admin/customize_lookfeel/img/admin_top.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/bootswatch.png b/docs/tutorials/admin/customize_lookfeel/img/bootswatch.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/bootswatch_geonode.png b/docs/tutorials/admin/customize_lookfeel/img/bootswatch_geonode.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/choice_admin.png b/docs/tutorials/admin/customize_lookfeel/img/choice_admin.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/content_wrap_fixed.png b/docs/tutorials/admin/customize_lookfeel/img/content_wrap_fixed.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/create_repo.jpg b/docs/tutorials/admin/customize_lookfeel/img/create_repo.jpg
diff --git a/docs/tutorials/admin/customize_lookfeel/img/css_overrides.png b/docs/tutorials/admin/customize_lookfeel/img/css_overrides.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/django_packages.png b/docs/tutorials/admin/customize_lookfeel/img/django_packages.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/github_home.jpg b/docs/tutorials/admin/customize_lookfeel/img/github_home.jpg
diff --git a/docs/tutorials/admin/customize_lookfeel/img/github_project.png b/docs/tutorials/admin/customize_lookfeel/img/github_project.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/homepage.png b/docs/tutorials/admin/customize_lookfeel/img/homepage.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/inspect_element.png b/docs/tutorials/admin/customize_lookfeel/img/inspect_element.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/logo_override.png b/docs/tutorials/admin/customize_lookfeel/img/logo_override.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/navbar_add.png b/docs/tutorials/admin/customize_lookfeel/img/navbar_add.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/new_repo.jpg b/docs/tutorials/admin/customize_lookfeel/img/new_repo.jpg
diff --git a/docs/tutorials/admin/customize_lookfeel/img/poll_geonode_hidden.png b/docs/tutorials/admin/customize_lookfeel/img/poll_geonode_hidden.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/poll_geonode_highlight.png b/docs/tutorials/admin/customize_lookfeel/img/poll_geonode_highlight.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/poll_list.png b/docs/tutorials/admin/customize_lookfeel/img/poll_list.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/polls_geonode.png b/docs/tutorials/admin/customize_lookfeel/img/polls_geonode.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/polls_plain.png b/docs/tutorials/admin/customize_lookfeel/img/polls_plain.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/zinnia_admin.png b/docs/tutorials/admin/customize_lookfeel/img/zinnia_admin.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/zinnia_blog.png b/docs/tutorials/admin/customize_lookfeel/img/zinnia_blog.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/zinnia_create_post.png b/docs/tutorials/admin/customize_lookfeel/img/zinnia_create_post.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/zinnia_default.png b/docs/tutorials/admin/customize_lookfeel/img/zinnia_default.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/zinnia_geonode.png b/docs/tutorials/admin/customize_lookfeel/img/zinnia_geonode.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/zinnia_post.png b/docs/tutorials/admin/customize_lookfeel/img/zinnia_post.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/zinnia_post_list.png b/docs/tutorials/admin/customize_lookfeel/img/zinnia_post_list.png
diff --git a/docs/tutorials/admin/customize_lookfeel/img/zinnia_tools.png b/docs/tutorials/admin/customize_lookfeel/img/zinnia_tools.png
diff --git a/docs/tutorials/admin/database_shards/img/shards_001.png b/docs/tutorials/admin/database_shards/img/shards_001.png