From 2e5695767259908ded510b53c085d61da056bf4c Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Sun, 7 Apr 2019 14:58:22 +0200
Subject: [PATCH] 1.1.0

---
 docs/changelog.md | 31 +++++++++++++++++++++----------
 umap/__init__.py  |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index 4410192e..477d68a7 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,6 +1,17 @@
 # Changelog
 
-## Upgrading to 1.0
+## 1.1.0
+
+- added `Map.BLOCKED` share status, to redact maps issuing legal complaints
+  (only available through the admin)
+- replaced `DictField` by `JSONField` (`umap migrate` needed)
+- added `search_fields` and `autocomplete_fields` to MapAdmin
+- lowercase `frameborder` in iframe export
+- fixed bug in slideshow since renaming of Leaflet.Storage
+
+## 1.0.0
+
+### Upgrading to 1.0
 
 - because of the merge of django-leaflet-storage inside umap, the migrations
   has been reset, so a bit of SQL needs to be ran by hand:
@@ -49,43 +60,43 @@ COMMIT;
         umap compress
 
 
-## 1.0.0-rc.9
+### 1.0.0-rc.9
 - increased maps displayed in user maps page (cf #651)
 - exposed original map url in full export (cf #659)
 
 
-## 1.0.0-rc.8
+### 1.0.0-rc.8
 
 - fixed non browsable missing in caption panel
 - fixed remote datalayers missing in browse data panel when displayed on load (cf #509)
 
-## 1.0.0-rc.7
+### 1.0.0-rc.7
 
 - fixed table popup template not displaying name anymore (cf #647)
 
-## 1.0.0-rc.6
+### 1.0.0-rc.6
 
 - fixed OSM properties not read anymore (cf #641)
 - fixed permissions panel not active at first map save
 
-## 1.0.0-rc.5
+### 1.0.0-rc.5
 
 - fixed user autocompletion in permissions panel (cf #635)
 - fixed ternary choice dealing with unknown values (cf #633)
 
-## 1.0.0-rc.4
+### 1.0.0-rc.4
 
 - fixed geodjango defaulting geojson parsing to SRID 3857 instead of 4326
 - fixed tooltip on hover (cf #631)
 
 
-## 1.0.0-rc.3
+### 1.0.0-rc.3
 
 - added a readonly mode (`UMAP_READONLY=True`), useful to disallow update while
   migrating from one server to an other, for example
 
 
-## 1.0.0-rc.2
+### 1.0.0-rc.2
 
 - allow to cache proxied remote data requests (#513 #510 #160)
 - fixed popup template parsing of url with url as query string (#607)
@@ -97,7 +108,7 @@ COMMIT;
   Allows to add more of those in the future also.
 - fixed popup not opening on first zoom button click when marker is clustered (#611)
 
-## 1.0.0-rc.1
+### 1.0.0-rc.1
 - BREAKING: support of python 2 is removed per upgrading to Django 2.0
 - WARNING: merge Leaflet-Storage and django-leaflet-storage inside umap to ease
   maintenance and contribution; See [Upgrading to 1.0](#upgrading-to-1.0)
diff --git a/umap/__init__.py b/umap/__init__.py
index 62f8ad13..374e682b 100644
--- a/umap/__init__.py
+++ b/umap/__init__.py
@@ -1,5 +1,5 @@
 "Create maps with OpenStreetMap layers in a minute and embed them in your site."
-VERSION = (1, 0, 0)
+VERSION = (1, 1, 0)
 
 __author__ = 'Yohan Boniface'
 __contact__ = "ybon@openstreetmap.fr"