branch develop updated (2d1ee76e -> 334f9a8c)
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 2d1ee76e [jgitflow-maven-plugin]updating poms for 2.4.14-SNAPSHOT development new 2bbfc190 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 2fb9f29f [jgitflow-maven-plugin]updating poms for branch'release/2.4.13' with non-snapshot versions new 242721e5 [jgitflow-maven-plugin]merging 'release/2.4.13' into 'master' new 2b74726a [jgitflow-maven-plugin]merging 'master' into 'develop' new 334f9a8c [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 334f9a8c7665c0b66d0aa4e5aca115fda44fad30 Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 5 17:35:27 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 2b74726aa8002f72537a7ba1085d2ca75932bbb3 Merge: 2bbfc190 242721e5 Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 5 17:35:27 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 2bbfc190e5a12d22838a477613497cb453f41580 Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 5 17:35:27 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 242721e58eb59f1ef7647dd2b7a311f5f34ee654 Merge: 296e1646 2fb9f29f Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 5 17:35:26 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.13' into 'master' commit 2fb9f29fb12113a3d9eb1d6f85104643a10b0764 Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 5 17:33:15 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.13' 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 2fb9f29fb12113a3d9eb1d6f85104643a10b0764 Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 5 17:33:15 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.13' 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 f42dfa02..d4306b68 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.13-SNAPSHOT</version> + <version>2.4.13</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index f7f50d4a..b6f68494 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.13-SNAPSHOT</version> + <version>2.4.13</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 39c8bd34..9f06d4e8 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.13-SNAPSHOT</version> + <version>2.4.13</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 99fd774f..f52b8b86 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.13-SNAPSHOT</version> + <version>2.4.13</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 2ea49470..0abb9820 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.13-SNAPSHOT</version> + <version>2.4.13</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 242721e58eb59f1ef7647dd2b7a311f5f34ee654 Merge: 296e1646 2fb9f29f Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 5 17:35:26 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.13' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../swing/content/demande/DemandeListUIModel.java | 19 +++++++++++-- .../demande/actions/OpenReplyFormAction.java | 1 + .../actions/SaveAndOpenReplyFormAction.java | 1 + .../ui/swing/content/reply/ReplyFormUIHandler.java | 32 ++++++++++++++++++++++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ faxtomail-ui-web/pom.xml | 2 +- pom.xml | 4 +-- 10 files changed, 59 insertions(+), 8 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 2bbfc190e5a12d22838a477613497cb453f41580 Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 5 17:35:27 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 0ca9789a..d4306b68 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.14-SNAPSHOT</version> + <version>2.4.13</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 5dafcfcb..b6f68494 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.14-SNAPSHOT</version> + <version>2.4.13</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 5f6b7832..9f06d4e8 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.14-SNAPSHOT</version> + <version>2.4.13</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 9cc38962..f52b8b86 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.14-SNAPSHOT</version> + <version>2.4.13</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 03bb34a8..0abb9820 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.14-SNAPSHOT</version> + <version>2.4.13</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 2b74726aa8002f72537a7ba1085d2ca75932bbb3 Merge: 2bbfc190 242721e5 Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 5 17:35:27 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 334f9a8c7665c0b66d0aa4e5aca115fda44fad30 Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 5 17:35:27 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 d4306b68..0ca9789a 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.13</version> + <version>2.4.14-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index b6f68494..5dafcfcb 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.13</version> + <version>2.4.14-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 9f06d4e8..5f6b7832 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.13</version> + <version>2.4.14-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index f52b8b86..9cc38962 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.13</version> + <version>2.4.14-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 0abb9820..03bb34a8 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.13</version> + <version>2.4.14-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