This is an automated email from the git hooks/post-receive script. New change to branch master in repository coselmar. See http://git.forge.codelutin.com/coselmar.git from fe67fd5 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' adds c9d0a2e [jgitflow-maven-plugin]updating poms for 1.5-SNAPSHOT development adds 2edcb08 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8f4e71d [jgitflow-maven-plugin]merging 'master' into 'develop' adds e83142a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds f066243 fixes #7983 use english stopwords for indexation, affects top words in cloud tag adds a648830 fixes #7982 force locale to English by default adds bb5b6da fixes #7975 Add new page to display bibliography from document search result adds 4f9147d Fixes #7981 Add message for input language when language is different from english adds 5b4386e Ajout d'un bouton Annuler partout où c'est faisable adds a623106 Modification de style : Uniformisation des formulaires de recherche adds 05dcfba Ajout d'un message lorsque JS est désactivé car l'appli est inutilisable dans ce cas adds c771001 Add cancel button on Projects close session adds 0fc7631 fixes #7977 add static links adds 6e0539b fixes #7991 Always allow admin to modify document adds 9aca394 fixes #7976 i18n for placeholders adds 785a5eb refs #7975 display bibliography in modal instead of new page adds 9e65d6f remove non wanted annotation adds bd2a079 move CloudWord class to persistence module adds d84fffe refs-60 #7974 Add service with *postgresql* request to get top words from project and associated documents adds e496b61 refs-90 #7974 Add words cloud on project page adds 097bc5f Merge branch 'feature/7974-cloud-tag-on-project' into develop adds 0339661 make citation field mandatory adds dde0ee9 Fixes i18n placeholder issue adds c81c165 Meilleur gestion des liens externes d'un document pour éviter les liens corrompus adds a0245ce Suppression d'un message d'avertissement de saisie en anglais qui ne fonctionnait pas correctement adds 7a5a5cf Affichage du nombre de résultats sur les pages de recherche adds 971345e Fixes #7974 : Affichage responsive du nuage de mots et modification des couleur en harmonie avec le reste de l'appli adds c82e753 fix the transfer to contributor when we clear the list of experts in project adds 28c3062 fix advanced search on users, clean some code adds e39572f refs-40 #8004 try new way to input project themes adds 6b45567 refs-80 #8004 try new way to input document keywords adds d7206b6 fix bad merge adds b33a934 Merge branch 'feature/8004-new-way-input-themes-keywords' into develop adds b51b573 Fixes #8004 : Amélioration de l'affichage du champ de saisie des thèmes et mot clés adds 14d1f80 Merge branch 'feature/8004-new-way-input-themes-keywords' into develop adds 7eaea0a [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions adds 762cf52 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../java/fr/ifremer/coselmar/beans/CloudWord.java | 0 .../coselmar/config/CoselmarServicesConfig.java | 7 + .../fr/ifremer/coselmar/persistence/DaoUtils.java | 5 + .../persistence/entity/DocumentTopiaDao.java | 183 ++++++++++++++++++ .../persistence/entity/QuestionTopiaDao.java | 63 +++++++ ...ts.sql => V1_5_0_1__7974_add_pg_dictionary.sql} | 22 +-- coselmar-rest/pom.xml | 2 +- .../indexation/DocumentsIndexationService.java | 8 +- .../coselmar/services/indexation/LuceneUtils.java | 3 +- .../indexation/QuestionsIndexationService.java | 8 +- .../coselmar/services/v1/DocumentsWebService.java | 87 ++++++++- .../coselmar/services/v1/QuestionsWebService.java | 52 +++-- coselmar-rest/src/main/resources/mapping | 2 + .../indexation/DocumentsIndexationServiceTest.java | 6 +- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/css/coselmar.css | 112 +++++++++-- coselmar-ui/src/main/webapp/i18n/en.js | 40 ++++ coselmar-ui/src/main/webapp/i18n/fr.js | 41 ++++ coselmar-ui/src/main/webapp/index.html | 38 +++- .../src/main/webapp/js/coselmar-controllers.js | 209 ++++++++++++++++++--- .../main/webapp/js/coselmar-questions-services.js | 8 + .../src/main/webapp/js/coselmar-services.js | 6 + .../src/main/webapp/views/documents/documents.html | 7 +- .../main/webapp/views/documents/editDocument.html | 99 ++++++---- .../modalBibliography.html} | 24 ++- .../webapp/views/documents/modalDocumentEdit.html | 67 ++++--- .../views/documents/modalDocumentSearch.html | 12 +- .../main/webapp/views/documents/newdocument.html | 89 ++++++--- .../src/main/webapp/views/documents/toolsPart.html | 18 +- .../main/webapp/views/documents/viewDocument.html | 2 +- coselmar-ui/src/main/webapp/views/home.html | 2 +- .../src/main/webapp/views/links/modalLinkEdit.html | 19 +- .../src/main/webapp/views/paginationTemplate.html | 5 +- .../main/webapp/views/questions/closeQuestion.html | 17 +- .../main/webapp/views/questions/editquestion.html | 52 +++-- .../webapp/views/questions/modalHierarchy.html | 2 +- .../views/questions/modalQuestionSearch.html | 12 +- .../main/webapp/views/questions/newquestion.html | 3 + .../src/main/webapp/views/questions/question.html | 19 +- .../src/main/webapp/views/questions/toolsPart.html | 12 +- .../main/webapp/views/questions/viewquestion.html | 8 + .../main/webapp/views/referential/referential.html | 2 +- .../src/main/webapp/views/users/edituser.html | 23 ++- .../src/main/webapp/views/users/newPassword.html | 4 +- .../src/main/webapp/views/users/searchPart.html | 12 +- pom.xml | 2 +- 48 files changed, 1126 insertions(+), 294 deletions(-) rename {coselmar-rest => coselmar-persistence}/src/main/java/fr/ifremer/coselmar/beans/CloudWord.java (100%) copy coselmar-persistence/src/main/resources/db/migration/{V1_2_0_1__7867_add_list_links_in_projects.sql => V1_5_0_1__7974_add_pg_dictionary.sql} (67%) copy coselmar-ui/src/main/webapp/views/{questions/modalHierarchy.html => documents/modalBibliography.html} (65%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.