branch develop updated (956d95b -> 09b20ec)
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 956d95b [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development new 54efcb6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6ff792b fix .gitignore new 028001a prepare release 0.3 new 93d8304 [jgitflow-maven-plugin]updating poms for branch'release/0.3' with non-snapshot versions new 65c582b Merge branch 'release/0.3' new 12a1af2 Merge branch 'master' into develop new 09b20ec [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 09b20ecfe347225ca0977b9f9f1f2b9304c72361 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:18:52 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 12a1af2acac6ab4bc792d6df488647495ac1ff31 Merge: 54efcb6 65c582b Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:18:52 2014 +0000 Merge branch 'master' into develop commit 54efcb6f6fda2347ee8f73a9bede3dcead0b43e9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:18:51 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 65c582bb43b9502cc83898212435f7de83a5dcda Merge: 6ff792b 93d8304 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:18:50 2014 +0000 Merge branch 'release/0.3' commit 93d8304a1e58d09d0c316a1734331f50e1dbdd53 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:12:52 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.3' with non-snapshot versions commit 028001a8af9d7b80fb69f89401dc6f05babc6359 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:12:38 2014 +0000 prepare release 0.3 Summary of changes: .gitignore | 2 ++ coselmar-persistence/pom.xml | 5 +++++ .../coselmar/persistence/SearchRequestBean.java | 24 ++++++++++++++++++++++ .../persistence/entity/QuestionTopiaDao.java | 24 ++++++++++++++++++++++ .../fr/ifremer/coselmar/beans/QuestionBean.java | 24 ++++++++++++++++++++++ .../coselmar/services/v1/QuestionsWebService.java | 24 ++++++++++++++++++++++ .../main/webapp/js/coselmar-questions-services.js | 23 +++++++++++++++++++++ .../webapp/views/documents/modalDocumentEdit.html | 23 +++++++++++++++++++++ .../views/documents/modalDocumentSearch.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/closeQuestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/editquestion.html | 23 +++++++++++++++++++++ .../webapp/views/questions/newDocumentsPart.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/newquestion.html | 23 +++++++++++++++++++++ .../src/main/webapp/views/questions/question.html | 23 +++++++++++++++++++++ .../src/main/webapp/views/questions/questions.html | 23 +++++++++++++++++++++ .../views/questions/viewRestrictedQuestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/viewquestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/referential/referential.html | 23 +++++++++++++++++++++ 18 files changed, 379 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 028001a8af9d7b80fb69f89401dc6f05babc6359 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:12:38 2014 +0000 prepare release 0.3 --- coselmar-persistence/pom.xml | 5 +++++ .../coselmar/persistence/SearchRequestBean.java | 24 ++++++++++++++++++++++ .../persistence/entity/QuestionTopiaDao.java | 24 ++++++++++++++++++++++ .../fr/ifremer/coselmar/beans/QuestionBean.java | 24 ++++++++++++++++++++++ .../coselmar/services/v1/QuestionsWebService.java | 24 ++++++++++++++++++++++ .../main/webapp/js/coselmar-questions-services.js | 23 +++++++++++++++++++++ .../webapp/views/documents/modalDocumentEdit.html | 23 +++++++++++++++++++++ .../views/documents/modalDocumentSearch.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/closeQuestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/editquestion.html | 23 +++++++++++++++++++++ .../webapp/views/questions/newDocumentsPart.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/newquestion.html | 23 +++++++++++++++++++++ .../src/main/webapp/views/questions/question.html | 23 +++++++++++++++++++++ .../src/main/webapp/views/questions/questions.html | 23 +++++++++++++++++++++ .../views/questions/viewRestrictedQuestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/viewquestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/referential/referential.html | 23 +++++++++++++++++++++ 17 files changed, 377 insertions(+) diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index d841809..a5d8f4f 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -47,6 +47,11 @@ <!-- Nuiton --> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/SearchRequestBean.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/SearchRequestBean.java index 6d38cc0..28d0243 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/SearchRequestBean.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/SearchRequestBean.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.persistence; +/* + * #%L + * Coselmar :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 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.io.Serializable; import java.util.List; diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java index 4db0467..54151cf 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.persistence.entity; +/* + * #%L + * Coselmar :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 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.HashMap; import java.util.List; import java.util.Map; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionBean.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionBean.java index 3126de1..18ccc77 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionBean.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionBean.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.beans; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 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.io.Serializable; import java.util.Date; import java.util.HashSet; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java index 726cb6c..9bce405 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.v1; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 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.ArrayList; import java.util.Collection; import java.util.Date; diff --git a/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js b/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js index 8856a1f..033de8f 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js @@ -1,3 +1,26 @@ +/* + * #%L + * Coselmar :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 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% + */ coselmarServices.factory('questionsService', ['$resource', 'coselmar-config', function($resource, coselmarConfig){ return new Question($resource, coselmarConfig); diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index 2d115ac..80644ba 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 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 xmlns="http://www.w3.org/1999/html"> <div class="modal-title"> <h2>New Document</h2> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html index 009d325..8c79067 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 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 style="padding: 0px 0px 0px 30px"> <div class="page-header"> diff --git a/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html index 2de1658..11ead0d 100644 --- a/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 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% + --> <!-- Close part : conclusion and conclusion documents --> <div class=""> diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 4a95d72..e46b0fe 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 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% + --> <!-- Line with Title --> <div class="form-group row" ng-class="{'has-error' : questionForm.title.$invalid && !questionForm.title.$pristine }"> diff --git a/coselmar-ui/src/main/webapp/views/questions/newDocumentsPart.html b/coselmar-ui/src/main/webapp/views/questions/newDocumentsPart.html index a742523..e418365 100644 --- a/coselmar-ui/src/main/webapp/views/questions/newDocumentsPart.html +++ b/coselmar-ui/src/main/webapp/views/questions/newDocumentsPart.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 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 class=""> <div class="form-group col-md-12"> diff --git a/coselmar-ui/src/main/webapp/views/questions/newquestion.html b/coselmar-ui/src/main/webapp/views/questions/newquestion.html index 37db08d..93e0e54 100644 --- a/coselmar-ui/src/main/webapp/views/questions/newquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/newquestion.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 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 style="padding: 0px 0px 0px 30px"> <div class="page-header" style="margin: 0"> <h2>Add a question</h2> diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html index 7f49861..7af86ef 100644 --- a/coselmar-ui/src/main/webapp/views/questions/question.html +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 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 style="padding: 0px 0px 0px 30px"> <div class="page-header" style="margin: 0"> <h2> diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index 87d02e1..970a32b 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 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 style="padding: 0px 0px 0px 30px"> <div class="page-header"> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewRestrictedQuestion.html b/coselmar-ui/src/main/webapp/views/questions/viewRestrictedQuestion.html index adf827e..1802bbe 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewRestrictedQuestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewRestrictedQuestion.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 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 class=""> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html index 94adbc6..b1a5cc3 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 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 class=""> diff --git a/coselmar-ui/src/main/webapp/views/referential/referential.html b/coselmar-ui/src/main/webapp/views/referential/referential.html index 73901e2..e025162 100644 --- a/coselmar-ui/src/main/webapp/views/referential/referential.html +++ b/coselmar-ui/src/main/webapp/views/referential/referential.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 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 style="padding: 0px 0px 0px 30px"> <div class="page-header" style="margin: 0"> <h2>Ask the Referential</h2> -- 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 93d8304a1e58d09d0c316a1734331f50e1dbdd53 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:12:52 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.3' 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 4f2aab8..5d63e82 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index a5d8f4f..1a1294e 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index ecbf7f3..bc2eb73 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index d19fcbb..a06bb42 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 5674c00..8de0223 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</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 65c582bb43b9502cc83898212435f7de83a5dcda Merge: 6ff792b 93d8304 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:18:50 2014 +0000 Merge branch 'release/0.3' .gitignore | 1 + coselmar-bundle/pom.xml | 22 +- coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 6 + coselmar-persistence/pom.xml | 8 +- .../coselmar/persistence/SearchRequestBean.java | 79 +++ .../persistence/entity/CoselmarUserTopiaDao.java | 119 ++++ .../persistence/entity/DocumentTopiaDao.java | 4 +- .../persistence/entity/QuestionTopiaDao.java | 82 +++ .../src/main/xmi/coselmar-model.properties | 4 +- .../src/main/xmi/coselmar-model.zargo | Bin 6557 -> 10090 bytes coselmar-rest/pom.xml | 10 +- .../fr/ifremer/coselmar/beans/QuestionBean.java | 299 ++++++++ .../fr/ifremer/coselmar/beans/UserSearchBean.java | 76 ++ .../coselmar/converter/BeanEntityConverter.java | 172 +++++ .../services/CoselmarRestApplicationListener.java | 6 +- .../services/CoselmarWebServiceSupport.java | 22 + .../coselmar/services/v1/DocumentsWebService.java | 19 +- .../services/v1/InitialisationService.java | 16 +- .../coselmar/services/v1/QuestionsWebService.java | 771 +++++++++++++++++++++ .../coselmar/services/v1/UsersWebService.java | 16 +- coselmar-rest/src/main/resources/mapping | 17 +- coselmar-ui/pom.xml | 33 +- coselmar-ui/src/main/webapp/css/coselmar.css | 131 +++- coselmar-ui/src/main/webapp/index.html | 50 +- .../src/main/webapp/js/coselmar-controllers.js | 583 +++++++++++++++- .../main/webapp/js/coselmar-questions-services.js | 97 +++ .../src/main/webapp/js/coselmar-services.js | 1 - coselmar-ui/src/main/webapp/js/coselmar.js | 19 + coselmar-ui/src/main/webapp/version.txt | 1 - .../src/main/webapp/views/documents/document.html | 2 +- .../src/main/webapp/views/documents/documents.html | 4 +- .../webapp/views/documents/modalDocumentEdit.html | 221 ++++++ .../{documents.html => modalDocumentSearch.html} | 24 +- .../main/webapp/views/documents/newdocument.html | 319 +++++---- coselmar-ui/src/main/webapp/views/home.html | 19 +- .../main/webapp/views/questions/closeQuestion.html | 79 +++ .../main/webapp/views/questions/editquestion.html | 274 ++++++++ .../webapp/views/questions/newDocumentsPart.html | 61 ++ .../newuser.html => questions/newquestion.html} | 26 +- .../src/main/webapp/views/questions/question.html | 88 +++ .../src/main/webapp/views/questions/questions.html | 84 +++ .../viewRestrictedQuestion.html} | 23 +- .../main/webapp/views/questions/viewquestion.html | 211 ++++++ .../main/webapp/views/referential/referential.html | 82 +++ .../src/main/webapp/views/users/edituser.html | 37 +- .../src/main/webapp/views/users/newuser.html | 2 +- coselmar-ui/src/main/webapp/views/users/user.html | 2 +- coselmar-ui/src/main/webapp/views/users/users.html | 10 +- pom.xml | 69 +- 49 files changed, 3948 insertions(+), 353 deletions(-) diff --cc .gitignore index 5d54f66,0ae7e26..fc6f9da --- a/.gitignore +++ b/.gitignore @@@ -17,6 -17,5 +17,7 @@@ /.settings /*/.settings /*/*.zargo~ +coselmar-ui/src/main/webapp/version.txt + + coselmar-ui/src/main/webapp/version.txt -- 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 54efcb6f6fda2347ee8f73a9bede3dcead0b43e9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:18:51 2014 +0000 [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 a214705..5d63e82 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index e8c6890..7583360 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 9793232..bc2eb73 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 41ee670..a06bb42 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 4585df2..8de0223 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3</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 12a1af2acac6ab4bc792d6df488647495ac1ff31 Merge: 54efcb6 65c582b Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:18:52 2014 +0000 Merge branch 'master' into develop .gitignore | 2 ++ coselmar-persistence/pom.xml | 5 +++++ .../coselmar/persistence/SearchRequestBean.java | 24 ++++++++++++++++++++++ .../persistence/entity/QuestionTopiaDao.java | 24 ++++++++++++++++++++++ .../fr/ifremer/coselmar/beans/QuestionBean.java | 24 ++++++++++++++++++++++ .../coselmar/services/v1/QuestionsWebService.java | 24 ++++++++++++++++++++++ .../main/webapp/js/coselmar-questions-services.js | 23 +++++++++++++++++++++ .../webapp/views/documents/modalDocumentEdit.html | 23 +++++++++++++++++++++ .../views/documents/modalDocumentSearch.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/closeQuestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/editquestion.html | 23 +++++++++++++++++++++ .../webapp/views/questions/newDocumentsPart.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/newquestion.html | 23 +++++++++++++++++++++ .../src/main/webapp/views/questions/question.html | 23 +++++++++++++++++++++ .../src/main/webapp/views/questions/questions.html | 23 +++++++++++++++++++++ .../views/questions/viewRestrictedQuestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/viewquestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/referential/referential.html | 23 +++++++++++++++++++++ 18 files changed, 379 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 09b20ecfe347225ca0977b9f9f1f2b9304c72361 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:18:52 2014 +0000 [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 5d63e82..a214705 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 1a1294e..1bddff9 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index bc2eb73..9793232 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index a06bb42..41ee670 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 8de0223..4585df2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3</version> + <version>0.4-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