This is an automated email from the git hooks/post-receive script. New change to branch master-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 1e7e0d0 [jgitflow-maven-plugin]merging 'release/1.1.11' into 'master-1.1.x' adds 7c049a1 [jgitflow-maven-plugin]updating poms for 1.1.12-SNAPSHOT development adds 0210b61 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds bbb33f6 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' adds d5e42f5 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 91451be fixes #8321 PJ mal extraite quand il s'agit d'un email transféré non valide : - factorisation de l'extraction des pj d'un email - meilleure gestion des erreurs dans la transfo du mail texte en texte adds c5434c1 fixes #8322 Erreur quand un email reçu n'a pas de sujet (NPE) adds 4059265 fix npe adds 4573fec [jgitflow-maven-plugin]updating poms for branch'release/1.1.12' with non-snapshot versions adds faebb03 [jgitflow-maven-plugin]merging 'release/1.1.12' 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/FaxToMailServiceUtils.java | 32 ++ .../faxtomail/services/service/EmailService.java | 2 + .../services/service/EmailServiceImpl.java | 384 ++++++++++++++------- .../i18n/faxtomail-service_fr_FR.properties | 1 + .../services/service/EmailServiceTest.java | 62 +--- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/actions/OpenReplyAction.java | 15 +- .../ui/swing/content/demande/DemandeUIModel.java | 14 +- .../demande/replies/DemandRepliesUIHandler.java | 31 +- faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/action/DemandDetailAction.java | 20 +- .../faxtomail/web/job/MailFilterJob.java | 80 +---- pom.xml | 2 +- 15 files changed, 350 insertions(+), 301 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.