Sync with GeoNode master

.gitignore

@@ -12,6 +12,7 @@ geonode/development.db
 /geoserver/
 downloaded
 package-lock.json
+GeoIPCities.dat
 
 docs/i18n/pot/
 
@@ -72,6 +73,8 @@ geonode/static/lib/js/bootstrap-treeview.min.js
 
 # Uploaded files
 geonode/uploaded
+geonode/qgis_layer
+geonode/qgis_tiles
 
 #Testing output
 .coverage
@@ -83,6 +86,7 @@ geonode/static/geonode/junit.xml
 #Temporary files
 *~
 *.swp
+celerybeat-schedule.*
 celerybeat-schedule
 
 # OSX specific
@@ -117,5 +121,8 @@ 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.*

.travis.yml

@@ -1,3 +1,5 @@
+sudo: required
+
 language: python
 
 python:
@@ -6,6 +8,23 @@ python:
 virtualenv:
   system_site_packages: true
 
+services:
+  - docker
+
+env:
+  - BACKEND: 'geonode.geoserver'
+#  FIXME. Will be uncommented when qgis_server backend exists
+#  - BACKEND: 'geonode.qgis_server'
+#    DOCKER_COMPOSE_VERSION: 1.11.2
+#    # This is qgis server address
+#    QGIS_SERVER_URL: http://localhost:9000/
+#    # 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/
+#    ON_TRAVIS: True
+#    CELERY_ALWAYS_EAGER: True
+
 branches:
   only:
     - master
@@ -14,7 +33,7 @@ branches:
 
 install:
   - sudo apt-get -qq -y update
-  - sudo apt-get install -y libgdal1h python-gdal gdal-bin
+  - 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
@@ -23,8 +42,8 @@ install:
   - sudo update-java-alternatives --set java-8-oracle
   - pip install -r requirements.txt
   - pip install -e .
-  - pip install coveralls
   - pip install pygdal==`gdal-config --version`
+  - pip install codecov
 
 before_script:
   - paver setup
@@ -36,7 +55,7 @@ after_script:
   - paver reset_hard
 
 after_success:
-  - coveralls
+  - codecov
 
 notifications:
   irc:

README

@@ -2,6 +2,9 @@
     :alt: Coverage Badge
     :target: https://coveralls.io/github/GeoNode/geonode?branch=master
 
+.. image:: https://codecov.io/gh/GeoNode/geonode/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/GeoNode/geonode
+
 .. image:: https://secure.travis-ci.org/GeoNode/geonode.png
     :alt: Build Status
     :target: http://travis-ci.org/GeoNode/geonode
@@ -57,25 +60,21 @@ Or if you want to use the provided Makefile::
     # pull latest images
     make pull
 
-**Note:**  
-For deveployment you need to add `geonode` alias into `/ect/hosts/` file as following:
-
-```
-$ sudo vim /etc/hosts
-##
-# Host Database
-#
-# localhost is used to configure the loopback interface
-# when the system is booting.  Do not change this entry.
-##
-127.0.0.1       localhost geonode
-255.255.255.255 broadcasthost
-::1             localhost
-```
-To access GeoNode just enter the following url: `http://geonode/` on your web browser. 
-For GeoServer: `http://geonode/geoserver/web/`
-
-
+.. note:: For development you need to add ``geonode`` alias into ``/etc/hosts/`` file as following::
+
+        $ sudo vim /etc/hosts
+        ##
+        # Host Database
+        #
+        # localhost is used to configure the loopback interface
+        # when the system is booting.  Do not change this entry.
+        ##
+        127.0.0.1       localhost geonode
+        255.255.255.255 broadcasthost
+        ::1             localhost
+
+To access GeoNode just enter the following url: http://geonode/ on your web browser. 
+For GeoServer: http://geonode/geoserver/web/
 
 Ubuntu
 ------

docs/tutorials/admin/admin_mgmt_commands/index.txt

@@ -231,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

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:
 

docs/tutorials/admin/index.txt

@@ -40,6 +40,7 @@ You will know how to:
     loading_data_into_geonode/index
     s3_config/index
     backup_restore/index
+    monitoring/index
     database_shards/index
     async_signals/index
 
@@ -81,6 +82,9 @@ You will know how to:
 :ref:`backup_restore_geonode`
     How to perform a full backup / restore of GeoNode and GeoServer catalogs and how to migrate data. Customization backup / restore fixtures and data manglers.
 
+:ref:`geonode_monitoring`
+    How to set up and use internal monitoring application.
+
 :ref:`datastore_shards`
     How to use the PostGIS datastore shards contrib application in order to have GeoServer stores containing a fewer number of layers. Useful for organizations with hundreds of layers.
 

docs/tutorials/admin/loading_data_into_geonode/importlayers.txt

@@ -17,6 +17,8 @@ This will produce output that looks like the following::
     Brings a data file or a directory full of data files into aGeoNode site.  Layers are added to the Django database, theGeoServer configuration, and the GeoNetwork metadata index.
 
     Options:
+      --version             show program's version number and exit
+      -h, --help            show this help message and exit
       -v VERBOSITY, --verbosity=VERBOSITY
                             Verbosity level; 0=minimal output, 1=normal output,
                             2=verbose output, 3=very verbose output
@@ -28,6 +30,7 @@ This will produce output that looks like the following::
                             A directory to add to the Python path, e.g.
                             "/home/djangoprojects/myproject".
       --traceback           Print traceback on exception
+      --no-color            Don't colorize the command output.
       -u USER, --user=USER  Name of the user account which should own the imported
                             layers
       -i, --ignore-errors   Stop after any errors are encountered.
@@ -37,8 +40,38 @@ This will produce output that looks like the following::
                             The default keywords for the imported layer(s). Will
                             be the same for all imported layers if multiple
                             imports are done in one command
-      --version             show program's version number and exit
-      -h, --help            show this help message and exit
+      -l LICENSE, --license=LICENSE
+                            The license for the imported layer(s). Will be the
+                            same for all imported layers if multiple imports are
+                            done in one command
+      -c CATEGORY, --category=CATEGORY
+                            The category for the imported layer(s). Will be the
+                            same for all imported layers if multiple imports are
+                            done in one command
+      -r REGIONS, --regions=REGIONS
+                        The default regions, separated by comma, for the
+                        imported layer(s). Will be the same for all imported
+                        layers if multiple imports are done in one command
+      -n LAYERNAME, --name=LAYERNAME
+                        The name for the imported layer(s). Can not be used
+                        with multiple imports
+      -t TITLE, --title=TITLE
+                        The title for the imported layer(s). Will be the same
+                        for all imported layers if multiple imports are done
+                        in one command
+      -a ABSTRACT, --abstract=ABSTRACT
+                        The abstract for the imported layer(s). Will be the
+                        same forall imported layers if multiple imports are
+                        donein one command
+      -d DATE, --date=DATE  The date and time for the imported layer(s). Will be
+                        the same for all imported layers if multiple imports
+                        are done in one command. Use quotes to specify both
+                        the date and time in the format 'YYYY-MM-DD HH:MM:SS'.
+      -p, --private     Make layer viewable only to owner
+      -m, --metadata_uploaded_preserve
+                        Force metadata XML to be preserved
+      -C CHARSET, --charset=CHARSET
+                        Specify the charset of the data
 
 While the description of most of the options should be self explanatory, its worth reviewing some of the key options in a bit more detail.
 
@@ -47,6 +80,7 @@ While the description of most of the options should be self explanatory, its wor
 - The -o option specifies that layers with the same name as the base name will be loaded and overwrite the existing layer.
 - The -u option specifies which will be the user that owns the imported layers. The same user will be the point of contact and the metadata author as well for that layer
 - The -k option is used to add keywords for all of the layers imported.
+- The -C option specifies the character encoding of the data.
 
 The import layers management command is invoked by specifying options as described above and specifying the path to a single layer file or to a directory that contains multiple files. For purposes of this exercise, lets use the default set of testing layers that ship with geonode. You can replace this path with the directory to your own shapefiles::