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 892ef1a9b82b99fa062d02f74e05d34ecabd2623 Merge: dd2c22ad d458b2cb Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:10:56 2018 +0200 Merge branch 'feature/calculatrice' into develop .../faxtomail/beans/QuantitiesByRange.java | 25 ++-- .../persistence/entities/EmailTopiaDao.java | 155 ++++++++++++++++++++- .../services/service/EmailServiceTest.java | 4 +- .../swing/content/demande/QuantitiesByRangeUI.css | 22 ++- .../swing/content/demande/QuantitiesByRangeUI.jaxx | 30 +++- .../demande/QuantitiesByRangeUIHandler.java | 127 +++++++++++++++-- .../content/demande/QuantitiesByRangeUIModel.java | 36 ++++- .../actions/ComputeQuantitiesByRangeAction.java | 67 ++++++--- .../content/demande/actions/SaveDemandeAction.java | 4 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 6 +- 10 files changed, 416 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.