branch develop updated (fbb078c -> e2b3ea8)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from fbb078c [jgitflow-maven-plugin]updating poms for 1.0-SNAPSHOT development new abed394 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8a18168 [jgitflow-maven-plugin]updating poms for branch '1.0-RC-1' with snapshot versions new 9557d0e prepare release new ee3cb0f [jgitflow-maven-plugin]updating poms for branch'release/1.0-RC-1' with non-snapshot versions new 2339bbf Merge branch 'release/1.0-RC-1' new a9854ca Merge branch 'master' into develop new e2b3ea8 [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 e2b3ea830a66b50df311c5556345ddb5c71562a7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:32:37 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit a9854cab1e04fd9aac9387ffe2d444e79eb72d5f Merge: abed394 2339bbf Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:32:36 2015 +0000 Merge branch 'master' into develop commit abed394a9362d87e29925a3740e35fa7f94d827e Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:32:36 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 2339bbfa0ef7f97ea1cb421187925a1cc4294f5a Merge: b589625 ee3cb0f Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:32:35 2015 +0000 Merge branch 'release/1.0-RC-1' commit ee3cb0f1502ca0daae3f2030280dc1c7e0342efa Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:31:19 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.0-RC-1' with non-snapshot versions commit 9557d0eb80734ed88ff1a8539bb46b3a892ce86a Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:31:04 2015 +0000 prepare release Summary of changes: .../main/webapp/views/notificationTemplate.html | 23 ++++++++++++++++++++++ 1 file changed, 23 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 coselmar. See http://git.codelutin.com/coselmar.git commit 9557d0eb80734ed88ff1a8539bb46b3a892ce86a Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:31:04 2015 +0000 prepare release --- .../main/webapp/views/notificationTemplate.html | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/coselmar-ui/src/main/webapp/views/notificationTemplate.html b/coselmar-ui/src/main/webapp/views/notificationTemplate.html index 67722cc..13f0f8d 100644 --- a/coselmar-ui/src/main/webapp/views/notificationTemplate.html +++ b/coselmar-ui/src/main/webapp/views/notificationTemplate.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 - 2015 Ifremer, Code Lutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <div class="cg-notify-message" ng-class="$classes"> <div ng-show="!$messageTemplate"> -- 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 coselmar. See http://git.codelutin.com/coselmar.git commit ee3cb0f1502ca0daae3f2030280dc1c7e0342efa Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:31:19 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.0-RC-1' with non-snapshot versions --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index efb90b4..a97bcf0 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-1-SNAPSHOT</version> + <version>1.0-RC-1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 48ab1d9..8dd54c8 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-1-SNAPSHOT</version> + <version>1.0-RC-1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 612d348..ea709e5 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-1-SNAPSHOT</version> + <version>1.0-RC-1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index ac757ed..b061813 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-1-SNAPSHOT</version> + <version>1.0-RC-1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 6211d1b..cf602f3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-1-SNAPSHOT</version> + <version>1.0-RC-1</version> <packaging>pom</packaging> <name>Coselmar</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 coselmar. See http://git.codelutin.com/coselmar.git commit 2339bbfa0ef7f97ea1cb421187925a1cc4294f5a Merge: b589625 ee3cb0f Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:32:35 2015 +0000 Merge branch 'release/1.0-RC-1' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../ifremer/coselmar/beans/QuestionSearchBean.java | 19 + .../persistence/entity/DocumentTopiaDao.java | 2 +- .../persistence/entity/QuestionTopiaDao.java | 47 ++- coselmar-rest/pom.xml | 6 +- .../coselmar/converter/BeanEntityConverter.java | 8 - .../services/CoselmarWebServiceSupport.java | 36 +- .../errors/MailAlreadyExistingException.java | 37 ++ .../coselmar/services/v1/DocumentsWebService.java | 7 +- .../ifremer/coselmar/services/v1/ErrorAction.java | 9 + .../coselmar/services/v1/QuestionsWebService.java | 69 ++-- .../coselmar/services/v1/UsersWebService.java | 20 +- coselmar-rest/src/main/resources/mapping | 5 +- .../coselmar/services/UsersWebServiceTest.java | 5 +- coselmar-ui/pom.xml | 10 +- coselmar-ui/src/main/webapp/css/coselmar.css | 186 ++++++++- coselmar-ui/src/main/webapp/i18n/en.js | 42 ++ coselmar-ui/src/main/webapp/i18n/fr.js | 43 ++ coselmar-ui/src/main/webapp/index.html | 71 ++-- .../src/main/webapp/js/coselmar-controllers.js | 449 +++++++++++++++------ .../src/main/webapp/js/coselmar-error-services.js | 68 ++++ .../src/main/webapp/js/coselmar-services.js | 12 +- .../src/main/webapp/js/coselmar-user-services.js | 6 +- coselmar-ui/src/main/webapp/js/coselmar.js | 35 +- .../src/main/webapp/views/admin/admintools.html | 2 +- .../src/main/webapp/views/documents/document.html | 2 +- .../src/main/webapp/views/documents/documents.html | 9 +- .../main/webapp/views/documents/editDocument.html | 16 +- .../webapp/views/documents/modalDocumentEdit.html | 166 ++++---- .../views/documents/modalDocumentSearch.html | 9 +- .../main/webapp/views/documents/newdocument.html | 16 +- .../main/webapp/views/documents/viewDocument.html | 2 +- coselmar-ui/src/main/webapp/views/errors/401.html | 4 +- coselmar-ui/src/main/webapp/views/errors/403.html | 4 +- coselmar-ui/src/main/webapp/views/errors/404.html | 4 +- coselmar-ui/src/main/webapp/views/home.html | 59 ++- .../{errors/401.html => notificationTemplate.html} | 17 +- .../main/webapp/views/questions/editquestion.html | 16 +- .../views/questions/modalQuestionSearch.html | 9 +- .../main/webapp/views/questions/newquestion.html | 6 +- .../src/main/webapp/views/questions/question.html | 8 +- .../src/main/webapp/views/questions/questions.html | 115 +++--- .../main/webapp/views/questions/viewquestion.html | 2 +- .../main/webapp/views/referential/referential.html | 12 +- .../src/main/webapp/views/users/adminUsers.html | 2 +- .../src/main/webapp/views/users/edituser.html | 28 +- .../src/main/webapp/views/users/newPassword.html | 4 +- .../src/main/webapp/views/users/newuser.html | 6 +- .../src/main/webapp/views/users/searchPart.html | 8 +- .../main/webapp/views/users/supervisorUsers.html | 2 +- coselmar-ui/src/main/webapp/views/users/user.html | 8 +- coselmar-ui/src/main/webapp/views/users/users.html | 6 +- pom.xml | 65 +-- 54 files changed, 1294 insertions(+), 509 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 coselmar. See http://git.codelutin.com/coselmar.git commit abed394a9362d87e29925a3740e35fa7f94d827e Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:32:36 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index f5f9174..a97bcf0 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-RC-1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 477abe6..8dd54c8 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-RC-1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 4ed8325..ea709e5 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-RC-1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index e52c52e..b061813 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-RC-1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 49a7d8c..cf602f3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-RC-1</version> <packaging>pom</packaging> <name>Coselmar</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 coselmar. See http://git.codelutin.com/coselmar.git commit a9854cab1e04fd9aac9387ffe2d444e79eb72d5f Merge: abed394 2339bbf Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:32:36 2015 +0000 Merge branch 'master' into develop .../main/webapp/views/notificationTemplate.html | 23 ++++++++++++++++++++++ 1 file changed, 23 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 coselmar. See http://git.codelutin.com/coselmar.git commit e2b3ea830a66b50df311c5556345ddb5c71562a7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 20 15:32:37 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index a97bcf0..f5f9174 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-1</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 8dd54c8..477abe6 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-1</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index ea709e5..4ed8325 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-1</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index b061813..e52c52e 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-1</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index cf602f3..49a7d8c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-1</version> + <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm