branch master-1.1.x updated (d666cde -> 53d3372)
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 d666cde Merge branch 'release/1.1.8' into master-1.1.x adds bb0be50 [jgitflow-maven-plugin]updating poms for 1.1.9-SNAPSHOT development adds 6a087c1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a17c865 Merge branch 'master-1.1.x' into develop-1.1.x adds c3e5405 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5618eb8 fixes #7773 [Calcul des quantités de gammes] la popup de chargement ne disparait pas quand la popup de gammes apparait adds 03b140f remove sleep for tests adds 34d6cd0 à la réception des emails, remplacement des images dont l'url est incorrecte par l'image par défaut (configurable) (fixes #7855) adds 2b8677b - correction dans la verfi des url des images à la reception des emails - ajout de tests avec des emails anonymisés adds 7874b38 ajout de test adds 756bdcb prise en compte des serveur snon graphiques (refs #7855) adds 21683b6 [jgitflow-maven-plugin]updating poms for branch'release/1.1.9' with non-snapshot versions adds 53d3372 Merge branch 'release/1.1.9' into master-1.1.x No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../faxtomail/FaxToMailConfiguration.java | 4 + .../faxtomail/FaxToMailConfigurationOption.java | 7 + .../i18n/faxtomail-persistence_fr_FR.properties | 1 + faxtomail-service/pom.xml | 2 +- .../faxtomail/services/FaxToMailServiceUtils.java | 35 ++++- .../services/service/EmailServiceImpl.java | 3 +- .../services/service/EmailServiceTest.java | 166 +++++++++++++-------- .../src/test/resources/emails/test6863.eml | 8 + .../src/test/resources/emails/test7716.eml | 31 ++++ .../src/test/resources/emails/test7740.eml | 24 +++ .../src/test/resources/emails/test7855.eml | 24 +++ faxtomail-ui-swing/pom.xml | 2 +- .../actions/ComputeQuantitiesByRangeAction.java | 22 ++- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 259 insertions(+), 78 deletions(-) create mode 100644 faxtomail-service/src/test/resources/emails/test6863.eml create mode 100644 faxtomail-service/src/test/resources/emails/test7716.eml create mode 100644 faxtomail-service/src/test/resources/emails/test7740.eml create mode 100644 faxtomail-service/src/test/resources/emails/test7855.eml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm