From b6037e4842d0080a044a87281766b2e00558f532 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 2 Jun 2016 12:23:22 -0400 Subject: [PATCH] Preparation for release 3.1.1 --- Documentation/docinfo.xml | 6 +++--- Documentation/includes/global-attributes.asciidoc | 2 +- NEWS | 7 +++++-- Version | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml index 0e2177565..419b7dd8a 100644 --- a/Documentation/docinfo.xml +++ b/Documentation/docinfo.xml @@ -1,7 +1,7 @@ -Version 3.1.0 - May 2016 -for version 3.1.0 -2016-05-18 +Version 3.1.1 - June 2016 +for version 3.1.1 +2016-06-02 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License". diff --git a/Documentation/includes/global-attributes.asciidoc b/Documentation/includes/global-attributes.asciidoc index 67b08110e..d1d2f6ac8 100644 --- a/Documentation/includes/global-attributes.asciidoc +++ b/Documentation/includes/global-attributes.asciidoc @@ -13,6 +13,6 @@ // TODO have the build system take care of this -:release_version: 3.1.0 +:release_version: 3.1.1 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab: diff --git a/NEWS b/NEWS index 179bffd3f..a0d6beebf 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -3.1.1 (2016-MM-DD) +3.1.1 (2016-06-02) ------------------ Enhancements @@ -9,8 +9,12 @@ Enhancements - [web] display messages sizes in list of Mail module - [web] link event's attendees email addresses to mail composer - [web] respect SOGoSearchMinimumWordLength when searching for events or tasks + - [web] updated CKEditor to version 4.5.9 + - [web] CKEditor: switched to the minimalist skin + - [web] CKEditor: added the base64image plugin Bug fixes + - [core] strip X- tags when securing content (#3695) - [web] fixed creation of chip on blur (sgTransformOnBlur directive) - [web] fixed composition of new messages from Contacts module - [web] fixed autocompletion of LDAP-based groups (#3673) @@ -24,7 +28,6 @@ Bug fixes - [web] fixed toolbar of mail editor when sender address was too long (#3705) - [web] fixed decoding of filename in attachments (quotes and Cyrillic characters) (#2272) - [web] fixed recipients when replying from a message in the Sent mailbox (#2625) - - [core] strip X- tags when securing content (#3695) - [eas] when using EAS/ItemOperations, use IMAP PEEK operation 3.1.0 (2016-05-18) diff --git a/Version b/Version index 04d2a853c..f77c8f957 100644 --- a/Version +++ b/Version @@ -4,4 +4,4 @@ MAJOR_VERSION=3 MINOR_VERSION=1 -SUBMINOR_VERSION=0 +SUBMINOR_VERSION=1