Merge branch 'master' into danielLowe/6809-Simplify-long-conditionals

GeoNode · Jan 25, 2021 · bed94a0 · bed94a0
2 parents 2495141 + 4e4bb7b
commit bed94a0
Show file tree

Hide file tree

Showing 7 changed files with 1,189 additions and 1,350 deletions.
diff --git a/.env_dev b/.env_dev
@@ -15,21 +15,21 @@ GEONODE_INSTANCE_NAME=geonode
 GEONODE_LB_HOST_IP=
 GEONODE_LB_PORT=
 
-# POSTGRES_USER=postgres
-# POSTGRES_PASSWORD=postgres
-# GEONODE_DATABASE=geonode
-# GEONODE_DATABASE_PASSWORD=geonode
-# GEONODE_GEODATABASE=geonode_data
-# GEONODE_GEODATABASE_PASSWORD=geonode_data
-# GEONODE_DATABASE_SCHEMA=public
-# GEONODE_GEODATABASE_SCHEMA=public
-# DATABASE_URL=postgis://geonode:geonode@localhost:5432/geonode
-# GEODATABASE_URL=postgis://geonode_data:geonode@localhost:5432/geonode_data
-# GEONODE_DB_CONN_MAX_AGE=0
-# GEONODE_DB_CONN_TOUT=5
-# DEFAULT_BACKEND_DATASTORE=datastore
-# BROKER_URL=amqp://admin:admin@localhost:5672//
-# ASYNC_SIGNALS=True
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+GEONODE_DATABASE=geonode
+GEONODE_DATABASE_PASSWORD=geonode
+GEONODE_GEODATABASE=geonode_data
+GEONODE_GEODATABASE_PASSWORD=geonode_data
+GEONODE_DATABASE_SCHEMA=public
+GEONODE_GEODATABASE_SCHEMA=public
+DATABASE_URL=postgis://geonode:geonode@localhost:5432/geonode
+GEODATABASE_URL=postgis://geonode_data:geonode@localhost:5432/geonode_data
+GEONODE_DB_CONN_MAX_AGE=0
+GEONODE_DB_CONN_TOUT=5
+DEFAULT_BACKEND_DATASTORE=datastore
+BROKER_URL=amqp://admin:admin@localhost:5672//
+ASYNC_SIGNALS=False
 
 SITEURL=http://localhost:8000/
 

diff --git a/geonode/locale/it/LC_MESSAGES/django.mo b/geonode/locale/it/LC_MESSAGES/django.mo