This is an automated email from the git hooks/post-receive script. New commit to branch master in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 84ef67ab4edec8e22b461456ff8c3cdd4d737a98 Merge: 3ccbb8d4 db5a6f9e Author: Jean Couteau <couteau@codelutin.com> Date: Thu Oct 8 11:29:12 2020 +0200 Merge branch 'release/2.5.1' .gitlab-ci.yml | 34 +-- faxtomail-persistence/pom.xml | 2 +- .../faxtomail/FaxToMailConfiguration.java | 8 + .../faxtomail/FaxToMailConfigurationOption.java | 14 + .../i18n/faxtomail-persistence_fr_FR.properties | 2 + faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 36985 -> 37113 bytes faxtomail-service/pom.xml | 8 +- .../faxtomail/services/FaxToMailServiceUtils.java | 8 + .../services/service/ClientServiceImpl.java | 36 ++- .../faxtomail/services/service/EmailService.java | 3 + .../services/service/EmailServiceImpl.java | 140 +++++----- .../services/service/MailFolderServiceImpl.java | 10 +- ...sql => V2_4_180607_1__addGeneratedPDFPages.sql} | 0 .../h2/V2_5_200319_1__add_faxFromNumber.sql | 6 + .../V2_4180607_1__addGeneratedPDFPages.sql | 18 -- .../V2_4_180607_1__addGeneratedPDFPages.sql | 18 ++ .../sqlserver/V2_5_200319_1__add_faxFromNumber.sql | 10 + faxtomail-ui-swing/pom.xml | 303 +-------------------- .../ui/swing/actions/ShowDemandeAction.java | 10 +- .../ui/swing/content/demande/DemandeListUI.css | 9 + .../ui/swing/content/demande/DemandeListUI.jaxx | 1 + .../ui/swing/content/demande/DemandeUIHandler.java | 5 +- .../ui/swing/content/demande/DemandesUI.css | 7 + .../ui/swing/content/demande/DemandesUI.jaxx | 3 + .../swing/content/demande/DemandesUIHandler.java | 13 +- .../demande/actions/OpenForwardFormAction.java | 6 + ...FormAction.java => OpenReplyAllFormAction.java} | 14 +- .../demande/actions/OpenReplyFormAction.java | 4 + .../actions/SaveAndOpenForwardFormAction.java | 6 + ...ion.java => SaveAndOpenReplyAllFormAction.java} | 15 +- .../actions/SaveAndOpenReplyFormAction.java | 12 +- .../demande/replies/DemandRepliesUIHandler.java | 1 + .../demande/replies/actions/OpenReplyAction.java | 6 +- .../content/demande/takenby/TakenByFormUI.jaxx | 2 +- .../ui/swing/content/reply/ReplyFormUI.jaxx | 2 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 25 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 129 +++++---- .../faxtomail/ui/swing/util/HTMLPane.java | 59 +++- .../i18n/faxtomail-ui-swing_fr_FR.properties | 5 +- faxtomail-ui-web/pom.xml | 13 +- .../faxtomail/web/FaxToMailInterceptor.java | 6 +- .../faxtomail/web/FaxToMailJsonResultSupport.java | 2 +- .../faxtomail/web/job/MailFilterJob.java | 55 +++- faxtomail-ui-web/src/main/resources/struts.xml | 4 +- .../WEB-INF/content/admin/configuration-input.jsp | 12 + faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml | 4 +- pom.xml | 78 +++--- 47 files changed, 548 insertions(+), 580 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.