Few fixes.

doc/getting_started/upgrade.rst

@@ -53,8 +53,6 @@ Finally, follow the common procedure::
 1.1.0: FIXME
 ============
 
-#. Add ``'modoboa.extensions.postfix_relay_domains'`` to ``MODOBOA_APPS``
-
 Due to code refactoring, some modifications need to be done into
 :file:`settings.py`:
 
@@ -74,6 +72,8 @@ Due to code refactoring, some modifications need to be done into
       'modoboa.extensions.sievefilters',
     )
 
+#. Add ``'modoboa.extensions.postfix_relay_domains'`` to ``MODOBOA_APPS``
+
 #. ``AUTH_USER_MODEL`` must be set to ``core.User``
 
 #. Into ``LOGGING``, replace ``modoboa.lib.logutils.SQLHandler`` by
@@ -85,6 +85,8 @@ Then, run the following commands to migrate your installation::
   $ python manage.py migrate
   $ python manage.py collectstatic
 
+Finally, update both :ref:`Dovecot <dovecot_authentication>` and
+:ref:`Postfix <postfix>` queries.
 
 1.0.1: operations on mailboxes
 ==============================

doc/integration/imap_and_smtp.rst

@@ -89,6 +89,7 @@ And add the following line inside::
 The result of each order is recorded into Modoboa's log. Go to
 *Modoboa > Logs* to consult them.
 
+.. _dovecot_authentication:
 
 Authentication
 ==============

modoboa/extensions/admin/app_settings.py

@@ -46,13 +46,18 @@ class AdminParametersForm(parameters.AdminParametersForm):
     def __init__(self, *args, **kwargs):
         super(AdminParametersForm, self).__init__(*args, **kwargs)
         hide_fields = False
-        try:
-            code, version = exec_cmd("dovecot --version")
-        except OSError:
-            hide_fields = True
-        else:
-            if code or not version.strip().startswith("2"):
+        code, output = exec_cmd("which dovecot")
+        if not code:
+            dpath = output.strip()
+            try:
+                code, version = exec_cmd("%s --version" % dpath)
+            except OSError:
                 hide_fields = True
+            else:
+                if code or not version.strip().startswith("2"):
+                    hide_fields = True
+        else:
+            hide_fields = True
         if hide_fields:
             del self.fields["handle_mailboxes"]
             del self.fields["mailboxes_owner"]

modoboa/extensions/webmail/lib.py

@@ -34,7 +34,7 @@ class WMtable(tables.Table):
     selection = tables.SelectionColumn(
         "selection", safe=True, width='1%', header=None, sortable=False
     )
-    flags = tables.ImgColumn("flags", width="2%")
+    flags = tables.ImgColumn("flags", width="3%")
     withatts = tables.ImgColumn("withatts", width="2%")
     subject = tables.Column(
         "subject", label=ugettext_lazy("Subject"), width="50%", limit=60,

requirements.txt

@@ -1,4 +1,4 @@
-django
+django>=1.5,<1.6
 django-reversion>=1.8.0
 dj-database-url
 south