This is an automated email from the git hooks/post-receive script. New change to branch master in repository coser. See http://git.codelutin.com/coser.git omits 2d00b87 Merge branch 'release/1.5' omits 32289d9 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions omits 9c7e08e prepare release 1.5 omits e0d1c0b refs #6356: Revue de la documentation du site omits 2ae16c6 fixes #5185: Revoir la fonctionnalité d'extraction des données pour les données pelagiques fixes #5692: Can't download source for result omits dd885e3 fixes #6356: Revue de la documentation du site omits 2c854a1 fixes #6358: Export des données : mauvais en-têtes omits 8125d7c fix double writer close omits dd6b8e6 remove commented code omits 04edd21 fixes #6357: [Indices de population] Export des données incorrect pour les données EchoBase omits 5981156 fixes #5184: Traduire en anglais les nouveaux textes intégrés pour EchoBase omits a199650 refs #6356: fix jnlp configuration omits 78198c4 refs #6356: Revue de la documentation du site + mise à jour codelutinpom omits 7b5c3ed refs #6356: Revue de la documentation du site + mise à jour codelutinpom omits 0a457c3 refs #5918: Migration Git (fix release build) omits b68b02f fixes #5918: Migration Git (fix scm section) omits 69acaa7 fixes #5918: Migration Git omits fea3755 fixes #5693: Regroupement des noeuds par message ET categorie omits 9b3f845 add log omits 0f2f62a improve zone map omits 4d58d35 add pelgas zone omits 6f86e67 [maven-release-plugin] prepare for next development iteration This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master (721dd08) \ O -- O -- O (2d00b87) Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .gitignore | 14 -- coser-business/pom.xml | 25 +- .../main/java/fr/ifremer/coser/bean/ZoneMap.java | 268 ++++----------------- .../ifremer/coser/result/CoserRequestExecutor.java | 46 +--- .../echobase/command/AbstractEchoBaseCommand.java | 26 +- .../command/ExtractRawDataAndResultsCommand.java | 23 +- .../echobase/command/ExtractRawDataCommand.java | 52 +--- ...tMatchingRepositoryTypeForMapResultCommand.java | 22 -- ...tMatchingRepositoryTypeForMapResultCommand.java | 22 -- ...tMatchingRepositoryTypeForMapResultRequest.java | 22 -- .../ifremer/coser/services/WebResultService.java | 25 -- .../fr/ifremer/coser/storage/DataStorages.java | 8 +- .../resources/i18n/coser-business_en_GB.properties | 6 +- .../resources/i18n/coser-business_fr_FR.properties | 4 +- coser-business/src/site/site_en.xml | 25 ++ coser-business/src/site/site_fr.xml | 25 ++ coser-ui/pom.xml | 6 +- .../main/java/fr/ifremer/coser/CoserConfig.java | 2 +- .../ifremer/coser/CoserUIApplicationContext.java | 4 +- .../coser/ui/control/GlobalControlErrorModel.java | 6 +- coser-ui/src/main/jnlp/coser-jnlp.vm | 2 +- coser-ui/src/site/site_en.xml | 29 ++- coser-ui/src/site/site_fr.xml | 29 ++- coser-web/pom.xml | 3 +- .../coser/web/CoserApplicationListener.java | 26 -- .../java/fr/ifremer/coser/web/ServiceHelper.java | 8 +- .../coser/web/actions/admin/package-info.java | 21 -- .../coser/web/actions/auth/package-info.java | 21 -- .../coser/web/actions/pop/GraphDataAction.java | 17 ++ .../coser/web/actions/pop/GraphDownloadAction.java | 18 ++ .../coser/web/actions/source/SourceDataAction.java | 31 ++- .../main/resources/i18n/coser-web_en_GB.properties | 6 +- .../main/resources/i18n/coser-web_fr_FR.properties | 4 +- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 2 +- .../main/webapp/WEB-INF/decorators/sublayout.jsp | 2 +- .../src/main/webapp/images/zones/C_Pelgas.png | Bin 79445 -> 0 bytes coser-web/src/site/site_en.xml | 29 ++- coser-web/src/site/site_fr.xml | 29 ++- pom.xml | 161 ++++--------- src/site/site_en.xml | 151 +++++++----- src/site/site_fr.xml | 152 +++++++----- 41 files changed, 568 insertions(+), 804 deletions(-) delete mode 100644 .gitignore delete mode 100644 coser-web/src/main/webapp/images/zones/C_Pelgas.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.