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 f0322d4 Use topia 2-11 new 535eb2e Chargement de la configuration de log de l'utilisateur suppresion otion isAdmin (refs #7455) new e625afa Suppresion référence sur une action qui n'existe plus new ea7f951 Permettre de configurer les logs chez le client (termine #7455) Merge branch 'feature/7455' 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 ea7f9514de5a84d6f547489ea0550dba74f5abd5 Merge: f0322d4 e625afa Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 13 20:22:05 2015 +0200 Permettre de configurer les logs chez le client (termine #7455) Merge branch 'feature/7455' into develop commit e625afae36a3891b0d468a12f2e711fb6246224b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 13 20:21:25 2015 +0200 Suppresion référence sur une action qui n'existe plus commit 535eb2ecf6ef761e858e4c4f67f1ee75be4cdb25 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 13 20:20:09 2015 +0200 Chargement de la configuration de log de l'utilisateur suppresion otion isAdmin (refs #7455) Summary of changes: .../main/java/fr/ird/observe/IObserveConfig.java | 2 + observe-swing/pom.xml | 1 - .../main/{resources => filters}/log4j.properties | 5 +- .../observe-log4j.properties} | 4 +- .../src/main/filters/observe-ui.properties | 1 - .../main/java/fr/ird/observe/ObserveCLAction.java | 43 ++++------- .../main/java/fr/ird/observe/ObserveConfig.java | 83 ++++++++++++++++------ .../java/fr/ird/observe/ObserveConfigOption.java | 33 +++++---- .../fr/ird/observe/ObserveResourceManager.java | 18 ++--- .../main/java/fr/ird/observe/ObserveRunner.java | 82 ++++++++++++++------- .../resources/i18n/observe-swing_en_GB.properties | 2 + .../resources/i18n/observe-swing_es_ES.properties | 2 + .../resources/i18n/observe-swing_fr_FR.properties | 4 +- 13 files changed, 176 insertions(+), 104 deletions(-) copy observe-swing/src/main/{resources => filters}/log4j.properties (86%) rename observe-swing/src/main/{resources/log4j.properties => filters/observe-log4j.properties} (89%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.