Merge remote-tracking branch 'raphael/JAMES-1794'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0cad0577 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0cad0577 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0cad0577 Branch: refs/heads/master Commit: 0cad057752810117d534ba83d96e88b25bc2a2fd Parents: 5c7471c a989a4e Author: Matthieu Baechler <[email protected]> Authored: Fri Jul 8 17:52:30 2016 +0200 Committer: Matthieu Baechler <[email protected]> Committed: Fri Jul 8 17:52:30 2016 +0200 ---------------------------------------------------------------------- .../store/mail/model/impl/MessageParser.java | 26 ++-- .../mail/model/impl/MessageParserTest.java | 11 +- .../eml/oneHtmlAttachmentAndSomeTextInlined.eml | 39 +++++ .../imap/processor/SetAnnotationProcessor.java | 1 - .../integration/SetMessagesMethodTest.java | 143 +++++++++++++++++++ .../jmap/methods/MIMEMessageConverter.java | 51 +++++-- .../jmap/methods/MIMEMessageConverterTest.java | 62 +++++++- 7 files changed, 299 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
