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 7febca8f599bf537d4e7840a09c0ff993329af3d Merge: 92b4a8a 282973c Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 16 09:50:17 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.3' into 'master' faxtomail-persistence/pom.xml | 2 +- .../franciaflex/faxtomail/beans/Quantities.java | 57 +++++ .../faxtomail/beans/QuantitiesByRange.java | 56 +++++ .../persistence/entities/EmailFilter.java | 27 +++ .../persistence/entities/EmailTopiaDao.java | 83 ++++++- .../faxtomail/persistence/entities/MailField.java | 8 +- .../src/main/xmi/faxtomail.properties | 4 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 33422 -> 35324 bytes faxtomail-service/pom.xml | 2 +- .../faxtomail/services/FaxToMailServiceUtils.java | 13 ++ .../faxtomail/services/service/EmailService.java | 5 +- .../services/service/EmailServiceImpl.java | 38 ++-- .../exceptions/AlreadyLockedMailException.java | 10 +- ...14__add_colorize_invalid_demands_on_folders.sql | 7 + .../h2/V2_2_3_170313_1__add_last_printing_user.sql | 18 ++ ...3_2__add_printActionEqualTakeOnlyIfNotTaken.sql | 4 + ..._170314__move_invalidformactions_to_folders.sql | 10 + .../h2/V2_2_3_170315__add_last_printing_date.sql | 13 ++ ...14__add_colorize_invalid_demands_on_folders.sql | 12 + .../V2_2_3_170313_1__add_last_printing_user.sql | 19 ++ ...3_2__add_printActionEqualTakeOnlyIfNotTaken.sql | 6 + ..._170314__move_invalidformactions_to_folders.sql | 15 ++ .../V2_2_3_170315__add_last_printing_date.sql | 14 ++ .../services/service/EmailServiceTest.java | 13 +- faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 22 +- .../ui/swing/actions/ShowDemandeAction.java | 25 ++- .../content/demande/DemandeListUIHandler.java | 39 +++- .../ui/swing/content/demande/DemandeUIHandler.java | 1 + .../ui/swing/content/demande/DemandeUIModel.java | 91 ++++---- .../swing/content/demande/DemandesUIHandler.java | 10 +- .../demande/QuantitiesByRangeUIHandler.java | 2 +- .../demande/actions/ArchiveFromListAction.java | 2 +- .../actions/ComputeQuantitiesByRangeAction.java | 27 ++- .../demande/actions/LoadFolderEmailsAction.java | 2 + .../OpenMailFolderChooserFromListAction.java | 2 +- .../demande/replies/DemandRepliesUIHandler.java | 18 +- .../ui/swing/content/pdfeditor/PDFEditorUI.jaxx | 2 +- .../content/pdfeditor/PDFEditorUIHandler.java | 10 +- .../print/AttachmentToPrintChooserUIHandler.java | 1 + .../ui/swing/content/reply/ReplyFormUIHandler.java | 17 +- .../content/reply/actions/SenderChangedAction.java | 2 +- .../content/search/SearchToGroupUIHandler.java | 12 +- .../util/AbstractFaxToMailDemandListHandler.java | 17 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 27 ++- .../faxtomail/ui/swing/util/DemandeTableModel.java | 12 + .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 47 +++- .../i18n/faxtomail-ui-swing_fr_FR.properties | 6 + faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/action/DemandDetailAction.java | 17 +- .../faxtomail/web/action/SearchAction.java | 6 + .../faxtomail/web/job/MailFilterJob.java | 32 +-- .../i18n/faxtomail-ui-web_fr_FR.properties | 2 + faxtomail-ui-web/src/main/resources/log4j2.xml | 2 +- .../WEB-INF/content/admin/configuration-input.jsp | 246 +++++++++++++++------ faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml | 2 +- faxtomail-ui-web/src/main/webapp/css/faxtomail.css | 4 + .../src/main/webapp/js/configuration.js | 99 +++++++-- pom.xml | 2 +- 59 files changed, 970 insertions(+), 276 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.