branch develop updated (4aff0e7 -> ee1c374)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git from 4aff0e7 [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development new 6c6c5de [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 7eaea0a [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions new 762cf52 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' new aef7a5f [jgitflow-maven-plugin]merging 'master' into 'develop' new ee1c374 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ee1c3744b71d1d37be6bbfae16467384dd3baf2b Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:32:35 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit aef7a5f027bdf4c50608df77d222b8d76c057e16 Merge: 6c6c5de 762cf52 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:32:35 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 6c6c5de790e790e3cbf2b0aeeaf69dfa8780b125 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:32:35 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 762cf525260f67af9bcd72e13d21172e577df85d Merge: fe67fd5 7eaea0a Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:32:33 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' commit 7eaea0a8420bd7051a8fa80d7c473e0c95cc4ec5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:29:45 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit 7eaea0a8420bd7051a8fa80d7c473e0c95cc4ec5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:29:45 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index e420482..56d961c 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index f3b35c7..1ef1b27 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 344e801..bd378f1 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 8946979..e46f6d5 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index f8067ea..742881f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit 762cf525260f67af9bcd72e13d21172e577df85d Merge: fe67fd5 7eaea0a Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:32:33 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' 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 +++++++ .../migration/V1_5_0_1__7974_add_pg_dictionary.sql | 32 ++++ 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, 1148 insertions(+), 282 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit 6c6c5de790e790e3cbf2b0aeeaf69dfa8780b125 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:32:35 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index df1dec5..56d961c 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 74d054e..1ef1b27 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 13d0f36..bd378f1 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 3e3b3f3..e46f6d5 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 6c3b81f..742881f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit aef7a5f027bdf4c50608df77d222b8d76c057e16 Merge: 6c6c5de 762cf52 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:32:35 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit ee1c3744b71d1d37be6bbfae16467384dd3baf2b Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:32:35 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 56d961c..df1dec5 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 1ef1b27..74d054e 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index bd378f1..13d0f36 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index e46f6d5..3e3b3f3 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 742881f..6c3b81f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm