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 dba70c6 fixes #6869: Impossible de valider ou d'annuler un login pour la récupération de la base new 46c638b refs #6870 Correction API protocol + ajout getProtocolByName new a0f8e0a refs #6870 Gestion de la surcharge du protocol new 9285511 select imported protocol in UI after import new 965a665 fixes #6870: [IMPORT GENERIQUE] Améliorer la gestion du protocole Merge branch 'feature/6870' into develop The 4 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 965a665adb98a31dc7a1dbf4487a21d389172bd9 Merge: dba70c6 9285511 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 26 09:37:40 2015 +0100 fixes #6870: [IMPORT GENERIQUE] Améliorer la gestion du protocole Merge branch 'feature/6870' into develop commit 9285511611d08a9bfa5de3dd2a0576f5fe17be4b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 26 09:36:39 2015 +0100 select imported protocol in UI after import commit a0f8e0ae943a02fecd840df3dcf50e89e175a949 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 26 09:08:33 2015 +0100 refs #6870 Gestion de la surcharge du protocol commit 46c638b3863e7e271e9c870c985363b4349cf43a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 26 09:08:05 2015 +0100 refs #6870 Correction API protocol + ajout getProtocolByName Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 9 ++- .../persistence/TuttiPersistenceNoDbImpl.java | 5 ++ .../service/ProtocolPersistenceService.java | 3 +- .../service/ProtocolPersistenceServiceImpl.java | 12 ++++ .../ifremer/tutti/service/PersistenceService.java | 5 ++ .../genericformat/GenericFormatContextSupport.java | 10 +++ .../GenericFormatImportConfiguration.java | 10 +++ .../genericformat/GenericFormatImportRequest.java | 4 ++ .../genericformat/GenericFormatResultSupport.java | 12 +++- .../importactions/ImportProtocolAction.java | 9 ++- .../importactions/RestoreAfterImportAction.java | 36 +++++++++- .../resources/i18n/tutti-service_en_GB.properties | 2 + .../resources/i18n/tutti-service_fr_FR.properties | 4 +- .../actions/GenericFormatImportAction.java | 78 +++++++++++++++++++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 ++ 16 files changed, 201 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.