branch develop-1.1.x updated (0259281 -> 247e0d8)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 0259281 [jgitflow-maven-plugin]updating poms for 1.1.11-SNAPSHOT development new ec1c179 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new ecb457e [jgitflow-maven-plugin]updating poms for branch'release/1.1.10' with non-snapshot versions new 0af7347 [jgitflow-maven-plugin]merging 'release/1.1.10' into 'master-1.1.x' new 6550708 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' new 247e0d8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 247e0d842992a1d458694fb34a48ebcc0e0d0277 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 4 10:48:46 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 6550708381c88fbc5c5606e6e686678a66d42ced Merge: ec1c179 0af7347 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 4 10:48:45 2016 +0100 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' commit ec1c17955b6682a812b1b132eb3fdf1291fd3ca2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 4 10:48:44 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 0af7347233e3f7634882c23a63ad4fd943d2a4bf Merge: 53d3372 ecb457e Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 4 10:48:39 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.1.10' into 'master-1.1.x' commit ecb457ea8e13327a8fd2a927e63f64bb16902118 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 4 10:46:38 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.10' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 ecb457ea8e13327a8fd2a927e63f64bb16902118 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 4 10:46:38 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.10' with non-snapshot versions --- faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index ab1aa4f..e7db452 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.10-SNAPSHOT</version> + <version>1.1.10</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 0ae3c12..29ee347 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.10-SNAPSHOT</version> + <version>1.1.10</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 6d1e98b..92fc888 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.10-SNAPSHOT</version> + <version>1.1.10</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 6f181b4..29d9a43 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.10-SNAPSHOT</version> + <version>1.1.10</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index bdd710f..1962925 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.10-SNAPSHOT</version> + <version>1.1.10</version> <packaging>pom</packaging> <name>FaxToMail</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 0af7347233e3f7634882c23a63ad4fd943d2a4bf Merge: 53d3372 ecb457e Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 4 10:48:39 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.1.10' into 'master-1.1.x' 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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 ec1c17955b6682a812b1b132eb3fdf1291fd3ca2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 4 10:48:44 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index 09cc630..e7db452 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.11-SNAPSHOT</version> + <version>1.1.10</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index eeb32b2..29ee347 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.11-SNAPSHOT</version> + <version>1.1.10</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 02b4142..92fc888 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.11-SNAPSHOT</version> + <version>1.1.10</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d4457c5..29d9a43 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.11-SNAPSHOT</version> + <version>1.1.10</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index e8cc3f6..1962925 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.11-SNAPSHOT</version> + <version>1.1.10</version> <packaging>pom</packaging> <name>FaxToMail</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 6550708381c88fbc5c5606e6e686678a66d42ced Merge: ec1c179 0af7347 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 4 10:48:45 2016 +0100 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 247e0d842992a1d458694fb34a48ebcc0e0d0277 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 4 10:48:46 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index e7db452..09cc630 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.10</version> + <version>1.1.11-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 29ee347..eeb32b2 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.10</version> + <version>1.1.11-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 92fc888..02b4142 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.10</version> + <version>1.1.11-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 29d9a43..d4457c5 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.10</version> + <version>1.1.11-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 1962925..e8cc3f6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.10</version> + <version>1.1.11-SNAPSHOT</version> <packaging>pom</packaging> <name>FaxToMail</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm