Merge branch 'master' into Toc-Toc-update-template-585

Conflicts:
	modoboa/extensions/webmail/forms.py

doc/conf.py

@@ -50,7 +50,7 @@ copyright = u'2014, Antoine Nguyen'
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.5'
+release = '1.1.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/getting_started/upgrade.rst

@@ -42,12 +42,15 @@ Then, refer to this page to check if the version you're installing
 requires specific operations. If the version you're looking for is not
 present, it means nothing special is required.
 
-Finally, follow the common procedure::
+Then, follow the common procedure::
 
   $ cd <modoboa_instance_dir>
   $ python manage.py syncdb --migrate
   $ python manage.py collectstatic
 
+Eventually, restart the web server process according to the environment
+you did choose. See :ref:`webservers` for more details.
+
 1.1.6: Few bugfixes
 ===================
 

modoboa/extensions/webmail/forms.py

@@ -89,7 +89,7 @@ class ComposeMailForm(forms.Form):
         required=False
     )
     origmsgid = forms.CharField(label="", required=False)
-    body = forms.CharField()
+    body = forms.CharField(required=False)
 
     def __init__(self, *args, **kwargs):
         """Custom constructor."""

setup.py

@@ -54,7 +54,7 @@ def read(fname):
 
 setup(
     name="modoboa",
-    version='1.1.5',
+    version='1.1.6',
     url='http://modoboa.org/',
     license='MIT',
     description="Mail hosting made simple",