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 8724a6107cbbcdc37a8e10fecf9761b8b5a28ca0 Merge: 86ebd74b d07032bd Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:59:13 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.18' into 'master' faxtomail-persistence/pom.xml | 2 +- .../faxtomail/beans/QuantitiesByRange.java | 25 ++-- .../persistence/entities/EmailTopiaDao.java | 155 ++++++++++++++++++++- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 36261 -> 36986 bytes faxtomail-service/pom.xml | 2 +- .../faxtomail/services/service/EmailService.java | 7 + .../services/service/EmailServiceImpl.java | 96 +++++++------ .../h2/V2_4180607_1__addGeneratedPDFPages.sql | 17 +++ .../V2_4180607_1__addGeneratedPDFPages.sql | 18 +++ .../services/service/EmailServiceTest.java | 4 +- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/demande/DemandeUIHandler.java | 4 +- .../ui/swing/content/demande/DemandeUIModel.java | 8 +- .../swing/content/demande/QuantitiesByRangeUI.css | 22 ++- .../swing/content/demande/QuantitiesByRangeUI.jaxx | 30 +++- .../demande/QuantitiesByRangeUIHandler.java | 127 +++++++++++++++-- .../content/demande/QuantitiesByRangeUIModel.java | 36 ++++- .../content/demande/actions/ArchiveAction.java | 3 + .../actions/ComputeQuantitiesByRangeAction.java | 67 ++++++--- .../content/demande/actions/SaveDemandeAction.java | 4 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 146 ++++++++++++++----- .../i18n/faxtomail-ui-swing_fr_FR.properties | 6 +- faxtomail-ui-web/pom.xml | 7 +- .../faxtomail/web/job/MailFilterJob.java | 43 ++++-- pom.xml | 2 +- 25 files changed, 676 insertions(+), 157 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.