[commits] Horde branch master updated. daa981ef20f33575d3e2297fbfb0c7c63014b78d

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: 097ff04620e0e4055ab9fb9840314a9fabcb4c82

65e05c9 Fix attribute name; shorten labels.
646b860 Don't include external tasks in Nag listTimeObjects results.
9267bd1 phpdoc
e2c89d5 Include the primary key as additional cert.
411ffa5 Style
daa981e Remove task_parent column NOT NULL constraint from Horde 3.

Summary: http://github.com/horde/horde/compare/097ff04620e0e4055ab9fb9840314a9fabcb4c82...daa981ef20f33575d3e2297fbfb0c7c63014b78d

-----------------------------------------------------------------------

commit 65e05c974462dcfa0b5dff55262e33600dd0d7c3
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 12 16:06:38 2016 +0100

    Fix attribute name; shorten labels.

 framework/Crypt/lib/Horde/Crypt/Smime.php | 8 ++++----
 framework/Crypt/package.xml               | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

http://github.com/horde/horde/commit/65e05c974462dcfa0b5dff55262e33600dd0d7c3

-----------------------------------------------------------------------

commit 646b860e4b52eaa8512ccca009a998d2576fa7ee
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 13 12:02:50 2016 +0100

    Don't include external tasks in Nag listTimeObjects results.

 nag/lib/Api.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/646b860e4b52eaa8512ccca009a998d2576fa7ee

-----------------------------------------------------------------------

commit 9267bd14ba0765f1c74e2671b8cf1059722818e0
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 13 13:07:26 2016 +0100

    phpdoc

 framework/Crypt/lib/Horde/Crypt/Smime.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

http://github.com/horde/horde/commit/9267bd14ba0765f1c74e2671b8cf1059722818e0

-----------------------------------------------------------------------

commit e2c89d5504927dad73578c20275d71143b3120c1
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 13 13:07:40 2016 +0100

    Include the primary key as additional cert.
    
    When using the secondary key for signing, still include the primary key, because this is the key that the recipient should be using for answering with an encrypted message, or when saving the senders key.
    Outlook and Notes are supposed to use this by checking all the certs' Key Usage attributes. We should do this too. And we should provide a link to save (resp. updated) a key included with a message, if the key from the address book has expired, is revoked, or otherwise superceded by the included key.

 imp/lib/Ajax/Application/Handler/Common.php |  1 +
 imp/lib/Compose.php                         |  6 +-
 imp/lib/Smime.php                           | 86 +++++++++++++++++++++++------
 3 files changed, 74 insertions(+), 19 deletions(-)

http://github.com/horde/horde/commit/e2c89d5504927dad73578c20275d71143b3120c1

-----------------------------------------------------------------------

commit 411ffa5d621bd239d69bdaf776631ad710e677c0
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 13 16:33:57 2016 +0100

    Style

 nag/lib/Task.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/411ffa5d621bd239d69bdaf776631ad710e677c0

-----------------------------------------------------------------------

commit daa981ef20f33575d3e2297fbfb0c7c63014b78d
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 13 17:15:05 2016 +0100

    Remove task_parent column NOT NULL constraint from Horde 3.

 nag/migration/17_nag_upgrade_task_parent.php | 38 ++++++++++++++++++++++++++++
 nag/package.xml                              |  6 +++--
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 nag/migration/17_nag_upgrade_task_parent.php

http://github.com/horde/horde/commit/daa981ef20f33575d3e2297fbfb0c7c63014b78d