branch develop updated (c9d0a2e -> e83142a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from c9d0a2e [jgitflow-maven-plugin]updating poms for 1.5-SNAPSHOT development new 2edcb08 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 54257ac fix some file headers new daf9709 [jgitflow-maven-plugin]updating poms for branch'release/1.4' with non-snapshot versions new fe67fd5 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' new 8f4e71d [jgitflow-maven-plugin]merging 'master' into 'develop' new e83142a [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 e83142a2b8d64de94203523fe14b5241453392cd Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:07:23 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 8f4e71df316da6592b9cb263b4f9b2d00cc6242a Merge: 2edcb08 fe67fd5 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:07:22 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 2edcb08af198a97e7b18d52c629770b41a27e691 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:07:20 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit fe67fd5928d84c58270230c96960515c968d6f68 Merge: d63a60c daf9709 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:07:18 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' commit daf9709555d566b8ad25488c2dc276ac4295d74d Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:03:34 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.4' with non-snapshot versions commit 54257ac6edac49d6a73634e48b3f85dafaea54fc Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:03:10 2016 +0100 fix some file headers Summary of changes: .../ifremer/coselmar/beans/QuestionUserRole.java | 24 ++++++++++++++++++++++ .../services/StringLongMapValueComparator.java | 24 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/js/paginationBinder.js | 23 +++++++++++++++++++++ .../src/main/webapp/views/paginationTemplate.html | 23 +++++++++++++++++++++ 4 files changed, 94 insertions(+) -- 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.codelutin.com/coselmar.git commit 54257ac6edac49d6a73634e48b3f85dafaea54fc Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:03:10 2016 +0100 fix some file headers --- .../ifremer/coselmar/beans/QuestionUserRole.java | 24 ++++++++++++++++++++++ .../services/StringLongMapValueComparator.java | 24 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/js/paginationBinder.js | 23 +++++++++++++++++++++ .../src/main/webapp/views/paginationTemplate.html | 23 +++++++++++++++++++++ 4 files changed, 94 insertions(+) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionUserRole.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionUserRole.java index 7df4e04..d6b693e 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionUserRole.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionUserRole.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.beans; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2016 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * Created by martel on 19/01/16. */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/StringLongMapValueComparator.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/StringLongMapValueComparator.java index 0482b45..f5168e9 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/StringLongMapValueComparator.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/StringLongMapValueComparator.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2016 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Comparator; import java.util.Map; diff --git a/coselmar-ui/src/main/webapp/js/paginationBinder.js b/coselmar-ui/src/main/webapp/js/paginationBinder.js index fc6606d..17cfb40 100644 --- a/coselmar-ui/src/main/webapp/js/paginationBinder.js +++ b/coselmar-ui/src/main/webapp/js/paginationBinder.js @@ -1,3 +1,26 @@ +/* + * #%L + * Coselmar :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2016 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ var paginationBinder = angular.module('coselmarApp'); paginationBinder.controller('paginationController', function($scope) { diff --git a/coselmar-ui/src/main/webapp/views/paginationTemplate.html b/coselmar-ui/src/main/webapp/views/paginationTemplate.html index 736c7d2..71f93b6 100644 --- a/coselmar-ui/src/main/webapp/views/paginationTemplate.html +++ b/coselmar-ui/src/main/webapp/views/paginationTemplate.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 - 2016 Ifremer, Code Lutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <div ng-controller="paginationController" class="clearfix"> <div class="pager"> <span ng-if="pageContext.firstPage === false"> -- 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.codelutin.com/coselmar.git commit daf9709555d566b8ad25488c2dc276ac4295d74d Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:03:34 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.4' 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 2ea473b..d9e7850 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.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 51a3edf..0d4e49f 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.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index a3674f7..2bfa238 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.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index e83df50..7eddabf 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.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index e9114b5..8846a6e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</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.codelutin.com/coselmar.git commit fe67fd5928d84c58270230c96960515c968d6f68 Merge: d63a60c daf9709 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:07:18 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' 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 | 23 ++ .../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 ++ .../ifremer/coselmar/beans/QuestionUserRole.java | 20 +- .../coselmar/converter/BeanEntityConverter.java | 6 +- .../services/StringLongMapValueComparator.java | 36 +- .../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 +- .../src/main/webapp/views/paginationTemplate.html | 39 ++ .../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, 1904 insertions(+), 584 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.codelutin.com/coselmar.git commit 2edcb08af198a97e7b18d52c629770b41a27e691 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:07:20 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 e420482..d9e7850 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.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index f3b35c7..0d4e49f 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.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 344e801..2bfa238 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.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 8946979..7eddabf 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.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index f8067ea..8846a6e 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.4</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.codelutin.com/coselmar.git commit 8f4e71df316da6592b9cb263b4f9b2d00cc6242a Merge: 2edcb08 fe67fd5 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:07:22 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' .../ifremer/coselmar/beans/QuestionUserRole.java | 24 ++++++++++++++++++++++ .../services/StringLongMapValueComparator.java | 24 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/js/paginationBinder.js | 23 +++++++++++++++++++++ .../src/main/webapp/views/paginationTemplate.html | 23 +++++++++++++++++++++ 4 files changed, 94 insertions(+) -- 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.codelutin.com/coselmar.git commit e83142a2b8d64de94203523fe14b5241453392cd Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:07:23 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 d9e7850..e420482 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.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 0d4e49f..f3b35c7 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.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 2bfa238..344e801 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.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 7eddabf..8946979 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.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 8846a6e..f8067ea 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.4</version> + <version>1.5-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