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 6e9e8f9 fixes #6901: [TECH] Uniformisation du comportement des listes d'actions Merge branch 'feature/6901' into develop new 8b7bf60 ajout de l'option qui permet de ne pas faire une sauvegarde avant d'importer ou installer une base new b8eac0f ajout aussi d'un drapeau pour fermer sauvagemment la base new 3f02507 fixes #6902: [TECH] Ajouter une option pour pouvoir ne pas effectuer une sauvegarde avant chaque import de base Merge branch 'feature/6902' into develop The 3 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 3f02507bbccfa7c50425c21fbb941ece22257ec0 Merge: 6e9e8f9 b8eac0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 4 10:38:57 2015 +0200 fixes #6902: [TECH] Ajouter une option pour pouvoir ne pas effectuer une sauvegarde avant chaque import de base Merge branch 'feature/6902' into develop commit b8eac0f758c09d36435f0091f4a6db50bcc40fa1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 4 10:38:52 2015 +0200 ajout aussi d'un drapeau pour fermer sauvagemment la base commit 8b7bf6080930da65f3f7136e248006aefe5e738d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 4 10:20:22 2015 +0200 ajout de l'option qui permet de ne pas faire une sauvegarde avant d'importer ou installer une base Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 5 ++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 6 ++ .../tutti/persistence/TuttiPersistence.java | 2 + .../tutti/persistence/TuttiPersistenceImpl.java | 31 +++++++-- .../persistence/TuttiPersistenceNoDbImpl.java | 5 ++ .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../ifremer/tutti/service/PersistenceService.java | 5 ++ .../ifremer/tutti/service/ServiceDbResource.java | 17 +++-- .../swing/content/config/TuttiConfigUIHandler.java | 3 + .../swing/content/db/actions/ReimportDbAction.java | 75 +++++++++++++++------- .../content/db/actions/ReinstallDbAction.java | 73 +++++++++++++-------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 14 files changed, 167 insertions(+), 59 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.