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 9cd3bdb [jgitflow-maven-plugin]merging 'release/1.2.1' into 'master' adds 9ad0db4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 5d1c3b4 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 34502c6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds b85f2a9 Corrections d'affichage adds b8772e9 Modifications d'affichage adds 2286ca9 Réorganisation des champs de la recherche avancée des documents adds eb3b6ce fixes #7918 add space betwen name/firstname of document owner adds 3dc7016 fixes #7910 allow multi-add on keywords and themes adds 6f71fb0 fixes #7915 be able to see every user information adds cb4f073 Eviter les paranthèses vides lorsqu'un utilisateur n'a pas d'organisation adds 3bcf2ac Refs #7912 : Correction du lien non visible au statut :visited adds 3493d5f Refs #7906 : Ajout de l'écran de chargement adds 9913e0e refs-50 #7906 add loading on documents adds 1c5681c refs-70 #7906 add loading on users adds f6cffe1 fixes #7906 add loading on projects adds 8c72a20 fixes #7916 get top word from title/name and keywords/themes only adds 389eb4f [jgitflow-maven-plugin]updating poms for branch'release/1.3' with non-snapshot versions adds d63a60c [jgitflow-maven-plugin]merging 'release/1.3' into 'master' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../persistence/entity/QuestionTopiaDao.java | 2 +- coselmar-rest/pom.xml | 2 +- .../coselmar/converter/BeanEntityConverter.java | 6 +- .../indexation/TransverseIndexationService.java | 2 - .../coselmar/services/v1/UsersWebService.java | 30 ++-- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/css/coselmar.css | 50 ++++++ coselmar-ui/src/main/webapp/i18n/en.js | 7 +- coselmar-ui/src/main/webapp/i18n/fr.js | 7 +- coselmar-ui/src/main/webapp/index.html | 6 +- .../src/main/webapp/js/coselmar-controllers.js | 175 ++++++++++++++++----- .../main/webapp/js/coselmar-questions-services.js | 12 +- .../src/main/webapp/js/coselmar-services.js | 16 +- .../src/main/webapp/js/coselmar-user-services.js | 16 +- .../main/webapp/views/documents/editDocument.html | 4 +- .../webapp/views/documents/modalDocumentEdit.html | 2 +- .../views/documents/modalDocumentSearch.html | 2 +- .../main/webapp/views/documents/newdocument.html | 4 +- .../src/main/webapp/views/documents/toolsPart.html | 30 ++-- coselmar-ui/src/main/webapp/views/home.html | 40 ++--- .../main/webapp/views/questions/editquestion.html | 8 +- .../views/questions/modalQuestionSearch.html | 4 +- .../src/main/webapp/views/questions/questions.html | 14 +- .../src/main/webapp/views/questions/toolsPart.html | 5 +- .../main/webapp/views/questions/viewquestion.html | 10 +- .../main/webapp/views/referential/referential.html | 10 +- .../src/main/webapp/views/users/edituser.html | 2 +- .../src/main/webapp/views/users/searchPart.html | 13 +- coselmar-ui/src/main/webapp/views/users/user.html | 7 +- pom.xml | 2 +- 32 files changed, 322 insertions(+), 172 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.