This is an automated email from the git hooks/post-receive script. New change to branch master in repository coselmar. See http://git.codelutin.com/coselmar.git from b589625 Merge branch 'release/0.8' adds 85fd0eb [jgitflow-maven-plugin]updating poms for 0.9-SNAPSHOT development adds f262adc [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 23c344f Merge branch 'master' into develop adds 7735e70 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds e95c74a begin reflexion about error/sucess messages adds fae4d21 Display corrections & add media queries adds bb564b0 internal-test #6654 be bale to remove deadline for project adds a6d7596 internal-test #6653 convert deadline Date as timestamp before update question with new status closed/adjourned/reopened adds e799665 Update display of document edit modal to fit with document edit page adds fda2e5d remove bad bad bad console.log adds 1656139 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds e0308f6 #6656 light QuestionBean conversion does not convert parent internal-test adds 5ec515c fixes #6667 : bad placement of tooltip in tab adds 6397169 some version upgrade adds 131ebac can put a simple login instead of mail for user internal-test #6307 adds f4d6cdb Add last 5 projects in home page when user is connected. internal-test #6443 adds c5572fb fix homepage when no user connected adds f4bee9f merge with develop adds 37703e1 review user error and success on operation : add notifications adds a58eecb manage notification for questions/projects adds a0b7bc2 manage notification for documents adds c3068dd fix duplication on documents list with restricted access adds 6d1bd05 fix usage of defaultFailOnCall service for error adds b4673c3 Merge branch 'feature/add-messages' into develop adds 738fe27 Logout cleanly user when authentication error are thrown by server internal-test #6524 adds 1ba6921 Display updates adds 1abd04e Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 7f19efc Refs #6622: Display update for alerts adds 6474f05 Display change : Alert, modal adds e6314be fix new password page adds a6c1d67 fix document form validation internal-test #6682 adds 6185a83 fix referential search for documents adds e2da9f9 on user edit, keep information if login is not a mail internal-test #6307 adds 1362497 add some tolltips in forms internal-test #6164 adds bc3410f clean pom, remove useless commons-codec dependency adds 4a93aad Fixes display issues adds 767c8a8 Display improvments adds d8f4922 add error on modal when no file and no externalURL given for document internal-test #6682 adds ea3e43e little fix on questions desactivation adds 78d2cef fix upload.file verification on document creation form adds 39d0800 Display improvments adds 8a18168 [jgitflow-maven-plugin]updating poms for branch '1.0-RC-1' with snapshot versions adds 9557d0e prepare release adds ee3cb0f [jgitflow-maven-plugin]updating poms for branch'release/1.0-RC-1' with non-snapshot versions adds 2339bbf Merge branch 'release/1.0-RC-1' No new revisions were added by this update. Summary of changes: 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 +- ...tion.java => MailAlreadyExistingException.java} | 6 +- .../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, 1261 insertions(+), 511 deletions(-) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/services/errors/{InvalidCredentialException.java => MailAlreadyExistingException.java} (83%) create mode 100644 coselmar-ui/src/main/webapp/js/coselmar-error-services.js copy coselmar-ui/src/main/webapp/views/{errors/401.html => notificationTemplate.html} (67%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.