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 6f653f6 [jgitflow-maven-plugin]merging 'release/1.1' into 'master' adds 302268a [jgitflow-maven-plugin]updating poms for 1.2-SNAPSHOT development adds 616f6a7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e079f5d [jgitflow-maven-plugin]merging 'master' into 'develop' adds 5c90a17 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 7dccd69 Fix de la config des tests sur le dialect H2 adds 564e909 fixes #7844 correction des chaines i18n pour le sujet de courriel de modification du mot de passe adds c2960c3 fixes #7845 Add a health page to controle application status adds 8a38018 upgrade d'angular dans la page health adds 202056f fixes #7847 ajout d'un flag dans l'url pour les recherches avancées, permettant un refresh de la page quand on clique dans le menu adds 137f503 fixes #7851 Gestion du rechargement de la page d'accueil en cas de déconnexion adds 6521902 fixes #7850 suppression des colonnes clients/participants/documents non porteur d'information en mode anonyme adds f11feeb fixes #7774 revue de la gestion de l'export adds f39137f refs-30 #7853 Prepare service for user search export adds e91b089 fixes #7853 add users searched export on ui adds cda9e55 fix simple search <-> advanced search change in ui adds 7440c25 refs-40 #7858 Revue coté service de la recherche avancée de projet/questions adds 40d728b fixes #7858 add advanced search on project in ui adds 6748663 upgrade datepicker-popup to uib-datepicker-popup adds 06c6c34 upgrade modal component adds 242180a Fix du service JS d'admin adds 901212e refs-40 #7867 ajout d'une liste de liens dans les questions, parties service adds f4d6b41 refs-40 #7867 revue pour avoir des objets {url, name} pour les liens plutot que juste des urls en String adds 408c5cd fixes #7867 add links management in project page adds c1bb341 Merge branch 'feature/7867-list-links-in-project' into develop adds 764eff5 refs-30 #7849 Revue de la recherche avancée de documents et ajout du critere 'date de publication' adds 70fce41 fixes #7893 ajout de deux methodes pour récupérer les arbres des ancêtres et descendants d'un projet adds f7f0ac0 refs-30 #7894 prepare modal presentation of project hierarchy adds 24a8cda refs-80 #7894 prepare add first draw of hierarchy graph adds 7e69d18 fix tooltip in questions list adds dc06ade refs #7894 add links on hierarchy graph nodes adds b96ed25 make question hierarchy graph popup bigger adds 72d7523 fixes #7899 Fix public projects listing adds 0e7e3b7 Fixes #7774 Translate project status in export adds 7ec7969 fix flyway dependency scope adds 9840659 fixes #7853 fix search engine on Users adds e6815bd Replace commons-lang import by commons-lang3 ! adds 88af5bd remove some console log adds be95151 fixes #7867 fix links creation with several adds b612f7f fixes #7852 Suppression des mots de liaison *français* adds 11cc94f Modification des termes du feminin au masculin car on avait remplacé question par projet adds 20c3049 fixes #7899 use status 'In Progress' for the public projects list in home adds d37c47b Refs #7867 : Ajout du prefix http dans le champ d'édition d'un lien associé adds d0c8121 Ajout du prefix http dans tous le champ d'édition d'un lien adds 7417753 Affichage des virgules dans les ng-repeat des themes et mot clés adds 83c4f66 remove status 'Open' from the advanced search on project adds 3ededb5 Affichage plus large de la page et modification du nuage de mot adds ca28687 Affichage du nuage de mot : modifications des libellés adds 10be411 Refs #7849 : Modification de l'affichage de la recherche avancée des documents adds e84786c update file headers adds 7995812 [jgitflow-maven-plugin]updating poms for branch'release/1.2' with non-snapshot versions adds 269cdab [jgitflow-maven-plugin]merging 'release/1.2' 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 | 8 +- .../coselmar/beans/DocumentSearchExample.java | 24 + .../ifremer/coselmar/beans/QuestionSearchBean.java | 59 - .../coselmar/beans/QuestionSearchExample.java | 110 + .../fr/ifremer/coselmar/beans/SearchExample.java | 20 +- .../coselmar/config/CoselmarServicesConfig.java | 4 + .../config/CoselmarServicesConfigOption.java | 5 + .../persistence/entity/QuestionTopiaDao.java | 83 +- .../V1_2_0_1__7867_add_list_links_in_projects.sql | 34 + .../src/main/xmi/coselmar-model.zargo | Bin 10470 -> 10955 bytes .../resources/coselmar-persistence-test.properties | 3 +- coselmar-rest/pom.xml | 2 +- .../ifremer/coselmar/beans/DocumentSearchBean.java | 20 + .../beans/{CloudWord.java => HealthBean.java} | 48 +- .../beans/{CloudWord.java => LinkBean.java} | 38 +- .../fr/ifremer/coselmar/beans/QuestionBean.java | 17 + .../coselmar/beans/QuestionExportModel.java | 21 +- ...UserSearchBean.java => QuestionSearchBean.java} | 47 +- .../ifremer/coselmar/beans/QuestionTreeNode.java | 116 ++ .../java/fr/ifremer/coselmar/beans/UserBean.java | 9 + .../fr/ifremer/coselmar/beans/UserExportModel.java | 76 + .../coselmar/converter/BeanEntityConverter.java | 84 + .../services/CoselmarRestApplicationListener.java | 6 +- .../coselmar/services/indexation/LuceneUtils.java | 9 +- .../indexation/QuestionsIndexationService.java | 1 + .../indexation/TransverseIndexationService.java | 13 - .../coselmar/services/v1/DocumentsWebService.java | 38 +- .../coselmar/services/v1/HealthService.java | 79 + .../coselmar/services/v1/QuestionsWebService.java | 363 +++- .../coselmar/services/v1/UsersWebService.java | 58 + .../i18n/coselmar-services_en_GB.properties | 24 +- .../i18n/coselmar-services_fr_FR.properties | 23 +- coselmar-rest/src/main/resources/mapping | 9 +- .../coselmar/services/QuestionsWebServiceTest.java | 2 +- .../indexation/DocumentsIndexationServiceTest.java | 22 +- .../indexation/QuestionsIndexationServiceTest.java | 2 +- .../src/test/resources/coselmar-test.properties | 3 +- coselmar-ui/pom.xml | 8 +- coselmar-ui/src/main/webapp/css/coselmar.css | 53 +- .../src/main/webapp/css/d3-collapsible-tree.css | 132 ++ coselmar-ui/src/main/webapp/health.html | 53 + coselmar-ui/src/main/webapp/i18n/en.js | 24 +- coselmar-ui/src/main/webapp/i18n/fr.js | 32 +- coselmar-ui/src/main/webapp/index.html | 3 + .../src/main/webapp/js/coselmar-admin-services.js | 2 +- .../src/main/webapp/js/coselmar-constants.js | 13 +- .../src/main/webapp/js/coselmar-controllers.js | 361 +++- .../main/webapp/js/coselmar-general-services.js | 2 +- .../{coselmar-constants.js => coselmar-health.js} | 18 +- .../main/webapp/js/coselmar-questions-services.js | 18 +- .../src/main/webapp/js/coselmar-services.js | 2 +- .../src/main/webapp/js/coselmar-user-services.js | 7 +- .../src/main/webapp/js/d3-2waytree-graph.js | 447 ++++ coselmar-ui/src/main/webapp/js/d3.layout.js | 2146 ++++++++++++++++++++ .../src/main/webapp/views/documents/documents.html | 2 +- .../main/webapp/views/documents/editDocument.html | 13 +- .../webapp/views/documents/modalDocumentEdit.html | 17 +- .../main/webapp/views/documents/newdocument.html | 13 +- .../src/main/webapp/views/documents/toolsPart.html | 113 +- .../main/webapp/views/documents/viewDocument.html | 4 +- coselmar-ui/src/main/webapp/views/home.html | 56 +- .../src/main/webapp/views/links/modalLinkEdit.html | 81 + .../main/webapp/views/questions/editquestion.html | 44 +- .../modalHierarchy.html} | 25 +- .../src/main/webapp/views/questions/questions.html | 35 +- .../src/main/webapp/views/questions/toolsPart.html | 165 ++ .../main/webapp/views/questions/viewquestion.html | 22 +- .../main/webapp/views/referential/referential.html | 4 +- .../src/main/webapp/views/users/searchPart.html | 10 +- coselmar-ui/src/main/webapp/views/users/users.html | 8 + pom.xml | 16 +- 73 files changed, 5010 insertions(+), 423 deletions(-) delete mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchExample.java create mode 100644 coselmar-persistence/src/main/resources/db/migration/V1_2_0_1__7867_add_list_links_in_projects.sql copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/{CloudWord.java => HealthBean.java} (51%) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/{CloudWord.java => LinkBean.java} (62%) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/{UserSearchBean.java => QuestionSearchBean.java} (58%) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionTreeNode.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserExportModel.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/HealthService.java create mode 100644 coselmar-ui/src/main/webapp/css/d3-collapsible-tree.css create mode 100644 coselmar-ui/src/main/webapp/health.html copy coselmar-ui/src/main/webapp/js/{coselmar-constants.js => coselmar-health.js} (65%) create mode 100644 coselmar-ui/src/main/webapp/js/d3-2waytree-graph.js create mode 100644 coselmar-ui/src/main/webapp/js/d3.layout.js create mode 100644 coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html copy coselmar-ui/src/main/webapp/views/{notificationTemplate.html => questions/modalHierarchy.html} (58%) create mode 100644 coselmar-ui/src/main/webapp/views/questions/toolsPart.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.