This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 4f1cf534cb1981fa690b72daf5629a88061ecbc5 Merge: ea1e141 34a28fd Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 3 16:16:22 2016 +0100 Merge branch 'feature/8053' into develop-1.1.x faxtomail-ui-web/README.txt => README.md | 0 .../README.txt => faxtomail-persistence/README.md | 0 .../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/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 | 6 ++ .../ui/swing/actions/OpenGroupedDemandAction.java | 8 +- .../ui/swing/actions/ShowDemandeAction.java | 2 +- .../ui/swing/content/demande/DemandeUIModel.java | 32 ++++-- .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 ++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 + README.txt => faxtomail-ui-web/README.md | 0 .../faxtomail/web/job/MailFilterJob.java | 2 + .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + pom.xml | 22 ++-- 24 files changed, 337 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.