This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 7b0afb8 fixes #6914: Amélioration des temps d'ouverture de l'arbre de navigation Merge branch 'feature/6914' into develop new 46a27f1 refs #6933 ajout de getOcean sur le contrat de Trip new b8f6625 refs #6933 Pouvoir récuperer tous les marées new 04196f9 refs #6933 Récuperation de toutes les marees + utilisation des deux type de marees new eeab0f2 fixes #6933: bug à l'exportation données vers base centrale Merge branch 'feature/6933' into develop new 9022064 ajout base pour tests de la dernière migration 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 9022064c2bde3b99d8623bd38623bdc890bde71f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 10 19:58:22 2015 +0200 ajout base pour tests de la dernière migration commit eeab0f2eb0a147558cb56461e15fecf88471b47d Merge: 7b0afb8 04196f9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 10 19:57:46 2015 +0200 fixes #6933: bug à l'exportation données vers base centrale Merge branch 'feature/6933' into develop commit 04196f98170996dc398adb36c84e7b3765ba0b43 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 10 19:57:36 2015 +0200 refs #6933 Récuperation de toutes les marees + utilisation des deux type de marees commit b8f66252645c8c78347bb0644e39bfb54be289c0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 10 19:56:25 2015 +0200 refs #6933 Pouvoir récuperer tous les marées commit 46a27f1aef027e07dd24dc86aa89f4a4c98263e7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 10 19:53:15 2015 +0200 refs #6933 ajout de getOcean sur le contrat de Trip Summary of changes: .../test/resources/db/4.0-RC2/referentiel.sql.gz | Bin 0 -> 138115 bytes .../main/java/fr/ird/observe/entities/Trip.java | 3 + .../entities/longline/TripLonglineDAOImpl.java | 32 ++++++++- .../observe/entities/seine/TripSeineDAOImpl.java | 32 ++++++++- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 6 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 34 ++++++--- .../ui/admin/consolidate/ConsolidateUIHandler.java | 26 ++++--- .../ird/observe/ui/admin/export/ExportModel.java | 28 ++++++-- .../observe/ui/admin/export/ExportUIHandler.java | 78 +++++++++++++-------- .../fr/ird/observe/ui/admin/export/TripEntry.java | 36 ++++++---- .../ui/admin/export/TripToExportTableModel.java | 9 +-- 11 files changed, 205 insertions(+), 79 deletions(-) create mode 100644 observe-business/src/test/resources/db/4.0-RC2/referentiel.sql.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.