This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit af7ab6a1893f3929988257b5b9a44d81e56fcdb9 Merge: 9bb7b96 d19e6b3 Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 4 11:45:43 2017 +0200 fixes #9096 Ne pas imprimer les pièces-jointes "contenu du mail texte" et "contenu du mail html" fixes #9100 Mettre les pièces "contenu du mail texte" et le "contenu du mail html" dans le bouton "Divers" fixes #9104 Afficher la 1ère pièce -jointe dans l'aperçu de l'élément faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35918 -> 36206 bytes .../services/service/EmailServiceImpl.java | 32 +++++-- ...ttachments_mailContentWithInlineAttachments.sql | 11 +++ .../V2_4_170403_1__add_showAttachmentPreview.sql | 4 + ...ttachments_mailContentWithInlineAttachments.sql | 15 +++ .../V2_4_170403_1__add_showAttachmentPreview.sql | 5 + .../content/attachment/AttachmentCellRenderer.java | 8 -- .../content/attachment/AttachmentEditorUI.jaxx | 10 +- .../attachment/AttachmentEditorUIHandler.java | 26 ++++-- .../attachment/AttachmentEditorUIModel.java | 25 ++++- .../swing/content/attachment/AttachmentItem.jaxx | 2 +- .../content/attachment/AttachmentModelAware.java | 2 + .../swing/content/attachment/ButtonAttachment.java | 10 +- .../content/demande/DemandeListUIHandler.java | 25 +++-- .../ui/swing/content/demande/DemandeUIModel.java | 14 +++ .../demande/actions/LoadFolderEmailsAction.java | 6 ++ .../content/pdfeditor/PDFEditorUIHandler.java | 4 - .../print/AttachmentToPrintChooserUIHandler.java | 20 ++-- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 102 ++++++++++++++++++++- .../WEB-INF/content/admin/configuration-input.jsp | 51 +++++++++++ .../src/main/webapp/js/configuration.js | 9 ++ pom.xml | 2 +- 22 files changed, 328 insertions(+), 55 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.