branch develop updated (ff30bf4 -> a051784)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from ff30bf4 [jgitflow-maven-plugin]updating poms for 5.3-SNAPSHOT development new dc8c7b9 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 6c5c385 ajout des entêtes manquants new 29cca02 [jgitflow-maven-plugin]updating poms for branch'release/5.2' with non-snapshot versions new bbf37b7 Merge branch 'release/5.2' new 3475244 Merge branch 'master' into develop new a051784 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 a0517842286dcd5328063dc70abc455e385e622f Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 14:03:17 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3475244a3cba111463df3d9d4f86c3a7e1182994 Merge: dc8c7b9 bbf37b7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 14:03:16 2015 +0000 Merge branch 'master' into develop commit dc8c7b97a39b6325c0c761e5918c41719b489ccf Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 14:03:16 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit bbf37b7c3f4a1cf73250e62146e601a30b9221bc Merge: adcd234 29cca02 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 14:03:14 2015 +0000 Merge branch 'release/5.2' commit 29cca0212e5a90a8f0593cbd278856db21017381 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 13:59:34 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.2' with non-snapshot versions commit 6c5c3852869b3bea6499b33e609ff54227beff3e Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 13:57:07 2015 +0000 ajout des entêtes manquants Summary of changes: .../authentication/ForgottenPasswordAction.java | 21 +++++++++++++++++++++ .../content/authentication/forgotten-password.jsp | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+) -- 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 wao. See http://git.codelutin.com/wao.git commit 6c5c3852869b3bea6499b33e609ff54227beff3e Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 13:57:07 2015 +0000 ajout des entêtes manquants --- .../authentication/ForgottenPasswordAction.java | 21 +++++++++++++++++++++ .../content/authentication/forgotten-password.jsp | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/ForgottenPasswordAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/ForgottenPasswordAction.java index 645303c..761f742 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/ForgottenPasswordAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/ForgottenPasswordAction.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action.authentication; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.services.service.administration.InactiveWaoUserException; import fr.ifremer.wao.services.service.administration.WaoUsersService; import fr.ifremer.wao.services.service.administration.WrongCredentialsException; diff --git a/wao-web/src/main/webapp/WEB-INF/content/authentication/forgotten-password.jsp b/wao-web/src/main/webapp/WEB-INF/content/authentication/forgotten-password.jsp index 05c1401..fbf5e7d 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/authentication/forgotten-password.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/authentication/forgotten-password.jsp @@ -1,3 +1,23 @@ +<%-- + #%L + Wao :: Web + %% + Copyright (C) 2009 - 2015 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@taglib prefix="s" uri="/struts-tags" %> <%@taglib prefix="sj" uri="/struts-jquery-tags" %> -- 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 wao. See http://git.codelutin.com/wao.git commit 29cca0212e5a90a8f0593cbd278856db21017381 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 13:59:34 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.2' with non-snapshot versions --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c5f094e..5a9c127 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.2</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 13feffe..59ccc8c 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.2</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 222b945..51b0957 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.2</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 9a3a345..61d2d33 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.2</version> </parent> <artifactId>wao-web</artifactId> -- 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 wao. See http://git.codelutin.com/wao.git commit bbf37b7c3f4a1cf73250e62146e601a30b9221bc Merge: adcd234 29cca02 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 14:03:14 2015 +0000 Merge branch 'release/5.2' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 14 ++- .../src/main/java/fr/ifremer/wao/WaoUtils.java | 5 + wao-services/pom.xml | 2 +- .../service/ObsVenteSamplingPlanBuilder.java | 40 +++++-- .../wao/services/service/SynthesisService.java | 119 +++++++++++++-------- .../service/administration/WaoUsersService.java | 94 ++++++++++------ .../email/UserCredentialsEmail_fr.mustache | 2 +- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 1 + .../wao/services/service/ObsMerFixtures.java | 4 + .../ifremer/wao/services/service/WaoFixtures.java | 9 ++ .../administration/WaoUsersServiceTest.java | 44 ++++++++ wao-web/pom.xml | 2 +- .../java/fr/ifremer/wao/web/WaoInterceptor.java | 5 +- .../authentication/ForgottenPasswordAction.java | 91 ++++++++++++++++ .../main/resources/i18n/wao-web_en_GB.properties | 5 + .../main/resources/i18n/wao-web_fr_FR.properties | 5 + .../content/authentication/forgotten-password.jsp | 65 +++++++++++ .../WEB-INF/content/authentication/login.jsp | 18 +++- .../WEB-INF/content/edit-sample-row-input.jsp | 10 +- .../WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/decorators.xml | 1 + 24 files changed, 436 insertions(+), 107 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 wao. See http://git.codelutin.com/wao.git commit dc8c7b97a39b6325c0c761e5918c41719b489ccf Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 14:03:16 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2f80d38..5a9c127 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.3-SNAPSHOT</version> + <version>5.2</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index f176922..59ccc8c 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.3-SNAPSHOT</version> + <version>5.2</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 2d5678b..51b0957 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.3-SNAPSHOT</version> + <version>5.2</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 4244ae1..61d2d33 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.3-SNAPSHOT</version> + <version>5.2</version> </parent> <artifactId>wao-web</artifactId> -- 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 wao. See http://git.codelutin.com/wao.git commit 3475244a3cba111463df3d9d4f86c3a7e1182994 Merge: dc8c7b9 bbf37b7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 14:03:16 2015 +0000 Merge branch 'master' into develop .../authentication/ForgottenPasswordAction.java | 21 +++++++++++++++++++++ .../content/authentication/forgotten-password.jsp | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+) -- 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 wao. See http://git.codelutin.com/wao.git commit a0517842286dcd5328063dc70abc455e385e622f Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 14:03:17 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5a9c127..2f80d38 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2</version> + <version>5.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 59ccc8c..f176922 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2</version> + <version>5.3-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 51b0957..2d5678b 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2</version> + <version>5.3-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 61d2d33..4244ae1 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2</version> + <version>5.3-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm