[Tutti-commits] branch develop updated (aae410e -> 4213fb5)

4 Apr 2015

      This is an automated email from the git hooks/post-receive script.

New change to branch develop in repository tutti.

See http://git.codelutin.com/tutti.git

      from  aae410e   fixes #6900: [IMPORT GENERIQUE] Changement cinématique de la vérification des poids Merge branch 'feature/6900' into develop
       new  08e721b   revoir la cinématique de confirmation d'écrasement des données à l'import
       new  4213fb5   fixes #6895: [IMPORT GENERIQUE] Revoir la cinématique d'écrasement des données Merge branch 'feature/6895' into develop

The 2 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 4213fb5e8b2b068f1c712ed2fe318b1785829b31
Merge: aae410e 08e721b
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Sat Apr 4 05:44:04 2015 +0200

    fixes #6895: [IMPORT GENERIQUE] Revoir la cinématique d'écrasement des données
    Merge branch 'feature/6895' into develop

commit 08e721b86ece82e5e31ba681968d951ecee15a6f
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Sat Apr 4 05:44:01 2015 +0200

    revoir la cinématique de confirmation d'écrasement des données à l'import

Summary of changes:
 .../genericformat/GenericFormatContextSupport.java |  4 -
 .../GenericFormatImportConfiguration.java          | 13 ---
 .../genericformat/GenericFormatImportRequest.java  |  4 -
 .../genericformat/GenericFormatResultSupport.java  |  4 -
 .../consumer/CsvConsumerForSurvey.java             |  6 +-
 .../resources/ftl/genericFormatImportReport_fr.ftl |  2 -
 .../GenericFormatImportServiceTest.java            | 96 ----------------------
 .../genericformat/GenericFormatImportUI.css        |  7 --
 .../genericformat/GenericFormatImportUI.jaxx       |  9 --
 .../GenericFormatImportUIHandler.java              |  2 +-
 .../genericformat/GenericFormatImportUIModel.java  | 20 +----
 .../actions/GenericFormatImportAction.java         | 40 ++++++++-
 .../genericformat/tree/CruiseSelectTreeNode.java   |  9 ++
 .../genericformat/tree/ProgramSelectTreeNode.java  | 12 +++
 .../resources/i18n/tutti-ui-swing_en_GB.properties |  3 +
 .../resources/i18n/tutti-ui-swing_fr_FR.properties |  3 +
 16 files changed, 71 insertions(+), 163 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

[Tutti-commits] branch develop updated (aae410e -> 4213fb5)

codelutin.com scm