From f84d0e5f30e2bb0dacc45a6d1b8d4f8e7f67c74f Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 25 Nov 2016 10:45:07 -0500 Subject: [PATCH] Preparation for release 3.2.3 --- Documentation/docinfo.xml | 6 +++--- Documentation/includes/global-attributes.asciidoc | 2 +- NEWS | 7 ++++--- Version | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml index f3a9930ad..b3e59a492 100644 --- a/Documentation/docinfo.xml +++ b/Documentation/docinfo.xml @@ -1,7 +1,7 @@ -Version 3.2.2 - November 2016 -for version 3.2.2 -2016-11-23 +Version 3.2.3 - November 2016 +for version 3.2.3 +2016-11-25 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 957206f8f..dfdb53be9 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.2.2 +:release_version: 3.2.3 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab: diff --git a/NEWS b/NEWS index 07194728b..7a8d0cba1 100644 --- a/NEWS +++ b/NEWS @@ -1,11 +1,12 @@ -3.2.3 (2016-12-DD) +3.2.3 (2016-11-25) ------------------ New features - - [core] added photo support for LDAP-based address books (#747/#2184) + - [core] added photo support for LDAP-based address books (#747, #2184) Enhancements - [web] updated CKEditor to version 4.6.0 + - [web] updated Angular to version 1.5.9 Bug fixes - [web] restore attributes when rewriting base64-encoded img tags (#3814) @@ -18,7 +19,7 @@ Bug fixes New features - [core] support repetitive email alarms on tasks and events (#1053) - [web] allow to hide center column on large screens (#3861) - - [eas] relaxed permission requirements for subscription synchronizations (#3118 and #3180) + - [eas] relaxed permission requirements for subscription synchronizations (#3118, #3180) Enhancements - [core] added sha256-crypt and sha512-crypt password support diff --git a/Version b/Version index ed6354a74..2c93f9f60 100644 --- a/Version +++ b/Version @@ -4,4 +4,4 @@ MAJOR_VERSION=3 MINOR_VERSION=2 -SUBMINOR_VERSION=2 +SUBMINOR_VERSION=3