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 d63a60c [jgitflow-maven-plugin]merging 'release/1.3' into 'master' adds 22ceb5b [jgitflow-maven-plugin]updating poms for 1.4-SNAPSHOT development adds adcebae [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 5b4185a [jgitflow-maven-plugin]merging 'master' into 'develop' adds 395eb60 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 0865a71 refs-60 #7911 add citation in document - persistence & services part adds c02daaf fixes #7911 add citation in documents adds 5ec2cbc Merge branch 'feature/7911-add-citations-field-on-document' into develop adds cd6fc2f fix migration script for citation, as text for pg adds 194cc6b fixes #7913 notify document cannot be modified instead of just no display button adds 0cb0bb6 refs-40 #7927 Add service to get questions relative to an user by its role adds 878015d fixes #7927 Add list of projects by users on user page adds ad46b96 Merge branch 'feature/7927-user-projects-list' into develop adds 90e32a4 fixes #7914 filtered already added documents and parents in project modification adds 38b7715 add a way for admin to see delteed projects adds 10fcb87 refs-50 #7917 add arrow in project hierarcy graph adds 0e66d58 refs-80 #7917 current question is displayed as bold in hierarchy graph adds 3c733ba fixes #7931 Add project in related projects when a document is a clsoing documentfor the project adds e9f2ed5 fixes #7922 dot not have word with less than 3 letters in cloud tag adds 76578df refs #7922 extract cleanly map value comparator class adds 7953679 test adds 5c7abd6 fin de test adds a798621 Corrections graphiques adds 1e7a752 fixes #7949 Add way to delete contributor adds 1955e4e Fix du bug d'affichage de la zone de chargement adds 1a124be Refs #7927 Modifications d'affichage sur la liste des utilisateurs et sur la fiche d'un utilisateur adds 68cd77f Refs #7913 : Modifications d'affichage des messages sous les boutons d'actions adds 8ccab65 Add an Admin link in menu adds 9934395 Add pagniation on users list \o/ adds 3fc3cfd Add pagination on projects list adds 31be59f add pagination on documents adds cb0b87e upgrade pom version adds d4b8137 Modification de l'affichage de la pagination adds 4ba67f4 Uniformisation des boutons et amélioration de la saisie des mot clés sur l'édition d'un projet adds 1646081 add links to search on referential in cloud tags adds 0edd7fe Modification de la saisie des mots clés sur tous les écrans concernés adds d9e1671 Fix document file download adds 54257ac fix some file headers adds daf9709 [jgitflow-maven-plugin]updating poms for branch'release/1.4' with non-snapshot versions adds fe67fd5 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- .../src/main/webapp/js/coselmar-constants.js | 2 +- coselmar-persistence/pom.xml | 2 +- .../coselmar/beans/QuestionSearchExample.java | 11 + .../fr/ifremer/coselmar/persistence/DaoUtils.java | 17 + .../persistence/entity/CoselmarUserTopiaDao.java | 5 +- .../persistence/entity/DocumentTopiaDao.java | 88 +++-- .../persistence/entity/QuestionTopiaDao.java | 118 ++++-- ...> V1_4_0_1__7911_add_citation_in_documents.sql} | 13 +- .../src/main/xmi/coselmar-model.properties | 1 + .../src/main/xmi/coselmar-model.zargo | Bin 10955 -> 11007 bytes coselmar-rest/pom.xml | 2 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 13 +- .../ifremer/coselmar/beans/DocumentSearchBean.java | 4 +- .../ifremer/coselmar/beans/QuestionSearchBean.java | 38 ++ .../QuestionUserRole.java} | 14 +- .../coselmar/converter/BeanEntityConverter.java | 6 +- .../StringLongMapValueComparator.java} | 44 +-- .../indexation/DocumentsIndexationService.java | 42 ++- .../indexation/QuestionsIndexationService.java | 39 +- .../indexation/TransverseIndexationService.java | 44 ++- .../coselmar/services/v1/DocumentsWebService.java | 45 ++- .../coselmar/services/v1/QuestionsWebService.java | 176 ++++++++- .../coselmar/services/v1/UsersWebService.java | 32 +- coselmar-rest/src/main/resources/mapping | 4 + .../coselmar/services/QuestionsWebServiceTest.java | 161 ++++++++ .../indexation/DocumentsIndexationServiceTest.java | 16 +- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/css/coselmar.css | 165 +++++++- coselmar-ui/src/main/webapp/i18n/en.js | 16 + coselmar-ui/src/main/webapp/i18n/fr.js | 16 + coselmar-ui/src/main/webapp/index.html | 5 + .../src/main/webapp/js/coselmar-admin-services.js | 2 +- .../src/main/webapp/js/coselmar-constants.js | 5 +- .../src/main/webapp/js/coselmar-controllers.js | 207 ++++++++-- .../main/webapp/js/coselmar-general-services.js | 2 +- coselmar-ui/src/main/webapp/js/coselmar-health.js | 2 +- .../main/webapp/js/coselmar-questions-services.js | 27 +- .../src/main/webapp/js/coselmar-services.js | 11 +- .../src/main/webapp/js/coselmar-user-services.js | 19 +- .../src/main/webapp/js/d3-2waytree-graph.js | 415 ++++++++++++--------- coselmar-ui/src/main/webapp/js/paginationBinder.js | 89 +++++ .../src/main/webapp/views/documents/documents.html | 3 +- .../main/webapp/views/documents/editDocument.html | 70 ++-- .../webapp/views/documents/modalDocumentEdit.html | 53 +-- .../views/documents/modalDocumentSearch.html | 8 +- .../main/webapp/views/documents/newdocument.html | 53 +-- .../src/main/webapp/views/documents/toolsPart.html | 8 +- .../main/webapp/views/documents/viewDocument.html | 9 +- ...modalHierarchy.html => paginationTemplate.html} | 31 +- .../main/webapp/views/questions/closeQuestion.html | 2 +- .../main/webapp/views/questions/editquestion.html | 131 ++++--- .../views/questions/modalQuestionSearch.html | 9 +- .../src/main/webapp/views/questions/questions.html | 7 +- .../src/main/webapp/views/questions/toolsPart.html | 9 +- .../src/main/webapp/views/users/adminUsers.html | 31 +- .../src/main/webapp/views/users/searchPart.html | 8 +- .../main/webapp/views/users/supervisorUsers.html | 35 +- coselmar-ui/src/main/webapp/views/users/user.html | 75 +++- coselmar-ui/src/main/webapp/views/users/users.html | 4 +- pom.xml | 4 +- 61 files changed, 1841 insertions(+), 631 deletions(-) copy coselmar-persistence/src/main/resources/db/migration/{V1_2_0_1__7867_add_list_links_in_projects.sql => V1_4_0_1__7911_add_citation_in_documents.sql} (68%) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/{services/CoselmarService.java => beans/QuestionUserRole.java} (77%) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/{beans/LinkBean.java => services/StringLongMapValueComparator.java} (60%) create mode 100644 coselmar-ui/src/main/webapp/js/paginationBinder.js copy coselmar-ui/src/main/webapp/views/{questions/modalHierarchy.html => paginationTemplate.html} (50%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.