Preparing release 2.1.0

GeotrekCE · Sep 30, 2015 · 5b89072 · 5b89072
1 parent 473911b
commit 5b89072
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.1.dev0
+2.1.0
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,20 +2,35 @@
 CHANGELOG
 =========
 
-2.0.1.dev0
+2.1.0 (2015-09-29)
 ------------------
+
 **Breaking changes**
 
-* Trek relations parent / child have changed. Please reconfigure trek links.*
+* Instead of storing the parent of a trek, Geotrek now stores the children of a trek.
+  This allows to use the same trek in several parents and to order them.
+  WARNING! Existing parent/child relation are lost. You will have to set them
+  again after upgrade. Fixes #1479
 
 **New features**
 
-* Services
+* Add trek infos (aka services for now)
+* Add email sent to reporting user after submit
+* Handle multiple reservation systems (fixes #1488)
+* Add an option to sync_rando to filter by source (fixes #1480)
+* Add add condition field to infrastructure table (fixes #1494)
+* New Geotrek logo
 
 **Bug fixes**
 
 * Reload supervisor configuration after Geotrek upgrade
 * Fix projection of waypoints in GPX exports
+* Prevent unnecessary save for geom fields if they are not updated.
+  This prevents triggering geom recalculation in postgres.
+* Fix crash in case of missing or invalid picture
+* Fix feedback API
+* Unzip eggs to fix templates not found error
+* Various parsers (import system) fixes and improvements
 
 **Documentation**
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.0'
+version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.1.dev0'
+release = '2.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/install.sh b/install.sh
@@ -20,7 +20,7 @@ exec 1> install.log 2>&1
 
 #------------------------------------------------------------------------------
 
-VERSION=${VERSION:-2.0.1.dev0}
+VERSION=${VERSION:-2.1.0}
 dev=false
 tests=false
 prod=false