This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 2df133a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 69f8ae3 affichage des différentes parties text/html de l'email à la suite (refs #7714) new 6004998 gestion du cas où plusieurs parties text/plain seraient dans le mail (refs #7714) new a587daa fixes #7714 new e7765d2 concaténation des différentes partie text/html de l'email pour la génération du pdf (fixes #7716) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e7765d2f279ab6cd6a29ca78526e4c40fe39e970 Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 12 16:58:56 2015 +0100 concaténation des différentes partie text/html de l'email pour la génération du pdf (fixes #7716) commit a587daaaf96f4cdbca2a7d71f6d09d81f51e0b39 Merge: 2df133a 6004998 Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 12 16:28:54 2015 +0100 fixes #7714 commit 60049985c999781b0d5c5085bb26a13057b24701 Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 12 16:23:40 2015 +0100 gestion du cas où plusieurs parties text/plain seraient dans le mail (refs #7714) commit 69f8ae3970ba55282200f4c21ab7bdcb166a321e Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 12 16:10:48 2015 +0100 affichage des différentes parties text/html de l'email à la suite (refs #7714) Summary of changes: .../faxtomail/services/service/EmailService.java | 4 +- .../services/service/EmailServiceImpl.java | 81 ++++++------ .../ui/swing/content/demande/DemandeUI.css | 4 - .../ui/swing/content/demande/DemandeUI.jaxx | 6 +- .../ui/swing/content/demande/DemandeUIHandler.java | 4 +- .../ui/swing/content/demande/DemandeUIModel.java | 38 ++++-- .../ui/swing/content/reply/ReplyFormUIHandler.java | 15 ++- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 136 +++++++++++++-------- .../faxtomail/web/job/MailFilterJob.java | 2 +- 9 files changed, 177 insertions(+), 113 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.