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 cdb4e8bdaa31087401a6405ac024905daa6460b2 Merge: 67d6818 23eb1ec Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 26 11:10:14 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.2.0' into 'master' 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 ++ faxtomail-ui-web/src/main/webapp/data.json | 74 ++++++++ .../src/main/webapp/js/configuration.js | 163 +++++++++++++--- pom.xml | 64 ++++++- 26 files changed, 776 insertions(+), 113 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.