branch develop updated (b006f301 -> ec61f286)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from b006f301 [jgitflow-maven-plugin]updating poms for 4.0.11-SNAPSHOT development new 5083c76c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new e859a4ec Fix release ... new abf28b34 [jgitflow-maven-plugin]updating poms for branch'release/4.0.10' with non-snapshot versions new 82ccbcac [jgitflow-maven-plugin]merging 'release/4.0.10' into 'master' new 229fbd57 [jgitflow-maven-plugin]merging 'master' into 'develop' new ec61f286 [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 ec61f2869be5ec3eab36a01e9f1b7dca6583fcba Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:45:32 2018 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 229fbd57968edb0882911f331d30e94fea63ab01 Merge: 5083c76c 82ccbcac Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:45:29 2018 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 5083c76c1def1441c1a909b0dfb8b16f21c7be71 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:45:25 2018 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 82ccbcac070baaddcfb3217a43f7c6e4824fb70f Merge: 749e32a4 abf28b34 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:45:05 2018 +0100 [jgitflow-maven-plugin]merging 'release/4.0.10' into 'master' commit abf28b3443ab6226e19d24c07a9c1fa38f9bedef Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:42:02 2018 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.10' with non-snapshot versions commit e859a4ecdec8de12c1a6f9e524acb4d19adfd170 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:41:07 2018 +0100 Fix release ... Summary of changes: echobase-domain/pom.xml | 21 +++++++++++++++++++++ echobase-services/pom.xml | 21 +++++++++++++++++++++ echobase-ui/pom.xml | 21 +++++++++++++++++++++ .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 2 +- pom.xml | 21 +++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit e859a4ecdec8de12c1a6f9e524acb4d19adfd170 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:41:07 2018 +0100 Fix release ... --- echobase-domain/pom.xml | 21 +++++++++++++++++++++ echobase-services/pom.xml | 21 +++++++++++++++++++++ echobase-ui/pom.xml | 21 +++++++++++++++++++++ .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 2 +- pom.xml | 21 +++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 4d7b35a7..196854b1 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + EchoBase :: Domain + %% + Copyright (C) 2011 - 2018 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 2cd956a5..48ed2483 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + EchoBase :: Services + %% + Copyright (C) 2011 - 2018 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 6ebc0550..1c57fff1 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + EchoBase :: UI + %% + Copyright (C) 2011 - 2018 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp index 265021a1..79530b46 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp @@ -369,7 +369,7 @@ </s:if> <s:elseif test='#meta.columnType == "boolean"'> <s:checkbox id="%{#metaName}" name="%{#metaName}" - readonly="%{!admin}" + disabled="%{!admin}" label="%{#metaName}" value="%{false}"/> </s:elseif> <s:elseif test='#meta.columnType == "date"'> diff --git a/pom.xml b/pom.xml index 99d4fa4e..5bc6f3d8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + EchoBase + %% + Copyright (C) 2011 - 2018 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit abf28b3443ab6226e19d24c07a9c1fa38f9bedef Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:42:02 2018 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.10' with non-snapshot versions --- echobase-domain/pom.xml | 4 ++-- echobase-services/pom.xml | 4 ++-- echobase-ui/pom.xml | 4 ++-- pom.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 196854b1..f44a6df7 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.10-SNAPSHOT</version> + <version>4.0.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 48ed2483..20e4aa6f 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.10-SNAPSHOT</version> + <version>4.0.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 1c57fff1..b66fd2d0 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.10-SNAPSHOT</version> + <version>4.0.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 5bc6f3d8..47e1b288 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.10-SNAPSHOT</version> + <version>4.0.10</version> <modules> <module>echobase-domain</module> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 82ccbcac070baaddcfb3217a43f7c6e4824fb70f Merge: 749e32a4 abf28b34 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:45:05 2018 +0100 [jgitflow-maven-plugin]merging 'release/4.0.10' into 'master' echobase-domain/pom.xml | 23 +++++++++++++++++- echobase-services/pom.xml | 23 +++++++++++++++++- .../service/atlantos/xml/XmlAccousticExport.java | 8 +++---- .../service/atlantos/xml/XmlBioticExport.java | 9 ++++---- echobase-ui/pom.xml | 23 +++++++++++++++++- .../resources/i18n/echobase-ui_fr_FR.properties | 2 +- .../src/main/webapp/WEB-INF/includes/footer.jsp | 2 +- .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 2 +- pom.xml | 27 +++++++++++++++++++--- src/site/en/rst/importData.rst | 2 +- src/site/en/rst/removeData.rst | 22 ++++++++---------- src/site/en/rst/update.rst.vm | 2 +- 12 files changed, 113 insertions(+), 32 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 5083c76c1def1441c1a909b0dfb8b16f21c7be71 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:45:25 2018 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 6d561dce..8c592a54 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.11-SNAPSHOT</version> + <version>4.0.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 5a68e6ed..df545408 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.11-SNAPSHOT</version> + <version>4.0.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 62239885..adf370e1 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.11-SNAPSHOT</version> + <version>4.0.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index eff74c0e..19793e38 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.11-SNAPSHOT</version> + <version>4.0.10</version> <modules> <module>echobase-domain</module> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 229fbd57968edb0882911f331d30e94fea63ab01 Merge: 5083c76c 82ccbcac Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:45:29 2018 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' echobase-domain/pom.xml | 21 +++++++++++++++++++++ echobase-services/pom.xml | 21 +++++++++++++++++++++ echobase-ui/pom.xml | 21 +++++++++++++++++++++ .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 2 +- pom.xml | 21 +++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit ec61f2869be5ec3eab36a01e9f1b7dca6583fcba Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 5 15:45:32 2018 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index f44a6df7..bfb644ac 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.10</version> + <version>4.0.11-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 20e4aa6f..eb483c21 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.10</version> + <version>4.0.11-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index b66fd2d0..feee9168 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.10</version> + <version>4.0.11-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 47e1b288..23c71b7c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.10</version> + <version>4.0.11-SNAPSHOT</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm