branch develop updated (85fd0eb -> 7735e70)
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 85fd0eb [jgitflow-maven-plugin]updating poms for 0.9-SNAPSHOT development new f262adc [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 51b86af prepare release new 6340aa6 [jgitflow-maven-plugin]updating poms for branch'release/0.8' with non-snapshot versions new b589625 Merge branch 'release/0.8' new 23c344f Merge branch 'master' into develop new 7735e70 [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 7735e70cac3eb4883d2067fec3f74a8eb32c1504 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:31:32 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 23c344f4bc1f0ea87f2cf858deee37c857055a12 Merge: f262adc b589625 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:31:32 2015 +0000 Merge branch 'master' into develop commit f262adc7cf5e0ed622da197fead1b196ea7606d9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:31:32 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b5896257212a26f522371c12dfeb62021b63cf4b Merge: d735f55 6340aa6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:31:31 2015 +0000 Merge branch 'release/0.8' commit 6340aa621437d74b7d9cd691eb718667b367945a Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:30:20 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.8' with non-snapshot versions commit 51b86afdff2a5aea4c02fb1e2014a901be7b71d4 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:30:03 2015 +0000 prepare release Summary of changes: .../src/main/webapp/i18n/angular-locale_en.js | 23 ++++++++++++++++++++++ .../src/main/webapp/i18n/angular-locale_fr.js | 23 ++++++++++++++++++++++ 2 files changed, 46 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 51b86afdff2a5aea4c02fb1e2014a901be7b71d4 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:30:03 2015 +0000 prepare release --- .../src/main/webapp/i18n/angular-locale_en.js | 23 ++++++++++++++++++++++ .../src/main/webapp/i18n/angular-locale_fr.js | 23 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/coselmar-ui/src/main/webapp/i18n/angular-locale_en.js b/coselmar-ui/src/main/webapp/i18n/angular-locale_en.js index 6ca9e4f..8a4896e 100644 --- a/coselmar-ui/src/main/webapp/i18n/angular-locale_en.js +++ b/coselmar-ui/src/main/webapp/i18n/angular-locale_en.js @@ -1,3 +1,26 @@ +/* + * #%L + * Coselmar :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 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% + */ 'use strict'; angular.module("ngLocale", [], ["$provide", function($provide) { var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"}; diff --git a/coselmar-ui/src/main/webapp/i18n/angular-locale_fr.js b/coselmar-ui/src/main/webapp/i18n/angular-locale_fr.js index adac17d..6e56a02 100644 --- a/coselmar-ui/src/main/webapp/i18n/angular-locale_fr.js +++ b/coselmar-ui/src/main/webapp/i18n/angular-locale_fr.js @@ -1,3 +1,26 @@ +/* + * #%L + * Coselmar :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 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% + */ 'use strict'; angular.module("ngLocale", [], ["$provide", function($provide) { var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"}; -- 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 6340aa621437d74b7d9cd691eb718667b367945a Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:30:20 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.8' 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 06ca534..2abb667 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.8-SNAPSHOT</version> + <version>0.8</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 257b9c2..5429ab7 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.8-SNAPSHOT</version> + <version>0.8</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index d7a4c43..be864b1 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.8-SNAPSHOT</version> + <version>0.8</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 0c0e52a..1440f6a 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.8-SNAPSHOT</version> + <version>0.8</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index a6272d7..2251656 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.8</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 b5896257212a26f522371c12dfeb62021b63cf4b Merge: d735f55 6340aa6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:31:31 2015 +0000 Merge branch 'release/0.8' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../persistence/entity/DocumentTopiaDao.java | 13 +- coselmar-rest/pom.xml | 3 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 23 ++- .../services/CoselmarWebServiceSupport.java | 77 ++++++++- .../coselmar/services/v1/DocumentsWebService.java | 192 ++++++++++++++++----- .../coselmar/services/v1/QuestionsWebService.java | 97 ++++++++--- .../coselmar/services/v1/UsersWebService.java | 48 +++++- coselmar-rest/src/main/resources/mapping | 1 + coselmar-ui/pom.xml | 8 +- .../src/main/webapp/i18n/angular-locale_en.js | 138 +++++++++++++++ .../src/main/webapp/i18n/angular-locale_fr.js | 120 +++++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 6 + coselmar-ui/src/main/webapp/i18n/fr.js | 6 + coselmar-ui/src/main/webapp/index.html | 1 + coselmar-ui/src/main/webapp/js/angular-jwt.js | 38 ++-- .../src/main/webapp/js/coselmar-controllers.js | 113 ++++++++++-- .../main/webapp/js/coselmar-questions-services.js | 2 - .../src/main/webapp/js/coselmar-services.js | 7 + coselmar-ui/src/main/webapp/js/coselmar.js | 8 +- .../src/main/webapp/views/documents/documents.html | 1 + .../main/webapp/views/documents/editDocument.html | 38 +++- .../webapp/views/documents/modalDocumentEdit.html | 2 + .../views/documents/modalDocumentSearch.html | 1 + .../main/webapp/views/documents/newdocument.html | 30 +++- .../main/webapp/views/documents/viewDocument.html | 2 + .../main/webapp/views/questions/closeQuestion.html | 2 +- .../main/webapp/views/questions/editquestion.html | 2 +- .../views/questions/modalQuestionSearch.html | 1 + .../webapp/views/questions/newDocumentsPart.html | 2 +- .../src/main/webapp/views/questions/questions.html | 1 + .../main/webapp/views/questions/viewquestion.html | 4 +- .../main/webapp/views/referential/referential.html | 13 +- coselmar-ui/src/main/webapp/views/users/users.html | 1 + pom.xml | 17 +- 36 files changed, 888 insertions(+), 134 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 f262adc7cf5e0ed622da197fead1b196ea7606d9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:31:32 2015 +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 294bbb7..2abb667 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.9-SNAPSHOT</version> + <version>0.8</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index b17cf30..5429ab7 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.9-SNAPSHOT</version> + <version>0.8</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index f368fa7..be864b1 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.9-SNAPSHOT</version> + <version>0.8</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 1568b57..1440f6a 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.9-SNAPSHOT</version> + <version>0.8</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 22040a1..2251656 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8</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 23c344f4bc1f0ea87f2cf858deee37c857055a12 Merge: f262adc b589625 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:31:32 2015 +0000 Merge branch 'master' into develop .../src/main/webapp/i18n/angular-locale_en.js | 23 ++++++++++++++++++++++ .../src/main/webapp/i18n/angular-locale_fr.js | 23 ++++++++++++++++++++++ 2 files changed, 46 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 7735e70cac3eb4883d2067fec3f74a8eb32c1504 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 6 11:31:32 2015 +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 2abb667..294bbb7 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.8</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 5429ab7..b17cf30 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.8</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index be864b1..f368fa7 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.8</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 1440f6a..1568b57 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.8</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 2251656..22040a1 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.8</version> + <version>0.9-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