branch develop-1.1.x updated (7331997 -> 8360c36)
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 7331997 [jgitflow-maven-plugin]updating poms for 1.1.7-SNAPSHOT development new a71757c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 5d36117 [jgitflow-maven-plugin]updating poms for branch'release/1.1.6' with non-snapshot versions new e1adac4 Merge branch 'release/1.1.6' into master-1.1.x new 1427b52 Merge branch 'master-1.1.x' into develop-1.1.x new 8360c36 [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 8360c363200f8a8b3e329ed01e8fd9bafef6554d Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 17:11:08 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 1427b52e0999506bb4e4b73d36a6de4e68612c4a Merge: a71757c e1adac4 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 17:11:08 2015 +0100 Merge branch 'master-1.1.x' into develop-1.1.x commit a71757c37a45275a279b3028e33e72e84a7a423c Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 17:11:08 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e1adac4775e6834fe36a339f00c873c0cfa31655 Merge: 1e33e6c 5d36117 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 17:11:03 2015 +0100 Merge branch 'release/1.1.6' into master-1.1.x commit 5d36117ddda61bddbd21068b9a11570de75753e1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 17:08:39 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.6' 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 5d36117ddda61bddbd21068b9a11570de75753e1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 17:08:39 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.6' 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 89e9afa..7d49b30 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.6-SNAPSHOT</version> + <version>1.1.6</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 6efb6bf..4a4e20b 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.6-SNAPSHOT</version> + <version>1.1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index b28ef8c..7904d2b 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.6-SNAPSHOT</version> + <version>1.1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 34ac334..e5218c6 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.6-SNAPSHOT</version> + <version>1.1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 74fe516..cd0691b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.6-SNAPSHOT</version> + <version>1.1.6</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 e1adac4775e6834fe36a339f00c873c0cfa31655 Merge: 1e33e6c 5d36117 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 17:11:03 2015 +0100 Merge branch 'release/1.1.6' into master-1.1.x faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../faxtomail/services/service/EmailService.java | 4 +- .../services/service/EmailServiceImpl.java | 81 ++++++------ faxtomail-ui-swing/pom.xml | 2 +- .../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 | 38 ++++-- .../ui/swing/content/reply/ReplyFormUIHandler.java | 15 ++- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 136 +++++++++++++-------- faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/job/MailFilterJob.java | 2 +- pom.xml | 2 +- 14 files changed, 182 insertions(+), 118 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 a71757c37a45275a279b3028e33e72e84a7a423c Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 17:11:08 2015 +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 af439e6..7d49b30 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.7-SNAPSHOT</version> + <version>1.1.6</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 221376c..4a4e20b 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.7-SNAPSHOT</version> + <version>1.1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index ccb41e1..7904d2b 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.7-SNAPSHOT</version> + <version>1.1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index ae27a3b..e5218c6 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.7-SNAPSHOT</version> + <version>1.1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 1ae0401..cd0691b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.7-SNAPSHOT</version> + <version>1.1.6</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 1427b52e0999506bb4e4b73d36a6de4e68612c4a Merge: a71757c e1adac4 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 17:11:08 2015 +0100 Merge branch '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 8360c363200f8a8b3e329ed01e8fd9bafef6554d Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 17:11:08 2015 +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 7d49b30..af439e6 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.6</version> + <version>1.1.7-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 4a4e20b..221376c 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.6</version> + <version>1.1.7-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 7904d2b..ccb41e1 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.6</version> + <version>1.1.7-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index e5218c6..ae27a3b 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.6</version> + <version>1.1.7-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index cd0691b..1ae0401 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.6</version> + <version>1.1.7-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