branch develop updated (4aca135 -> b0dbc81)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 4aca135 Merge branch 'develop' of https://git.codelutin.com/faxtomail into develop new 15ab647 set pom version new b0dbc81 fixes #7533 Ne plus prendre en compte les noms de domaine dans les adresses expéditeur dans les réponses The 2 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 b0dbc813430a2772b385f578a14618d1692f23c5 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 17 14:32:00 2015 +0200 fixes #7533 Ne plus prendre en compte les noms de domaine dans les adresses expéditeur dans les réponses commit 15ab6474a3e2a43d09c9946f2bc74422464095e9 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 17 14:19:19 2015 +0200 set pom version Summary of changes: faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/content/reply/ReplyFormUIModel.java | 3 ++- faxtomail-ui-web/pom.xml | 2 +- .../src/main/webapp/WEB-INF/content/admin/configuration-input.jsp | 4 ++-- pom.xml | 2 +- 7 files changed, 9 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 http://git.codelutin.com/faxtomail.git commit 15ab6474a3e2a43d09c9946f2bc74422464095e9 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 17 14:19:19 2015 +0200 set pom version --- 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 de1801e..aaa9083 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 1068ef4..d8828b2 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 225ecbd..a995ce8 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>1.1.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index c98e829..0c9bb52 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>1.1.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index d7609f6..9548890 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>2.0-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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit b0dbc813430a2772b385f578a14618d1692f23c5 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 17 14:32:00 2015 +0200 fixes #7533 Ne plus prendre en compte les noms de domaine dans les adresses expéditeur dans les réponses --- .../faxtomail/ui/swing/content/reply/ReplyFormUIModel.java | 3 ++- .../src/main/webapp/WEB-INF/content/admin/configuration-input.jsp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java index 4deecc8..e3fea53 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java @@ -308,7 +308,8 @@ public class ReplyFormUIModel extends AbstractSerializableBean { if (PROPERTY_FROM.equals(field)) { // valid if the email address is in the list of the authorized addresses // or if the domain is in the authorized domains, or if the domain list is empty - result = isEmailAllowed(getFrom()) || isDomainAllowed(getFrom()); + // 20150917 kmorin #7533 Ne plus prendre en compte les noms de domaine dans les adresses expéditeur dans les réponses + result = isEmailAllowed(getFrom());// || isDomainAllowed(getFrom()); } return result; } diff --git a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp index aded7c7..7b31e82 100644 --- a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp +++ b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp @@ -664,7 +664,7 @@ </a> </div> - <br /> + <%-- <br /> <table class="table table-bordered"> <thead> @@ -708,7 +708,7 @@ <a class="btn btn-success btn-xs" ng-click="addReplyDomain()" ng-disabled="!newReplyDomain"> <span class="glyphicon glyphicon-plus"></span> </a> - </div> + </div> --%> </div> </div> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm