This is an automated email from the git hooks/post-receive script. New change to branch feature/7177 in repository observe. See http://git.codelutin.com/observe.git discards ae61315 fixes #7177 : correction des libellé de la légendes adds c571621 ajout d'une migration 4.0 pour que la base soit sur la version final 4.0 (refs #7196) adds 20ec57e fixes #7196: Ajout d'une migration de base pour être en 4.0 Merge branch 'feature/7196' into develop adds 8cd3e94 refs #7045 : la verification que la position du curseur est trop réstricive. adds c74669b refs #7045 : la verification que la position du curseur est trop réstricive. adds 402c795 fixes #7045: [ObserveLL] Schéma de palangre (composition détaillée) : problème de clic droit sous Windows (empêche la suppression de paniers ou avancons) Merge branch 'feature/7045' into develop new 47706bc fixes #7177 : correction des libellé de la légendes 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 (ae61315) \ N -- N -- N refs/heads/feature/7177 (47706bc) 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. The 1 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 47706bc35f3fa41235144a0a9255c89392f53385 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Jun 5 15:14:10 2015 +0200 fixes #7177 : correction des libellé de la légendes Summary of changes: .../main/java/fr/ird/converter/FloatConverter.java | 2 +- .../java/fr/ird/converter/FloatConverterTest.java | 2 +- .../migration/AbstractDataSourceMigration.java | 3 +- ...java => DataSourceMigrationForVersion_4_0.java} | 40 ++++++---------------- .../DataSourceMigrationForVersion_4_0_RC4.java | 5 --- .../DataSourceMigrationForVersion_4_0_RC7.java | 5 --- .../main/java/fr/ird/type/CoordinateHelper.java | 2 +- .../src/main/resources/db/4.0/empty-H2.sql | 2 ++ .../src/main/resources/db/4.0/empty-PG.sql | 2 ++ .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 9 +---- .../AutotSelectRowAndShowPopupActionSupport.java | 7 +--- 14 files changed, 24 insertions(+), 61 deletions(-) copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_3_12.java => DataSourceMigrationForVersion_4_0.java} (52%) create mode 100644 observe-entities/src/main/resources/db/4.0/empty-H2.sql create mode 100644 observe-entities/src/main/resources/db/4.0/empty-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.