branch develop updated (ccb5f72 -> f27cd7a)
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 ccb5f72 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new 811788a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d72b796 [jgitflow-maven-plugin]updating poms for branch '1.0-RC-3' with snapshot versions new d3ca6a2 [jgitflow-maven-plugin]updating poms for branch'release/1.0-RC-3' with non-snapshot versions new 2aabdfb Merge branch 'release/1.0-RC-3' new ab9a37d Merge branch 'master' into develop new f27cd7a [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 f27cd7ac1a7e38e2177c9ab2288a729a2e1f62bb Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 2 17:25:06 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit ab9a37dd6e3a951f6ec8385965718bdd1175edcb Merge: 811788a 2aabdfb Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 2 17:25:06 2015 +0000 Merge branch 'master' into develop commit 811788a4b0e9f6b4360d6e1eb6b4c19f258388ba Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 2 17:25:06 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 2aabdfbcb3952a35b585cd725fdeb7a783d73899 Merge: 6a9bfde d3ca6a2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 2 17:25:04 2015 +0000 Merge branch 'release/1.0-RC-3' commit d3ca6a26b263a14faa889a47293de1e378b90d9a Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 2 17:23:51 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.0-RC-3' 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.codelutin.com/coselmar.git commit d3ca6a26b263a14faa889a47293de1e378b90d9a Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 2 17:23:51 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.0-RC-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 8ad56b4..cb55ff4 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.0-RC-3-SNAPSHOT</version> + <version>1.0-RC-3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 2038ebd..71f7534 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.0-RC-3-SNAPSHOT</version> + <version>1.0-RC-3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 670b8f1..aa5f6aa 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.0-RC-3-SNAPSHOT</version> + <version>1.0-RC-3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index e5e8d74..8635dc5 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.0-RC-3-SNAPSHOT</version> + <version>1.0-RC-3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index dee420b..851f2ff 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-3-SNAPSHOT</version> + <version>1.0-RC-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 2aabdfbcb3952a35b585cd725fdeb7a783d73899 Merge: 6a9bfde d3ca6a2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 2 17:25:04 2015 +0000 Merge branch 'release/1.0-RC-3' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../src/main/xmi/coselmar-model.zargo | Bin 10390 -> 10470 bytes coselmar-rest/pom.xml | 2 +- .../indexation/DocumentsIndexationService.java | 28 ++++++----- .../indexation/QuestionsIndexationService.java | 13 +++-- .../coselmar/services/v1/QuestionsWebService.java | 1 + .../indexation/DocumentsIndexationServiceTest.java | 10 ++++ coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/css/coselmar.css | 3 ++ coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + .../src/main/webapp/js/coselmar-controllers.js | 13 +++-- .../main/webapp/js/coselmar-questions-services.js | 14 ++++-- .../main/webapp/views/documents/editDocument.html | 6 +-- .../webapp/views/documents/modalDocumentEdit.html | 2 +- .../main/webapp/views/documents/newdocument.html | 2 +- coselmar-ui/src/main/webapp/views/home.html | 53 ++++++++++----------- .../main/webapp/views/questions/viewquestion.html | 4 +- .../src/main/webapp/views/users/edituser.html | 2 +- pom.xml | 2 +- 21 files changed, 95 insertions(+), 68 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 811788a4b0e9f6b4360d6e1eb6b4c19f258388ba Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 2 17:25:06 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 f5f9174..cb55ff4 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.0-SNAPSHOT</version> + <version>1.0-RC-3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 477abe6..71f7534 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.0-SNAPSHOT</version> + <version>1.0-RC-3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 4ed8325..aa5f6aa 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.0-SNAPSHOT</version> + <version>1.0-RC-3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index e52c52e..8635dc5 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.0-SNAPSHOT</version> + <version>1.0-RC-3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 49a7d8c..851f2ff 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-RC-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 ab9a37dd6e3a951f6ec8385965718bdd1175edcb Merge: 811788a 2aabdfb Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 2 17:25:06 2015 +0000 Merge branch '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.codelutin.com/coselmar.git commit f27cd7ac1a7e38e2177c9ab2288a729a2e1f62bb Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 2 17:25:06 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 cb55ff4..f5f9174 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.0-RC-3</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 71f7534..477abe6 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.0-RC-3</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index aa5f6aa..4ed8325 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.0-RC-3</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 8635dc5..e52c52e 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.0-RC-3</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 851f2ff..49a7d8c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-3</version> + <version>1.0-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