This is an automated email from the git hooks/post-receive script. New change to branch master in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 67d6818 [jgitflow-maven-plugin]merging 'release/2.1.4' into 'master' adds 02a4944 [jgitflow-maven-plugin]updating poms for 2.1.5-SNAPSHOT development adds 21677fb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 906d4ee [jgitflow-maven-plugin]merging 'master' into 'develop' adds d46a8e0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds ee7e1f9 refs #8916 Ajout des attributs des dossiers pour figer le nombre d'éléments par page adds 859dfcd refs #8916 ajout de la configuration de dossier pour figer le nombre d'éléments par page adds 71bcfa4 fixes #8916 prise en compte de la configuration du dossier pour figer ou non le nombre d'éléments à afficher adds 40300ca montées de version adds 40099ed fixes #8917 Envoi d’un mail d’accusé de réception pour chaque document reçu adds c42fdf6 repassage à java 7 adds c5cf8ad correction migration sqlserver adds 23eb1ec [jgitflow-maven-plugin]updating poms for branch'release/2.2.0' with non-snapshot versions adds cdb4e8b [jgitflow-maven-plugin]merging 'release/2.2.0' into 'master' No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/ClientTopiaDao.java | 23 +++ faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32715 -> 33422 bytes faxtomail-service/pom.xml | 2 +- .../faxtomail/services/FaxToMailServiceUtils.java | 4 +- .../faxtomail/services/service/ClientService.java | 2 + .../services/service/ClientServiceImpl.java | 5 + .../faxtomail/services/service/EmailService.java | 2 +- .../services/service/EmailServiceImpl.java | 17 +- ...70106__add_nbelementtodisplay_in_mailfolder.sql | 5 + ..._add_acknowledgements_and_client_exceptions.sql | 27 +++ ...70106__add_nbelementtodisplay_in_mailfolder.sql | 6 + ..._add_acknowledgements_and_client_exceptions.sql | 31 ++++ faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/demande/DemandeListUI.css | 4 + .../content/demande/DemandeListUIHandler.java | 35 +++- .../swing/content/demande/DemandeListUIModel.java | 13 ++ faxtomail-ui-web/pom.xml | 28 ++- .../web/action/admin/ClientJsonAction.java | 63 +++++++ .../faxtomail/web/job/MailFilterJob.java | 91 ++++++--- faxtomail-ui-web/src/main/resources/log4j2.xml | 2 +- .../WEB-INF/content/admin/configuration-input.jsp | 205 ++++++++++++++++++--- faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml | 19 ++ .../web/HasUploadedFile.java => webapp/data.json} | 70 +++++-- .../src/main/webapp/js/configuration.js | 163 +++++++++++++--- pom.xml | 64 ++++++- 26 files changed, 755 insertions(+), 130 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_2_0_170106__add_nbelementtodisplay_in_mailfolder.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_2_0_170109__add_acknowledgements_and_client_exceptions.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_0_170106__add_nbelementtodisplay_in_mailfolder.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_0_170109__add_acknowledgements_and_client_exceptions.sql create mode 100644 faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ClientJsonAction.java copy faxtomail-ui-web/src/main/{java/com/franciaflex/faxtomail/web/HasUploadedFile.java => webapp/data.json} (50%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.