Merge branch '1.1.x'

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.4'
+release = '1.1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

modoboa/extensions/webmail/lib/imapheader.py

@@ -85,9 +85,9 @@ def parse_date(value, **kwargs):
     tmp = email.utils.parsedate_tz(value)
     if not tmp:
         return value
-    ndate = datetime.datetime(*(tmp)[:7])
-    now = datetime.datetime.now()
     try:
+        ndate = datetime.datetime(*(tmp)[:7])
+        now = datetime.datetime.now()
         if now - ndate > datetime.timedelta(7):
             return ndate.strftime("%d.%m.%Y %H:%M")
         return ndate.strftime("%a %H:%M")

setup.py

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