Preparing release 2.4.0

GeotrekCE · Nov 18, 2015 · 9f10b0b · 9f10b0b
1 parent eea5368
commit 9f10b0b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.3.1.dev0
+2.4.0
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,13 +2,22 @@
 CHANGELOG
 =========
 
-2.3.1.dev0
+2.4.0 (2015-11-18)
 ------------------
 
 **New features**
 
-* Paths can be merged.
+* Paths can be merged
 * Add trek parents to API
+* Allow to sync public web site from web interface
+* Add begin and end dates to touristic events list
+* Filter conmpleted touristic events by default
+
+**Bug fixes**
+
+* Prevent concurrent imports and/or synchronization
+* Fix rendering of HTML markup in weasyprint templates
+* Fix missing publication field in some cases
 
 
 2.3.0 (2015-11-09)

diff --git a/docs/conf.py b/docs/conf.py
@@ -46,9 +46,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.3'
+version = '2.4'
 # The full version, including alpha/beta/rc tags.
-release = '2.3.1.dev0'
+release = '2.4.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.3.1.dev0}
+VERSION=${VERSION:-2.4.0}
 dev=false
 tests=false
 prod=false