branch develop updated (cc4f0463 -> 7ce322dc)
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 cc4f0463 [jgitflow-maven-plugin]updating poms for 2.4.16-SNAPSHOT development new f3bd6757 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 1f98c82f [jgitflow-maven-plugin]updating poms for branch'release/2.4.15' with non-snapshot versions new 5edb4cd1 [jgitflow-maven-plugin]merging 'release/2.4.15' into 'master' new ed63f5d4 [jgitflow-maven-plugin]merging 'master' into 'develop' new 7ce322dc [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 7ce322dc232bb7c55f5a4ac042c6c7cc85ba3a32 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 17:47:47 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit ed63f5d49d26399cb8c683536f481e0a565425e4 Merge: f3bd6757 5edb4cd1 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 17:47:30 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit f3bd67571e98e8dcdb720a9662b1bbe99ecf4b07 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 17:47:24 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 5edb4cd1b1b11716d5fc0535dc3d2bb44b970422 Merge: cbb77cef 1f98c82f Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 17:47:00 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.15' into 'master' commit 1f98c82f58246a5bf54566a66e9365f411b5db9c Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 17:43:27 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.15' 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 1f98c82f58246a5bf54566a66e9365f411b5db9c Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 17:43:27 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.15' 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 3685ce8c..06ce2a1a 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.15-SNAPSHOT</version> + <version>2.4.15</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 1da78cb8..ef8a6d17 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.15-SNAPSHOT</version> + <version>2.4.15</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index fc39586c..0bff5214 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.15-SNAPSHOT</version> + <version>2.4.15</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 36dd96d7..35ea6ccc 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.15-SNAPSHOT</version> + <version>2.4.15</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index f91e9139..5a755f43 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.15-SNAPSHOT</version> + <version>2.4.15</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 5edb4cd1b1b11716d5fc0535dc3d2bb44b970422 Merge: cbb77cef 1f98c82f Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 17:47:00 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.15' into 'master' faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/ClientTopiaDao.java | 22 ++ faxtomail-service/pom.xml | 2 +- .../faxtomail/services/service/ClientService.java | 2 + .../services/service/ClientServiceImpl.java | 24 ++ faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 32 ++- .../content/pdfeditor/PDFEditorUIHandler.java | 2 +- .../ui/swing/content/search/SearchUIHandler.java | 35 ++- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 291 ++++++++++++--------- .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 + faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 278 insertions(+), 142 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 f3bd67571e98e8dcdb720a9662b1bbe99ecf4b07 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 17:47:24 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 f34d726b..06ce2a1a 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.16-SNAPSHOT</version> + <version>2.4.15</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index f9d6b5ce..ef8a6d17 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.16-SNAPSHOT</version> + <version>2.4.15</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 69e0f907..0bff5214 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.16-SNAPSHOT</version> + <version>2.4.15</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 458e9e8a..35ea6ccc 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.16-SNAPSHOT</version> + <version>2.4.15</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 38e7086f..5a755f43 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.16-SNAPSHOT</version> + <version>2.4.15</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 ed63f5d49d26399cb8c683536f481e0a565425e4 Merge: f3bd6757 5edb4cd1 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 17:47:30 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 7ce322dc232bb7c55f5a4ac042c6c7cc85ba3a32 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 17:47:47 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 06ce2a1a..f34d726b 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.15</version> + <version>2.4.16-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index ef8a6d17..f9d6b5ce 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.15</version> + <version>2.4.16-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 0bff5214..69e0f907 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.15</version> + <version>2.4.16-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 35ea6ccc..458e9e8a 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.15</version> + <version>2.4.16-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 5a755f43..38e7086f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.15</version> + <version>2.4.16-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