branch develop updated (22ceb5b -> 395eb60)
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 22ceb5b [jgitflow-maven-plugin]updating poms for 1.4-SNAPSHOT development new adcebae [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 389eb4f [jgitflow-maven-plugin]updating poms for branch'release/1.3' with non-snapshot versions new d63a60c [jgitflow-maven-plugin]merging 'release/1.3' into 'master' new 5b4185a [jgitflow-maven-plugin]merging 'master' into 'develop' new 395eb60 [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 395eb60e32829a7622d4f87f3f2a4e43deeb5e04 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 14:55:58 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 5b4185a9af2a71e65d12d33f9f9d85cae1389642 Merge: adcebae d63a60c Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 14:55:56 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit adcebaee1957bf1ada4b17759cceed398c3cdcdb Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 14:55:52 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d63a60c2d31cfd036076784c6daec3458eed7f27 Merge: 9cd3bdb 389eb4f Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 14:55:50 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.3' into 'master' commit 389eb4ff4606300763d35df8bf0a89730e18359e Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 14:28:52 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.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 389eb4ff4606300763d35df8bf0a89730e18359e Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 14:28:52 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.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 f42470c..dbc5691 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.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index f11f0e8..9801712 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.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 25c040a..47ed532 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.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 24112a8..380d0dc 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.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 534c3b4..568c427 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.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 d63a60c2d31cfd036076784c6daec3458eed7f27 Merge: 9cd3bdb 389eb4f Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 14:55:50 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.3' into 'master' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../persistence/entity/QuestionTopiaDao.java | 2 +- coselmar-rest/pom.xml | 2 +- .../coselmar/converter/BeanEntityConverter.java | 6 +- .../indexation/TransverseIndexationService.java | 2 - .../coselmar/services/v1/UsersWebService.java | 30 ++-- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/css/coselmar.css | 50 ++++++ coselmar-ui/src/main/webapp/i18n/en.js | 7 +- coselmar-ui/src/main/webapp/i18n/fr.js | 7 +- coselmar-ui/src/main/webapp/index.html | 6 +- .../src/main/webapp/js/coselmar-controllers.js | 175 ++++++++++++++++----- .../main/webapp/js/coselmar-questions-services.js | 12 +- .../src/main/webapp/js/coselmar-services.js | 16 +- .../src/main/webapp/js/coselmar-user-services.js | 16 +- .../main/webapp/views/documents/editDocument.html | 4 +- .../webapp/views/documents/modalDocumentEdit.html | 2 +- .../views/documents/modalDocumentSearch.html | 2 +- .../main/webapp/views/documents/newdocument.html | 4 +- .../src/main/webapp/views/documents/toolsPart.html | 30 ++-- coselmar-ui/src/main/webapp/views/home.html | 40 ++--- .../main/webapp/views/questions/editquestion.html | 8 +- .../views/questions/modalQuestionSearch.html | 4 +- .../src/main/webapp/views/questions/questions.html | 14 +- .../src/main/webapp/views/questions/toolsPart.html | 5 +- .../main/webapp/views/questions/viewquestion.html | 10 +- .../main/webapp/views/referential/referential.html | 10 +- .../src/main/webapp/views/users/edituser.html | 2 +- .../src/main/webapp/views/users/searchPart.html | 13 +- coselmar-ui/src/main/webapp/views/users/user.html | 7 +- pom.xml | 2 +- 32 files changed, 322 insertions(+), 172 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 adcebaee1957bf1ada4b17759cceed398c3cdcdb Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 14:55:52 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 2ea473b..dbc5691 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.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 51a3edf..9801712 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.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index a3674f7..47ed532 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.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index e83df50..380d0dc 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.3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index f486c3c..568c427 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.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 5b4185a9af2a71e65d12d33f9f9d85cae1389642 Merge: adcebae d63a60c Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 14:55:56 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.codelutin.com/coselmar.git commit 395eb60e32829a7622d4f87f3f2a4e43deeb5e04 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 14:55:58 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 dbc5691..2ea473b 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.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 9801712..51a3edf 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.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 47ed532..a3674f7 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.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 380d0dc..e83df50 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.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 568c427..f486c3c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.3</version> + <version>1.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