branch develop updated (f504029 -> abb33ba)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from f504029 [jgitflow-maven-plugin]updating poms for 2.0.4-SNAPSHOT development new fa55328 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new f254df7 [jgitflow-maven-plugin]updating poms for branch'release/2.0.3' with non-snapshot versions new 7468c1b [jgitflow-maven-plugin]merging 'release/2.0.3' into 'master' new fa47a86 [jgitflow-maven-plugin]merging 'master' into 'develop' new abb33ba [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 abb33bab582f93cf98de67857c7a893c3f83868b Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 5 17:00:15 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit fa47a869a2f356fc61dba838f830b83f66cb27ac Merge: fa55328 7468c1b Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 5 17:00:15 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit fa5532847a77e5a36bbb54fa8425518a783e2d36 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 5 17:00:15 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 7468c1be8e1e6f36411bddb9394d8a6be4adb2b8 Merge: b9703f2 f254df7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 5 17:00:14 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.0.3' into 'master' commit f254df708694428f0fd0842cbdbcc0ccf306cddd Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 5 16:57:52 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.0.3' 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 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit f254df708694428f0fd0842cbdbcc0ccf306cddd Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 5 16:57:52 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.0.3' 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 570076a..9f33771 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 5898986..0b48f4f 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 8e57c29..ebda122 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>2.0.3-SNAPSHOT</version> + <version>2.0.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index b88897a..d8fb821 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>2.0.3-SNAPSHOT</version> + <version>2.0.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 2eb08e1..dbb74b1 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3</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 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 7468c1be8e1e6f36411bddb9394d8a6be4adb2b8 Merge: b9703f2 f254df7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 5 17:00:14 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.0.3' into 'master' faxtomail-persistence/pom.xml | 2 +- .../faxtomail/FaxToMailConfiguration.java | 4 + .../faxtomail/FaxToMailConfigurationOption.java | 7 + .../persistence/entities/EmailTopiaDao.java | 10 +- .../src/main/resources/faxToMail.properties | 3 +- .../i18n/faxtomail-persistence_fr_FR.properties | 1 + faxtomail-service/pom.xml | 7 +- .../src/license/THIRD-PARTY.properties | 4 +- .../faxtomail/services/FaxToMailServiceUtils.java | 59 +++++ .../services/service/ConfigurationServiceImpl.java | 5 + .../faxtomail/services/service/EmailService.java | 4 +- .../services/service/EmailServiceImpl.java | 125 +++++----- .../services/service/EmailServiceTest.java | 256 ++++++++++++++------- .../services/service/InitTestDataImpl.java | 20 +- .../src/test/resources/emails/test6863.eml | 8 + .../src/test/resources/emails/test7716.eml | 31 +++ .../src/test/resources/emails/test7740.eml | 24 ++ .../src/test/resources/emails/test7855.eml | 24 ++ faxtomail-ui-swing/pom.xml | 8 +- .../ui/swing/content/demande/DemandeUI.css | 4 - .../ui/swing/content/demande/DemandeUI.jaxx | 6 +- .../ui/swing/content/demande/DemandeUIHandler.java | 4 +- .../ui/swing/content/demande/DemandeUIModel.java | 40 +++- .../actions/ComputeQuantitiesByRangeAction.java | 22 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 20 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 181 ++++++++++----- faxtomail-ui-web/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 4 +- .../faxtomail/web/job/MailFilterJob.java | 2 +- pom.xml | 25 +- 30 files changed, 646 insertions(+), 266 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 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit fa5532847a77e5a36bbb54fa8425518a783e2d36 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 5 17:00:15 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 c148b1c..9f33771 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.0.4-SNAPSHOT</version> + <version>2.0.3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 4793685..0b48f4f 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.0.4-SNAPSHOT</version> + <version>2.0.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 0aaaedd..ebda122 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>2.0.4-SNAPSHOT</version> + <version>2.0.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index c89cad3..d8fb821 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>2.0.4-SNAPSHOT</version> + <version>2.0.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 67a96c8..dbb74b1 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.0.4-SNAPSHOT</version> + <version>2.0.3</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 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit fa47a869a2f356fc61dba838f830b83f66cb27ac Merge: fa55328 7468c1b Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 5 17:00:15 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit abb33bab582f93cf98de67857c7a893c3f83868b Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 5 17:00:15 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 9f33771..c148b1c 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.0.3</version> + <version>2.0.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 0b48f4f..4793685 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.0.3</version> + <version>2.0.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index ebda122..0aaaedd 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>2.0.3</version> + <version>2.0.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d8fb821..c89cad3 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>2.0.3</version> + <version>2.0.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index dbb74b1..67a96c8 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.0.3</version> + <version>2.0.4-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