branch develop updated (22d513d -> fa9c79c)
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 22d513d [jgitflow-maven-plugin]updating poms for 2.2.1-SNAPSHOT development new b07aaae [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 23eb1ec [jgitflow-maven-plugin]updating poms for branch'release/2.2.0' with non-snapshot versions new cdb4e8b [jgitflow-maven-plugin]merging 'release/2.2.0' into 'master' new 61af8a5 [jgitflow-maven-plugin]merging 'master' into 'develop' new fa9c79c [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 fa9c79c9005018bc99ed20b2279bd7a3f4908361 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 26 11:10:16 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 61af8a5d4e165d59dc737c7f8a33578f4b663495 Merge: b07aaae cdb4e8b Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 26 11:10:15 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b07aaae3e88d8a386beaa0ea03c39d767f520c42 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 26 11:10:15 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit cdb4e8bdaa31087401a6405ac024905daa6460b2 Merge: 67d6818 23eb1ec Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 26 11:10:14 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.2.0' into 'master' commit 23eb1ec8e64a6de203df2fbd295f18cfc4f41b61 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 26 11:08:26 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.2.0' 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 23eb1ec8e64a6de203df2fbd295f18cfc4f41b61 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 26 11:08:26 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.2.0' 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 6c12bd7..96de52b 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.2.0-SNAPSHOT</version> + <version>2.2.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 57fbbd8..a1ac054 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.2.0-SNAPSHOT</version> + <version>2.2.0</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index d1084e5..5f6d0d5 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.2.0-SNAPSHOT</version> + <version>2.2.0</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 75ca1fb..d6a82f0 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.2.0-SNAPSHOT</version> + <version>2.2.0</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 361b623..911e0dd 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2.0</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 cdb4e8bdaa31087401a6405ac024905daa6460b2 Merge: 67d6818 23eb1ec Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 26 11:10:14 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.2.0' into 'master' faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/ClientTopiaDao.java | 23 +++ faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32715 -> 33422 bytes faxtomail-service/pom.xml | 2 +- .../faxtomail/services/FaxToMailServiceUtils.java | 4 +- .../faxtomail/services/service/ClientService.java | 2 + .../services/service/ClientServiceImpl.java | 5 + .../faxtomail/services/service/EmailService.java | 2 +- .../services/service/EmailServiceImpl.java | 17 +- ...70106__add_nbelementtodisplay_in_mailfolder.sql | 5 + ..._add_acknowledgements_and_client_exceptions.sql | 27 +++ ...70106__add_nbelementtodisplay_in_mailfolder.sql | 6 + ..._add_acknowledgements_and_client_exceptions.sql | 31 ++++ faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/demande/DemandeListUI.css | 4 + .../content/demande/DemandeListUIHandler.java | 35 +++- .../swing/content/demande/DemandeListUIModel.java | 13 ++ faxtomail-ui-web/pom.xml | 28 ++- .../web/action/admin/ClientJsonAction.java | 63 +++++++ .../faxtomail/web/job/MailFilterJob.java | 91 ++++++--- faxtomail-ui-web/src/main/resources/log4j2.xml | 2 +- .../WEB-INF/content/admin/configuration-input.jsp | 205 ++++++++++++++++++--- faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml | 19 ++ faxtomail-ui-web/src/main/webapp/data.json | 74 ++++++++ .../src/main/webapp/js/configuration.js | 163 +++++++++++++--- pom.xml | 64 ++++++- 26 files changed, 776 insertions(+), 113 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 b07aaae3e88d8a386beaa0ea03c39d767f520c42 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 26 11:10:15 2017 +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 0945486..96de52b 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.2.1-SNAPSHOT</version> + <version>2.2.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 3d5caf2..a1ac054 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.2.1-SNAPSHOT</version> + <version>2.2.0</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 8330309..5f6d0d5 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.2.1-SNAPSHOT</version> + <version>2.2.0</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 4ca980f..d6a82f0 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.2.1-SNAPSHOT</version> + <version>2.2.0</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index ca4952f..911e0dd 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0</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 61af8a5d4e165d59dc737c7f8a33578f4b663495 Merge: b07aaae cdb4e8b Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 26 11:10:15 2017 +0100 [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 fa9c79c9005018bc99ed20b2279bd7a3f4908361 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 26 11:10:16 2017 +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 96de52b..0945486 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.2.0</version> + <version>2.2.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index a1ac054..3d5caf2 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.2.0</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 5f6d0d5..8330309 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.2.0</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d6a82f0..4ca980f 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.2.0</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 911e0dd..ca4952f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.2.0</version> + <version>2.2.1-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