This is an automated email from the git hooks/post-receive script. New change to branch master-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 1e33e6c Merge branch 'release/1.1.5' into master-1.1.x adds 9adf0df [jgitflow-maven-plugin]updating poms for 1.1.6-SNAPSHOT development adds e9df563 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c6ce0aa Merge branch 'master-1.1.x' into develop-1.1.x adds 2df133a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 69f8ae3 affichage des différentes parties text/html de l'email à la suite (refs #7714) adds 6004998 gestion du cas où plusieurs parties text/plain seraient dans le mail (refs #7714) adds a587daa fixes #7714 adds e7765d2 concaténation des différentes partie text/html de l'email pour la génération du pdf (fixes #7716) adds 5d36117 [jgitflow-maven-plugin]updating poms for branch'release/1.1.6' with non-snapshot versions adds e1adac4 Merge branch 'release/1.1.6' into master-1.1.x No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../faxtomail/services/service/EmailService.java | 4 +- .../services/service/EmailServiceImpl.java | 81 ++++++------ faxtomail-ui-swing/pom.xml | 2 +- .../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-ui-web/pom.xml | 2 +- .../faxtomail/web/job/MailFilterJob.java | 2 +- pom.xml | 2 +- 14 files changed, 182 insertions(+), 118 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.