branch develop updated (d6af0af -> ae2d49c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git from d6af0af Revert lib update (not working at all) new 0bdcf97 Change release version new ad86166 Happy new year commit new ae2d49c fixes #9058: ERROR fr.ifremer.coser.web.CoserApplicationListener:83 - Zone with no picture: solper The 3 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 ae2d49c6ac915b59f402530a9ae1602984337d46 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Feb 17 17:17:06 2017 +0100 fixes #9058: ERROR fr.ifremer.coser.web.CoserApplicationListener:83 - Zone with no picture: solper commit ad8616610d5540addc886820e0ec9319646144c1 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Feb 17 17:16:27 2017 +0100 Happy new year commit commit 0bdcf9748e090a721a1ac1fa116f12420de08eb2 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Feb 17 17:16:17 2017 +0100 Change release version Summary of changes: coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp | 2 +- .../src/main/webapp/WEB-INF/decorators/sublayout.jsp | 2 +- coser-web/src/main/webapp/images/zones/Solper.png | Bin 0 -> 22640 bytes pom.xml | 4 ++-- 7 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 coser-web/src/main/webapp/images/zones/Solper.png -- 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 coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 0bdcf9748e090a721a1ac1fa116f12420de08eb2 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Feb 17 17:16:17 2017 +0100 Change release version --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 8a0163c..380c537 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index e12f2ad..acb71c5 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index ce51e73..28ba571 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 733c987..791deb3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>10.1</version> + <version>10.5</version> </parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.7-SNAPSHOT</version> <packaging>pom</packaging> <name>Coser</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 coser. See https://gitlab.nuiton.org/codelutin/coser.git commit ad8616610d5540addc886820e0ec9319646144c1 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Feb 17 17:16:27 2017 +0100 Happy new year commit --- coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp | 2 +- coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp b/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp index 3e95f17..2567a2c 100644 --- a/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp +++ b/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp @@ -123,7 +123,7 @@ </a> </li> <li> - Copyright 2010 - 2016 + Copyright 2010 - 2017 <a href="http://www.ifremer.fr" title="Ifremer" target="_blank">Ifremer</a>, <a href="http://www.codelutin.com" title="Code Lutin" target="_blank">Code Lutin</a> </li> diff --git a/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp b/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp index e57ea17..64772eb 100644 --- a/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp +++ b/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp @@ -121,7 +121,7 @@ </a> </li> <li> - Copyright 2010 - 2016 + Copyright 2010 - 2017 <a href="http://www.ifremer.fr" title="Ifremer" target="_blank">Ifremer</a>, <a href="http://www.codelutin.com" title="Code Lutin" target="_blank">Code Lutin</a> </li> -- 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 coser. See https://gitlab.nuiton.org/codelutin/coser.git commit ae2d49c6ac915b59f402530a9ae1602984337d46 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Feb 17 17:17:06 2017 +0100 fixes #9058: ERROR fr.ifremer.coser.web.CoserApplicationListener:83 - Zone with no picture: solper --- coser-web/src/main/webapp/images/zones/Solper.png | Bin 0 -> 22640 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/coser-web/src/main/webapp/images/zones/Solper.png b/coser-web/src/main/webapp/images/zones/Solper.png new file mode 100644 index 0000000..50340ff Binary files /dev/null and b/coser-web/src/main/webapp/images/zones/Solper.png differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm