diff --git a/doc/conf.py b/doc/conf.py index 75b698213..62cd369dc 100644 --- a/doc/conf.py +++ b/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. diff --git a/modoboa/extensions/webmail/lib/imapheader.py b/modoboa/extensions/webmail/lib/imapheader.py index 2106ef8e3..ffc8cafb6 100644 --- a/modoboa/extensions/webmail/lib/imapheader.py +++ b/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") diff --git a/setup.py b/setup.py index 97c97c2ec..0110a7bde 100644 --- a/setup.py +++ b/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",