branch develop updated (f367674e -> 3a5e53b3)
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 f367674e [jgitflow-maven-plugin]updating poms for 2.4.19-SNAPSHOT development new f75ed92a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new d07032bd [jgitflow-maven-plugin]updating poms for branch'release/2.4.18' with non-snapshot versions new 8724a610 [jgitflow-maven-plugin]merging 'release/2.4.18' into 'master' new 5d55b7c7 [jgitflow-maven-plugin]merging 'master' into 'develop' new 3a5e53b3 [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 3a5e53b32eac170740ef6f6e35554e9c05b9d937 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:59:15 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 5d55b7c7cc9db15b495117ac10203ca67bee0308 Merge: f75ed92a 8724a610 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:59:15 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit f75ed92ac9410c06cd16d82d45bbbda0e190d189 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:59:14 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 8724a6107cbbcdc37a8e10fecf9761b8b5a28ca0 Merge: 86ebd74b d07032bd Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:59:13 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.18' into 'master' commit d07032bd0af4373ad621903349a1d4a9af3900e3 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:57:29 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.18' 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 d07032bd0af4373ad621903349a1d4a9af3900e3 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:57:29 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.18' 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 ab730abb..3d887f12 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.18</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 3aa93a5a..23a475ae 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.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 2da14ac3..77117061 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.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 902b7d6c..ade0b3fe 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.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index bbcac2aa..185b7c2f 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.18</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 8724a6107cbbcdc37a8e10fecf9761b8b5a28ca0 Merge: 86ebd74b d07032bd Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:59:13 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.18' into 'master' faxtomail-persistence/pom.xml | 2 +- .../faxtomail/beans/QuantitiesByRange.java | 25 ++-- .../persistence/entities/EmailTopiaDao.java | 155 ++++++++++++++++++++- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 36261 -> 36986 bytes faxtomail-service/pom.xml | 2 +- .../faxtomail/services/service/EmailService.java | 7 + .../services/service/EmailServiceImpl.java | 96 +++++++------ .../h2/V2_4180607_1__addGeneratedPDFPages.sql | 17 +++ .../V2_4180607_1__addGeneratedPDFPages.sql | 18 +++ .../services/service/EmailServiceTest.java | 4 +- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/demande/DemandeUIHandler.java | 4 +- .../ui/swing/content/demande/DemandeUIModel.java | 8 +- .../swing/content/demande/QuantitiesByRangeUI.css | 22 ++- .../swing/content/demande/QuantitiesByRangeUI.jaxx | 30 +++- .../demande/QuantitiesByRangeUIHandler.java | 127 +++++++++++++++-- .../content/demande/QuantitiesByRangeUIModel.java | 36 ++++- .../content/demande/actions/ArchiveAction.java | 3 + .../actions/ComputeQuantitiesByRangeAction.java | 67 ++++++--- .../content/demande/actions/SaveDemandeAction.java | 4 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 146 ++++++++++++++----- .../i18n/faxtomail-ui-swing_fr_FR.properties | 6 +- faxtomail-ui-web/pom.xml | 7 +- .../faxtomail/web/job/MailFilterJob.java | 43 ++++-- pom.xml | 2 +- 25 files changed, 676 insertions(+), 157 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 f75ed92ac9410c06cd16d82d45bbbda0e190d189 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:59:14 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 9507eaa8..3d887f12 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.19-SNAPSHOT</version> + <version>2.4.18</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index cf1235c1..23a475ae 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.19-SNAPSHOT</version> + <version>2.4.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 2f950d93..77117061 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.19-SNAPSHOT</version> + <version>2.4.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 6d30bda2..ade0b3fe 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.19-SNAPSHOT</version> + <version>2.4.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 52033ccd..185b7c2f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.19-SNAPSHOT</version> + <version>2.4.18</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 5d55b7c7cc9db15b495117ac10203ca67bee0308 Merge: f75ed92a 8724a610 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:59:15 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 3a5e53b32eac170740ef6f6e35554e9c05b9d937 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:59:15 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 3d887f12..9507eaa8 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</version> + <version>2.4.19-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 23a475ae..cf1235c1 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</version> + <version>2.4.19-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 77117061..2f950d93 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</version> + <version>2.4.19-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index ade0b3fe..6d30bda2 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</version> + <version>2.4.19-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 185b7c2f..52033ccd 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.18</version> + <version>2.4.19-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