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 952abfb [jgitflow-maven-plugin]merging 'release/2.0.3' into 'master' adds 99a8a3f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 61e2e49 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 5f3c832 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 500d3d9 ajout du filtre sur la colonne subject (fixes #8103) adds e6e878a Dans les réponses, la liste déroulante des expéditeurs n'est plus filtrée (fixes #8054) adds 14be55c - ajout du sujet dans l'email - correction des sujets mal formés refs #8053 adds e633a19 ajout de la colonne sujet (refs #8053) adds 45d1d9a upgrade pom adds 0966094 migration des emails non archivés (refs #8053) adds c9b302b fix merge adds 0adf241 upgrade i18n adds 1d36b80 modification des signatures : configurées par domaine au lieu de par utilisateur (refs #8258) adds 5884cf9 config des signatures dans l'admin (refs #8258) adds e2c8061 on ajoute automatiquement la signature du nom de domaine de l'adresse de l'expéditeur au début du mail (remplacée si l'utilisateur change d'adresse expéditeur) (fixes #8258) adds f2d4db6 ajout de tests adds b8a2fce add deprecated adds f6f5d22 prise en compte des demandes creees manuellement (fixes #8258) adds d152174 upgrade pom + add license header adds 84c3588 [jgitflow-maven-plugin]updating poms for 2.1 branch with snapshot versions adds 924d70c [jgitflow-maven-plugin]updating poms for branch'release/2.1' with non-snapshot versions adds 86bf18c [jgitflow-maven-plugin]merging 'release/2.1' into 'master' No new revisions were added by this update. Summary of changes: faxtomail-ui-web/README.txt => README.md | 0 .../README.txt => faxtomail-persistence/README.md | 0 faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailFilter.java | 14 ++ .../persistence/entities/EmailTopiaDao.java | 11 ++ .../faxtomail/persistence/entities/MailField.java | 4 +- .../src/main/resources/faxToMail.properties | 3 +- .../src/main/xmi/faxtomail.properties | 5 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32762 -> 32715 bytes faxtomail-service/{README.txt => README.md} | 0 faxtomail-service/pom.xml | 2 +- .../faxtomail/services/DecoratorServiceImpl.java | 19 +++ .../faxtomail/services/FaxToMailServiceUtils.java | 19 +++ .../services/service/ConfigurationService.java | 13 +- .../services/service/ConfigurationServiceImpl.java | 89 ++++++++++- .../faxtomail/services/service/EmailService.java | 3 +- .../services/service/EmailServiceImpl.java | 58 +++++-- .../services/service/LdapServiceImpl.java | 1 - .../services/service/ReferentielServiceImpl.java | 2 +- .../faxtomail/services/service/UserService.java | 4 - .../services/service/UserServiceImpl.java | 52 ------ .../services/service/ldap/LdapServiceMock.java | 1 - .../h2/V1_1_10_735__subject_migration.java | 120 ++++++++++++++ .../sqlserver/V1_1_10_735__subject_migration.java | 119 ++++++++++++++ .../h2/V1_1_10_734__add_subject_field_to_email.sql | 2 + ..._user_signings_and_add_signings_for_domains.sql | 16 ++ .../V1_1_10_734__add_subject_field_to_email.sql | 2 + ..._user_signings_and_add_signings_for_domains.sql | 18 +++ .../services/FaxToMailServiceUtilsTest.java | 68 ++++++++ .../services/service/ClientServiceTest.java | 4 +- .../service/migration/FlywayMigrationTest.java | 4 +- .../README.txt => faxtomail-ui-swing/README.md | 0 faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/FaxToMailUIContext.java | 10 +- .../ui/swing/actions/ShowDemandeAction.java | 2 +- .../content/attachment/AttachmentEditorUI.jaxx | 4 +- .../attachment/AttachmentEditorUIHandler.java | 2 +- .../swing/content/attachment/ButtonAttachment.java | 2 +- .../content/demande/DemandeListTableFilter.java | 4 + .../content/demande/DemandeListUIHandler.java | 4 + .../ui/swing/content/demande/DemandeUIModel.java | 32 +++- .../actions/SaveAndOpenReplyFormAction.java | 10 +- .../demande/demandgroup/ButtonEmailGroup.java | 2 +- .../content/demande/demandgroup/DemandGroupUI.jaxx | 4 +- .../demande/demandgroup/DemandGroupUIHandler.java | 2 +- .../actions/OpenGroupedDemandAction.java | 2 +- .../content/demande/history/ButtonHistory.java | 2 +- .../content/demande/history/HistoryListUI.jaxx | 4 +- .../demande/history/HistoryListUIHandler.java | 2 +- .../demande/replies/ButtonDemandReplies.java | 2 +- .../content/demande/replies/DemandRepliesUI.jaxx | 4 +- .../demande/replies/DemandRepliesUIHandler.java | 2 +- .../ui/swing/content/reply/ReplyFormUI.css | 42 +---- .../ui/swing/content/reply/ReplyFormUI.jaxx | 47 +----- .../ui/swing/content/reply/ReplyFormUIHandler.java | 129 +++++++++++---- .../ui/swing/content/reply/ReplyFormUIModel.java | 28 ++-- .../ui/swing/content/reply/SigningSettingsUI.css | 95 ----------- .../ui/swing/content/reply/SigningSettingsUI.jaxx | 101 ------------ .../content/reply/SigningSettingsUIHandler.java | 178 --------------------- .../content/reply/SigningSettingsUIModel.java | 152 ------------------ .../content/reply/actions/DeleteSigningAction.java | 94 ----------- .../content/reply/actions/NewSigningAction.java | 84 ---------- .../swing/content/reply/actions/ReplyAction.java | 17 +- .../content/reply/actions/SaveSigningAction.java | 74 --------- ...ettingsAction.java => SenderChangedAction.java} | 49 +++--- .../reply/actions/SetDefaultSigningAction.java | 74 --------- .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 + .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 3 - .../ui/swing/util/data/DataConnection.java | 45 +++--- .../faxtomail/ui/swing/util/data/Handler.java | 58 +++++++ .../{ => toolbar}/AbstractToolbarPopupButton.java | 3 +- .../{ => toolbar}/AbstractToolbarPopupHandler.java | 3 +- .../util/{ => toolbar}/AbstractToolbarPopupUI.css | 0 .../util/{ => toolbar}/AbstractToolbarPopupUI.jaxx | 0 .../i18n/faxtomail-ui-swing_fr_FR.properties | 25 +-- README.txt => faxtomail-ui-web/README.md | 0 faxtomail-ui-web/pom.xml | 2 +- .../web/action/admin/ConfigurationAction.java | 16 +- .../faxtomail/web/job/MailFilterJob.java | 5 +- .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 64 +++++++- .../src/main/webapp/js/configuration.js | 103 ++++++++++++ pom.xml | 14 +- 83 files changed, 1096 insertions(+), 1169 deletions(-) rename faxtomail-ui-web/README.txt => README.md (100%) rename faxtomail-ui-swing/README.txt => faxtomail-persistence/README.md (100%) rename faxtomail-service/{README.txt => README.md} (100%) create mode 100644 faxtomail-service/src/main/java/db/migration/h2/V1_1_10_735__subject_migration.java create mode 100644 faxtomail-service/src/main/java/db/migration/sqlserver/V1_1_10_735__subject_migration.java create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V1_1_10_734__add_subject_field_to_email.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_0_4_160413__remove_user_signings_and_add_signings_for_domains.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V1_1_10_734__add_subject_field_to_email.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_0_4_160413__remove_user_signings_and_add_signings_for_domains.sql create mode 100644 faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtilsTest.java rename faxtomail-persistence/README.txt => faxtomail-ui-swing/README.md (100%) delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUI.css delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUI.jaxx delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUIHandler.java delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUIModel.java delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/DeleteSigningAction.java delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/NewSigningAction.java delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SaveSigningAction.java rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/{OpenSigningSettingsAction.java => SenderChangedAction.java} (52%) delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SetDefaultSigningAction.java copy faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/BrandsForDomainImpl.java => faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/data/DataConnection.java (50%) create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/data/Handler.java rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/{ => toolbar}/AbstractToolbarPopupButton.java (97%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/{ => toolbar}/AbstractToolbarPopupHandler.java (97%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/{ => toolbar}/AbstractToolbarPopupUI.css (100%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/{ => toolbar}/AbstractToolbarPopupUI.jaxx (100%) rename README.txt => faxtomail-ui-web/README.md (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.