branch develop updated (7ac547dc -> a224b1de)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 7ac547dc [jgitflow-maven-plugin]updating poms for 2.4.18-SNAPSHOT development new 9d43dc01 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 89e01beb [jgitflow-maven-plugin]updating poms for branch'release/2.4.17' with non-snapshot versions new 86ebd74b [jgitflow-maven-plugin]merging 'release/2.4.17' into 'master' new 17628d7f [jgitflow-maven-plugin]merging 'master' into 'develop' new a224b1de [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 a224b1de9057fb8440a654cae754b464cb8c91ca Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 12 21:10:49 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 17628d7f186246d19deaa501ca2bb5cb65944ef7 Merge: 9d43dc01 86ebd74b Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 12 21:10:48 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 9d43dc01b96d075fc83204717dd4462ee51560d6 Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 12 21:10:48 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 86ebd74b69a133a80bd0f47023439c71411eab3c Merge: b06a2a50 89e01beb Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 12 21:10:47 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.17' into 'master' commit 89e01beb1d01f69e13b4645ede259f33f66330bf Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 12 21:09:11 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.17' 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit 89e01beb1d01f69e13b4645ede259f33f66330bf Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 12 21:09:11 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.17' 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 d8077550..a2189d37 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.4.17-SNAPSHOT</version> + <version>2.4.17</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 7e467887..1d04eb15 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.4.17-SNAPSHOT</version> + <version>2.4.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 3af7f95d..b825b21a 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.4.17-SNAPSHOT</version> + <version>2.4.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 7d7e6b86..24bf575e 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.4.17-SNAPSHOT</version> + <version>2.4.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index b722686a..bf35ffe9 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.17-SNAPSHOT</version> + <version>2.4.17</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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit 86ebd74b69a133a80bd0f47023439c71411eab3c Merge: b06a2a50 89e01beb Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 12 21:10:47 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.17' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 7 ++- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 61 +++++++++++++++++++--- .../faxtomail/ui/swing/util/JImagePanel.java | 16 ++++-- .../i18n/faxtomail-ui-swing_fr_FR.properties | 3 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 79 insertions(+), 18 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit 9d43dc01b96d075fc83204717dd4462ee51560d6 Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 12 21:10:48 2018 +0200 [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 ab730abb..a2189d37 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.4.18-SNAPSHOT</version> + <version>2.4.17</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 3aa93a5a..1d04eb15 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.4.18-SNAPSHOT</version> + <version>2.4.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 2da14ac3..b825b21a 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.4.18-SNAPSHOT</version> + <version>2.4.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 91ebfe7f..24bf575e 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.4.18-SNAPSHOT</version> + <version>2.4.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index bbcac2aa..bf35ffe9 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.18-SNAPSHOT</version> + <version>2.4.17</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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit 17628d7f186246d19deaa501ca2bb5cb65944ef7 Merge: 9d43dc01 86ebd74b Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 12 21:10:48 2018 +0200 [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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit a224b1de9057fb8440a654cae754b464cb8c91ca Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 12 21:10:49 2018 +0200 [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 a2189d37..ab730abb 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.4.17</version> + <version>2.4.18-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 1d04eb15..3aa93a5a 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.4.17</version> + <version>2.4.18-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index b825b21a..2da14ac3 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.4.17</version> + <version>2.4.18-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 24bf575e..91ebfe7f 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.4.17</version> + <version>2.4.18-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index bf35ffe9..bbcac2aa 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.17</version> + <version>2.4.18-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