This is an automated email from the git hooks/post-receive script. New change to branch master-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 53d3372 Merge branch 'release/1.1.9' into master-1.1.x adds c8b67c9 [jgitflow-maven-plugin]updating poms for 1.1.10-SNAPSHOT development adds 1894941 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d4a51eb Merge branch 'master-1.1.x' into develop-1.1.x adds 3214d47 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds ea1e141 Dans les réponses, la liste déroulante des expéditeurs n'est plus filtrée (fixes #8054) adds e25bc94 - ajout du sujet dans l'email - correction des sujets mal formés refs #8053 adds 7a1da45 ajout de la colonne sujet (refs #8053) adds 1d67506 upgrade pom adds 34a28fd migration des emails non archivés (refs #8053) adds 4f1cf53 Merge branch 'feature/8053' into develop-1.1.x adds ac6be71 quand on quitte sans sauer, on met le modèle à non modifié (fixes #8069) adds ecb457e [jgitflow-maven-plugin]updating poms for branch'release/1.1.10' with non-snapshot versions adds 0af7347 [jgitflow-maven-plugin]merging 'release/1.1.10' into 'master-1.1.x' 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 +- .../faxtomail/persistence/entities/MailField.java | 4 +- .../src/main/resources/faxToMail.properties | 4 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 30153 -> 30210 bytes faxtomail-service/{README.txt => README.md} | 0 faxtomail-service/pom.xml | 2 +- .../faxtomail/services/DecoratorServiceImpl.java | 19 ++++ .../faxtomail/services/FaxToMailServiceUtils.java | 14 +++ .../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 + .../V1_1_10_734__add_subject_field_to_email.sql | 2 + .../services/service/EmailServiceTest.java | 14 +++ .../service/migration/FlywayMigrationTest.java | 4 +- .../README.txt => faxtomail-ui-swing/README.md | 0 faxtomail-ui-swing/pom.xml | 8 +- .../ui/swing/actions/OpenGroupedDemandAction.java | 8 +- .../ui/swing/actions/ShowDemandeAction.java | 2 +- .../ui/swing/content/demande/DemandeUIModel.java | 32 ++++-- .../content/pdfeditor/PDFEditorUIHandler.java | 4 + .../ui/swing/content/reply/ReplyFormUI.css | 5 +- .../ui/swing/content/reply/ReplyFormUI.jaxx | 7 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 10 +- .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 ++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 + README.txt => faxtomail-ui-web/README.md | 0 faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/job/MailFilterJob.java | 2 + .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + pom.xml | 24 +++-- 32 files changed, 379 insertions(+), 40 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/sqlserver/V1_1_10_734__add_subject_field_to_email.sql rename faxtomail-persistence/README.txt => faxtomail-ui-swing/README.md (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>.