Fri, 02 Feb 2018 11:03:20 +0100ENGINE-352: put in the mechanism to attach an is_pep mechanism for the user; tacking pEp messages is complicated, however, as it seems we've also always fouled up when we checked on that (we don't check what key it's encrypted with before we declare whatever key gets retrieved by update_identity is the same, and then set the comm_type on that, which could be the wrong key.) So that's the next fix. ENGINE-352
Krista Bennett <krista@pep-project.org> [Fri, 02 Feb 2018 11:03:20 +0100] rev 2468
ENGINE-352: put in the mechanism to attach an is_pep mechanism for the user; tacking pEp messages is complicated, however, as it seems we've also always fouled up when we checked on that (we don't check what key it's encrypted with before we declare whatever key gets retrieved by update_identity is the same, and then set the comm_type on that, which could be the wrong key.) So that's the next fix.

Thu, 01 Feb 2018 13:57:04 +0100shelving mistrust investigation and fixes to fry bigger fish mistrust_fixes
Krista Bennett <krista@pep-project.org> [Thu, 01 Feb 2018 13:57:04 +0100] rev 2467
shelving mistrust investigation and fixes to fry bigger fish

Mon, 29 Jan 2018 16:52:54 +0100ENGINE-345: fix to outgoing_message_rating - set to PEP_rating_unencrypted instead of unknown
Krista Bennett <krista@pep-project.org> [Mon, 29 Jan 2018 16:52:54 +0100] rev 2466
ENGINE-345: fix to outgoing_message_rating - set to PEP_rating_unencrypted instead of unknown

Mon, 29 Jan 2018 12:44:56 +0100Ok, now really closing this branch. For real. ENGINE-329
Krista Bennett <krista@pep-project.org> [Mon, 29 Jan 2018 12:44:56 +0100] rev 2465
Ok, now really closing this branch. For real.

Mon, 29 Jan 2018 12:40:43 +0100merge
Krista Bennett <krista@pep-project.org> [Mon, 29 Jan 2018 12:40:43 +0100] rev 2464
merge

Mon, 29 Jan 2018 12:40:04 +0100Properly merged in ENGINE-329
Krista Bennett <krista@pep-project.org> [Mon, 29 Jan 2018 12:40:04 +0100] rev 2463
Properly merged in ENGINE-329

Mon, 29 Jan 2018 12:36:02 +0100Fixing bad merges still. ENGINE-329
Krista Bennett <krista@pep-project.org> [Mon, 29 Jan 2018 12:36:02 +0100] rev 2462
Fixing bad merges still.

Mon, 29 Jan 2018 12:15:51 +0100Urgh. Fixing bad merge (???)
Krista Bennett <krista@pep-project.org> [Mon, 29 Jan 2018 12:15:51 +0100] rev 2461
Urgh. Fixing bad merge (???)

Fri, 26 Jan 2018 16:37:27 +0100Closed branch ENGINE-329
Krista Bennett <krista@pep-project.org> [Fri, 26 Jan 2018 16:37:27 +0100] rev 2460
Closed branch

Fri, 26 Jan 2018 16:32:08 +0100Merged in ENGINE-329
Krista Bennett <krista@pep-project.org> [Fri, 26 Jan 2018 16:32:08 +0100] rev 2459
Merged in ENGINE-329