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>.