This is an automated email from the git hooks/post-receive script. New change to branch master in repository wao. See http://git.codelutin.com/wao.git omits 9fc69ae Suppression de code mort omits ebfcdfe On redirige les mauvais appels HTTP vers la racine (fixes #5402) omits a7d97ea On évite de répéter plusieurs fois un même secteur dans le contenu du mail envoyé en cas de capture accidentelle (fixes #5922) omits 9e7d886 La durée moyenne d'une marée (ObsMer) passe en nombre entier (fixes #5117) omits c1e8d3f Ajout d'entêtes de licences manquants omits 0416288 À la sortie du formulaire de modification d'un contact, on retourne à la page sur laquelle on se trouvait (fixes #5746) omits 27fe8c4 Correction d'un message de log qui affichera toujours 'null' omits 666fb48 On utilise le cookie wao pour stocker le choix de la vue compacte/étendu dans le plan obsvente et dans les contacts (refs #5746) omits 5fa875c Récupération du cookie par défaut depuis struts (refs #5746) omits 6e1bacd Tronc en 4.2 conformément à la feuille de route omits f1c6717 Fusion de la branche 4.1.x dans le tronc (4.2) omits 2e98069 Prototype pour le plan d'échantillonnage ObsMer, on sauve dans un cookie le choix de mode compact/étendu, par contre on a perdu la valeur par défaut (refs #5746) adds 8d3a6ea Création d'une branche 4.1.x adds 927f079 Mise à jour du pom pour la branche 4.1.x adds 6509eef Fusion dans la branche 4.1.x des corrections effectuées en 4.0.x adds ce08564 [maven-release-plugin] prepare release wao-4.1 adds c8785db [maven-release-plugin] copy for tag wao-4.1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9fc69ae) \ N -- N -- N refs/heads/master (c8785db) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. 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: pom.xml | 8 +-- wao-persistence/pom.xml | 2 +- .../migration/V4_2__average_tide_time_to_int.sql | 24 ------- wao-persistence/src/main/xmi/wao-model.properties | 2 +- wao-persistence/src/main/xmi/wao-model.zargo | Bin 59661 -> 59675 bytes .../fr/ifremer/wao/entity/ContactStateTest.java | 21 ------ .../ifremer/wao/entity/SampleRowLogImplTest.java | 2 +- wao-services/pom.xml | 2 +- .../wao/services/service/ObsMerSamplingPlan.java | 10 +-- .../service/ObsMerSamplingPlanBuilder.java | 4 +- .../service/ObsMerSamplingPlanService.java | 6 +- .../service/administration/ReferentialService.java | 75 ++++++++++++++++++++- ...bsMerObsVenteSamplingPlanImportExportModel.java | 2 +- .../service/mail/MammalsObservationEmail.java | 8 ++- wao-web/pom.xml | 2 +- .../wao/web/RedirectToContextPathRootFilter.java | 47 ------------- .../fr/ifremer/wao/web/WaoJspActionSupport.java | 19 ------ .../wao/web/action/AbstractSamplingPlanAction.java | 5 ++ .../fr/ifremer/wao/web/action/BoatsAction.java | 2 +- .../fr/ifremer/wao/web/action/ContactsAction.java | 8 ++- .../ifremer/wao/web/action/EditContactAction.java | 12 +--- .../web/WaoJspActionSupport-conversion.properties | 21 ------ .../src/main/webapp/WEB-INF/content/contacts.jsp | 17 ++--- .../webapp/WEB-INF/content/edit-contact-input.jsp | 6 +- .../WEB-INF/content/obsmer/sampling-plan.jsp | 18 +++-- .../WEB-INF/content/obsvente/sampling-plan.jsp | 12 ++-- .../webapp/WEB-INF/decorators/layout-login.jsp | 2 + .../src/main/webapp/WEB-INF/decorators/layout.jsp | 51 +------------- wao-web/src/main/webapp/WEB-INF/web.xml | 11 --- wao-web/src/main/webapp/endpoints-js.jsp | 39 +++++++++++ wao-web/src/main/webapp/wao.js | 51 +++++--------- 31 files changed, 188 insertions(+), 301 deletions(-) delete mode 100644 wao-persistence/src/main/resources/db/migration/V4_2__average_tide_time_to_int.sql delete mode 100644 wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java delete mode 100644 wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties create mode 100644 wao-web/src/main/webapp/endpoints-js.jsp -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.